diff --git a/.gitignore b/.gitignore
index e90fc1c3c..3152ae533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
 /node_modules
 /vendor
 /public/bower_components
-
-# Logs
-/application/logs/*
-*.log
+app/Config/email.php
+app/sessions/*
+app/logs/*
+app/uploads/*
 npm-debug.log*
 
 # Build generated
@@ -81,6 +81,7 @@ $RECYCLE.BIN/
 git-svn-diff.py
 *.bash
 .swp
+system/
 *.swp
 *.rej
 *.orig
@@ -88,3 +89,8 @@ git-svn-diff.py
 *.~
 .env
 auth.json
+
+*.png
+*.jpg
+*.jpeg
+*copy*
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c15f83fac..4e03d2b20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/time
 WORKDIR /app
 COPY . /app
 RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
-RUN chmod -R 750 /app/public/uploads /app/application/logs && chown -R www-data:www-data /app/public /app/application
+RUN chmod -R 750 /app/writable/uploads /app/writable/logs && chown -R www-data:www-data /app/writable /app/application
 
 FROM ospos AS ospos_test
 
@@ -23,10 +23,8 @@ RUN apt-get install -y libzip-dev wget git
 RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /bin/wait-for-it.sh && chmod +x /bin/wait-for-it.sh
 RUN docker-php-ext-install zip
 RUN composer install -d/app 
-RUN php /app/vendor/kenjis/ci-phpunit-test/install.php -a /app/application -p /app/vendor/codeigniter/framework
-RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/application/tests/phpunit.xml
-RUN sed -i '13,17d' /app/application/tests/controllers/Welcome_test.php 
-WORKDIR /app/application/tests
+#RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/tests/phpunit.xml
+WORKDIR /app/tests
 
 CMD ["/app/vendor/phpunit/phpunit/phpunit"]
 
diff --git a/application/.htaccess b/app/.htaccess
similarity index 100%
rename from application/.htaccess
rename to app/.htaccess
diff --git a/app/Common.php b/app/Common.php
new file mode 100644
index 000000000..780ba3f80
--- /dev/null
+++ b/app/Common.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * The goal of this file is to allow developers a location
+ * where they can overwrite core procedural functions and
+ * replace them with their own. This file is loaded during
+ * the bootstrap process and is called during the frameworks
+ * execution.
+ *
+ * This can be looked at as a `master helper` file that is
+ * loaded early on, and may also contain additional functions
+ * that you'd like to use throughout your entire application
+ *
+ * @link: https://codeigniter4.github.io/CodeIgniter4/
+ */
diff --git a/application/config/.env.example b/app/Config/.env.example
similarity index 100%
rename from application/config/.env.example
rename to app/Config/.env.example
diff --git a/app/Config/App.php b/app/Config/App.php
new file mode 100644
index 000000000..0b1ed2e17
--- /dev/null
+++ b/app/Config/App.php
@@ -0,0 +1,544 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class App extends BaseConfig
+{
+	/**
+	 * This is the code version of the Open Source Point of Sale you're running.
+	 *
+	 * @var string
+	 */
+	public $application_version = '4.0.0-dev';
+
+	/**
+	 * This is the commit hash for the version you are currently using.
+	 *
+	 * @var string
+	 */
+	public $commit_sha1 = 'dev';
+
+	/**
+	 * Logs are stored in writable/logs
+	 *
+	 * @var bool
+	 */
+	public $db_log_enabled = false;
+
+	/**
+	 * Defines whether to require/reroute to HTTPS
+	 *
+	 * @var bool
+	 */
+	public $https_on;	//Set in the constructor
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Base Site URL
+	 * --------------------------------------------------------------------------
+	 *
+	 * URL to your CodeIgniter root. Typically this will be your base URL,
+	 * WITH a trailing slash:
+	 *
+	 *    http://example.com/
+	 *
+	 * If this is not set then CodeIgniter will try guess the protocol, domain
+	 * and path to your installation. However, you should always configure this
+	 * explicitly and never rely on auto-guessing, especially in production
+	 * environments.
+	 *
+	 * @var string
+	 */
+	public $baseURL;	//Defined in the constructor
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Index File
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically this will be your index.php file, unless you've renamed it to
+	 * something else. If you are using mod_rewrite to remove the page set this
+	 * variable so that it is blank.
+	 *
+	 * @var string
+	 */
+	public $indexPage = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * URI PROTOCOL
+	 * --------------------------------------------------------------------------
+	 *
+	 * This item determines which getServer global should be used to retrieve the
+	 * URI string.  The default setting of 'REQUEST_URI' works for most servers.
+	 * If your links do not seem to work, try one of the other delicious flavors:
+	 *
+	 * 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+	 * 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+	 * 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+	 *
+	 * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+	 *
+	 * @var string
+	 */
+	public $uriProtocol = 'REQUEST_URI';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default Locale
+	 * --------------------------------------------------------------------------
+	 *
+	 * The Locale roughly represents the language and location that your visitor
+	 * is viewing the site from. It affects the language strings and other
+	 * strings (like currency markers, numbers, etc), that your program
+	 * should run under for this request.
+	 *
+	 * @var string
+	 */
+	public $defaultLocale = 'en-US';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Negotiate Locale
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, the current Request object will automatically determine the
+	 * language to use based on the value of the Accept-Language header.
+	 *
+	 * If false, no automatic detection will be performed.
+	 *
+	 * @var boolean
+	 */
+	public $negotiateLocale = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Supported Locales
+	 * --------------------------------------------------------------------------
+	 *
+	 * If $negotiateLocale is true, this array lists the locales supported
+	 * by the application in descending order of priority. If no match is
+	 * found, the first locale will be used.
+	 *
+	 * @var string[]
+	 */
+	public $supportedLocales = [
+		'ar-EG',
+		'ar-LB',
+		'az-AZ',
+		'bg',
+		'bs-BA',
+		'cs',
+		'da',
+		'de',
+		'de-CH',
+		'el',
+		'en-GB',
+		'en-US',
+		'es',
+		'fa_IR',
+		'fr',
+		'he',
+		'hr-HR',
+		'hu-HU',
+		'hy',
+		'id',
+		'it',
+		'km',
+		'lo',
+		'ml',
+		'nb_NO',
+		'nl',
+		'nl-BE',
+		'pl',
+		'pt-BR',
+		'ro',
+		'ru',
+		'sv',
+		'ta',
+		'th',
+		'tl-PH',
+		'tr',
+		'uk-UA',
+		'ur-PK',
+		'vi',
+		'zh-HANS',
+		'zh-Hant',
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Application Timezone
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default timezone that will be used in your application to display
+	 * dates with the date helper, and can be retrieved through app_timezone()
+	 *
+	 * @var string
+	 */
+	public $appTimezone = 'Asia/Kathmandu';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default Character Set
+	 * --------------------------------------------------------------------------
+	 *
+	 * This determines which character set is used by default in various methods
+	 * that require a character set to be provided.
+	 *
+	 * @see http://php.net/htmlspecialchars for a list of supported charsets.
+	 *
+	 * @var string
+	 */
+	public $charset = 'UTF-8';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * URI PROTOCOL
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, this will force every request made to this application to be
+	 * made via a secure connection (HTTPS). If the incoming request is not
+	 * secure, the user will be redirected to a secure version of the page
+	 * and the HTTP Strict Transport Security header will be set.
+	 *
+	 * @var boolean
+	 */
+	public $forceGlobalSecureRequests = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Driver
+	 * --------------------------------------------------------------------------
+	 *
+	 * The session storage driver to use:
+	 * - `CodeIgniter\Session\Handlers\FileHandler`
+	 * - `CodeIgniter\Session\Handlers\DatabaseHandler`
+	 * - `CodeIgniter\Session\Handlers\MemcachedHandler`
+	 * - `CodeIgniter\Session\Handlers\RedisHandler`
+	 *
+	 * @var string
+	 */
+	public $sessionDriver = 'CodeIgniter\Session\Handlers\DatabaseHandler';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The session cookie name, must contain only [0-9a-z_-] characters
+	 *
+	 * @var string
+	 */
+	public $sessionCookieName = 'ospos_session';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Expiration
+	 * --------------------------------------------------------------------------
+	 *
+	 * The number of SECONDS you want the session to last.
+	 * Setting to 0 (zero) means expire when the browser is closed.
+	 *
+	 * @var integer
+	 */
+	public $sessionExpiration = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Save Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The location to save sessions to and is driver dependent.
+	 *
+	 * For the 'files' driver, it's a path to a writable directory.
+	 * WARNING: Only absolute paths are supported!
+	 *
+	 * For the 'database' driver, it's a table name.
+	 * Please read up the manual for the format with other session drivers.
+	 *
+	 * IMPORTANT: You are REQUIRED to set a valid save path!
+	 *
+	 * @var string
+	 */
+	public $sessionSavePath = WRITEPATH . 'session';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Match IP
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to match the user's IP address when reading the session data.
+	 *
+	 * WARNING: If you're using the database driver, don't forget to update
+	 *          your session table's PRIMARY KEY when changing this setting.
+	 *
+	 * @var boolean
+	 */
+	public $sessionMatchIP = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Time to Update
+	 * --------------------------------------------------------------------------
+	 *
+	 * How many seconds between CI regenerating the session ID.
+	 *
+	 * @var integer
+	 */
+	public $sessionTimeToUpdate = 300;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Session Regenerate Destroy
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to destroy session data associated with the old session ID
+	 * when auto-regenerating the session ID. When set to FALSE, the data
+	 * will be later deleted by the garbage collector.
+	 *
+	 * @var boolean
+	 */
+	public $sessionRegenerateDestroy = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$prefix property instead.
+	 */
+	public $cookiePrefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$domain property instead.
+	 */
+	public $cookieDomain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$path property instead.
+	 */
+	public $cookiePath = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$secure property instead.
+	 */
+	public $cookieSecure;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HttpOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$httponly property instead.
+	 */
+	public $cookieHTTPOnly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$samesite property instead.
+	 */
+	public $cookieSameSite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Reverse Proxy IPs
+	 * --------------------------------------------------------------------------
+	 *
+	 * If your server is behind a reverse proxy, you must whitelist the proxy
+	 * IP addresses from which CodeIgniter should trust headers such as
+	 * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+	 * the visitor's IP address.
+	 *
+	 * You can use both an array or a comma-separated list of proxy addresses,
+	 * as well as specifying whole subnets. Here are a few examples:
+	 *
+	 * Comma-separated:	'10.0.1.200,192.168.5.0/24'
+	 * Array: ['10.0.1.200', '192.168.5.0/24']
+	 *
+	 * @var string|string[]
+	 */
+	public $proxyIPs = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The token name.
+	 *
+	 * @deprecated Use `Config\Security` $tokenName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFTokenName;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Header Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The header name.
+	 *
+	 * @deprecated Use `Config\Security` $headerName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFHeaderName = 'X-CSRF-TOKEN';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The cookie name.
+	 *
+	 * @deprecated Use `Config\Security` $cookieName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFCookieName;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Expire
+	 * --------------------------------------------------------------------------
+	 *
+	 * The number in seconds the token should expire.
+	 *
+	 * @deprecated Use `Config\Security` $expire property instead of using this property.
+	 *
+	 * @var integer
+	 */
+	public $CSRFExpire = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Regenerate
+	 * --------------------------------------------------------------------------
+	 *
+	 * Regenerate token on every submission?
+	 *
+	 * @deprecated Use `Config\Security` $regenerate property instead of using this property.
+	 *
+	 * @var boolean
+	 */
+	public $CSRFRegenerate = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Redirect
+	 * --------------------------------------------------------------------------
+	 *
+	 * Redirect to previous page with error on failure?
+	 *
+	 * @deprecated Use `Config\Security` $redirect property instead of using this property.
+	 *
+	 * @var boolean
+	 */
+	public $CSRFRedirect = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Setting for CSRF SameSite cookie token. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Defaults to `Lax` as recommended in this link:
+	 *
+	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
+	 *
+	 * @deprecated Use `Config\Security` $samesite property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFSameSite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Content Security Policy
+	 * --------------------------------------------------------------------------
+	 *
+	 * Enables the Response's Content Secure Policy to restrict the sources that
+	 * can be used for images, scripts, CSS files, audio, video, etc. If enabled,
+	 * the Response object will populate default values for the policy from the
+	 * `ContentSecurityPolicy.php` file. Controllers can always add to those
+	 * restrictions at run time.
+	 *
+	 * For a better understanding of CSP, see these documents:
+	 *
+	 * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
+	 * @see http://www.w3.org/TR/CSP/
+	 *
+	 * @var boolean
+	 */
+	public $CSPEnabled = false;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->https_on = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
+		$this->baseURL = $this->https_on ? 'https' : 'http';
+		$this->baseURL .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost');
+		$this->baseURL .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
+	}
+}
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
new file mode 100644
index 000000000..a6e894f13
--- /dev/null
+++ b/app/Config/Autoload.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
+/**
+ * -------------------------------------------------------------------
+ * AUTOLOADER CONFIGURATION
+ * -------------------------------------------------------------------
+ *
+ * This file defines the namespaces and class maps so the Autoloader
+ * can find the files as needed.
+ *
+ * NOTE: If you use an identical key in $psr4 or $classmap, then
+ * the values in this file will overwrite the framework's values.
+ */
+class Autoload extends AutoloadConfig
+{
+	/**
+	 * -------------------------------------------------------------------
+	 * Namespaces
+	 * -------------------------------------------------------------------
+	 * This maps the locations of any namespaces in your application to
+	 * their location on the file system. These are used by the autoloader
+	 * to locate files the first time they have been instantiated.
+	 *
+	 * The '/app' and '/system' directories are already mapped for you.
+	 * you may change the name of the 'App' namespace if you wish,
+	 * but this should be done prior to creating any namespaced classes,
+	 * else you will need to modify all of those classes for this to work.
+	 *
+	 * Prototype:
+	 *```
+	 *   $psr4 = [
+	 *       'CodeIgniter' => SYSTEMPATH,
+	 *       'App'	       => APPPATH
+	 *   ];
+	 *```
+	 * @var array<string, string>
+	 */
+	public $psr4 = [
+		APP_NAMESPACE => APPPATH, // For custom app namespace
+		'Config' => APPPATH . 'Config',
+		'dompdf' => APPPATH . 'ThirdParty/dompdf/src'
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Class Map
+	 * -------------------------------------------------------------------
+	 * The class map provides a map of class names and their exact
+	 * location on the drive. Classes loaded in this manner will have
+	 * slightly faster performance because they will not have to be
+	 * searched for within one or more directories as they would if they
+	 * were being autoloaded through a namespace.
+	 *
+	 * Prototype:
+	 *```
+	 *   $classmap = [
+	 *       'MyClass'   => '/path/to/class/file.php'
+	 *   ];
+	 *```
+	 * @var array<string, string>
+	 */
+	public $classmap = [
+		//Controllers
+		'Attributes' => '/App/Controllers/Attributes.php',
+		'Cashups' => '/App/Controllers/Cashups.php',
+		'Config' => '/App/Controllers/Config.php',
+		'Customers' => '/App/Controllers/Customers.php',
+		'Employees' => '/App/Controllers/Employees.php',
+		'Expenses' => '/App/Controllers/Expenses.php',
+		'Expenses_categories' => '/App/Controllers/Expenses_categories.php',
+		'Giftcards' => '/App/Controllers/Giftcards.php',
+		'Home' => '/App/Controllers/Home.php',
+		'Item_kits' => '/App/Controllers/Item_kits.php',
+		'Items' => '/App/Controllers/Items.php',
+		'Login' => '/App/Controllers/Login.php',
+		'Messages' => '/App/Controllers/Messages.php',
+		'No_access' => '/App/Controllers/No_access.php',
+		'Office' => '/App/Controllers/Office.php',
+		'Persons' => '/App/Controllers/Persons.php',
+		'Receivings' => '/App/Controllers/Receivings.php',
+		'Reports' => '/App/Controllers/Reports.php',
+		'Sales' => '/App/Controllers/Sales.php',
+		'Secure_Controller' => '/App/Controllers/Secure_Controller.php',
+		'Suppliers' => '/App/Controllers/Suppliers.php',
+		'Tax_categories' => '/App/Controllers/Tax_categories.php',
+		'Tax_codes' => '/App/Controllers/Tax_codes.php',
+		'Tax_jurisdictions' => '/App/Controllers/Tax_jurisdictions.php',
+		'Taxes' => '/App/Controllers/Taxes.php',
+
+		//Models
+		'Appconfig' => '/App/Models/Appconfig.php',
+		'Attribute' => '/App/Models/Attribute.php',
+		'Cashup' => '/App/Models/Cashup.php',
+		'Customer' => '/App/Models/Customer.php',
+		'Customer_rewards' => '/App/Models/Customer_rewards.php',
+		'Dinner_table' => '/App/Models/Dinner_table.php',
+		'Employee' => '/App/Models/Employee.php',
+		'Expense' => '/App/Models/Expense.php',
+		'Expense_category' => '/App/Models/Expense_category.php',
+		'Giftcard' => '/App/Models/Giftcard.php',
+		'Inventory' => '/App/Models/Inventory.php',
+		'Item_kit' => '/App/Models/Item_kit.php',
+		'Item_kit_items' => '/App/Models/Item_kit_items.php',
+		'Item_quantity' => '/App/Models/Item_quantity.php',
+		'Item_taxes' => '/App/Models/Item_taxes.php',
+		'Module' => '/App/Models/Module.php',
+		'Person' => '/App/Models/Person.php',
+		'Receiving' => '/App/Models/Receiving.php',
+		'Rewards' => '/App/Models/Rewards.php',
+		'Sale' => '/App/Models/Sale.php',
+		'Stock_location' => '/App/Models/Stock_location.php',
+		'Supplier' => '/App/Models/Supplier.php',
+		'Tax' => '/App/Models/Tax.php',
+		'Tax_category' => '/App/Models/Tax_category.php',
+		'Tax_code' => '/App/Models/Tax_code.php',
+		'Tax_jurisdiction' => '/App/Models/Tax_jurisdiction.php',
+
+		//Reports
+		'Report' => '/App/Models/Reports/Report.php',
+		'Detailed_receiving' => '/App/Models/Reports/Detailed_receiving.php',
+		'Detailed_sales' => '/App/Models/Reports/Detailed_sales.php',
+		'Inventory_low' => '/App/Models/Reports/Inventory_low.php',
+		'Inventory_summary' => '/App/Models/Reports/Inventory_summary.php',
+		'Specific_customer' => '/App/Models/Reports/Specific_customer.php',
+		'Specific_discount' => '/App/Models/Reports/Specific_discount.php',
+		'Specific_employee' => '/App/Models/Reports/Specific_employee.php',
+		'Specific_supplier' => '/App/Models/Reports/Specific_supplier.php',
+		'Summary_categories' => '/App/Models/Reports/Summary_categories.php',
+		'Summary_customers' => '/App/Models/Reports/Summary_customers.php',
+		'Summary_discounts' => '/App/Models/Reports/Summary_discounts.php',
+		'Summary_employees' => '/App/Models/Reports/Summary_employees.php',
+		'Summary_expenses_categories' => '/App/Models/Reports/Summary_expenses_categories.php',
+		'Summary_items' => '/App/Models/Reports/Summary_items.php',
+		'Summary_payments' => '/App/Models/Reports/Summary_payments.php',
+		'Summary_report' => '/App/Models/Reports/Summary_report.php',
+		'Summary_sales' => '/App/Models/Reports/Summary_sales.php',
+		'Summary_sales_taxes' => '/App/Models/Reports/Summary_sales_taxes.php',
+		'Summary_suppliers' => '/App/Models/Reports/Summary_suppliers.php',
+		'Summary_taxes' => '/App/Models/Reports/Summary_taxes.php',
+
+		//Tokens
+		'Token' => '/App/Models/Tokens/Token.php',
+		'Token_barcode_ean' => '/App/Models/Tokens/Token_barcode_ean.php',
+		'Token_barcode_price' => '/App/Models/Tokens/Token_barcode_price.php',
+		'Token_barcode_weight' => '/App/Models/Tokens/Token_barcode_weight.php',
+		'Token_customer' => '/App/Models/Tokens/Token_customer.php',
+		'Token_invoice_count' => '/App/Models/Tokens/Token_invoice_count.php',
+		'Token_invoice_sequence' => '/App/Models/Tokens/Token_invoice_sequence.php',
+		'Token_quote_sequence' => '/App/Models/Tokens/Token_quote_sequence.php',
+		'Token_suspended_invoice_count' => '/App/Models/Tokens/Token_suspended_invoice_count.php',
+		'Token_work_order_sequence' => '/App/Models/Tokens/Token_work_order_sequence.php',
+		'Token_year_invoice_count' => '/App/Models/Tokens/Token_year_invoice_count.php',
+		'Token_year_quote_count' => '/App/Models/Tokens/Token_year_quote_count.php',
+
+		//Libraries
+		'Barcode_lib' => '/App/Libraries/Barcode_lib.php',
+		'Email_lib' => '/App/Libraries/Email_lib.php',
+		'Item_lib' => '/App/Libraries/Item_lib.php',
+		'Mailchimp_lib' => '/App/Libraries/Mailchimp_lib.php',
+		'MY_Email' => '/App/Libraries/MY_Email.php',
+		'MY_Migration' => '/App/Libraries/MY_Migration.php',
+		'Receving_lib' => '/App/Libraries/Receiving_lib.php',
+		'Sale_lib' => '/App/Libraries/Sale_lib.php',
+		'Sms_lib' => '/App/Libraries/Sms_lib.php',
+		'Tax_lib' => '/App/Libraries/Tax_lib.php',
+		'Token_lib' => '/App/Libraries/Token_lib.php',
+
+		//Miscellaneous
+		'Rounding_mode' => '/App/Models/Enums/Rounding_mode.php'
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Files
+	 * -------------------------------------------------------------------
+	 * The files array provides a list of paths to __non-class__ files
+	 * that will be autoloaded. This can be useful for bootstrap operations
+	 * or for loading functions.
+	 *
+	 * Prototype:
+	 * ```
+	 *	  $files = [
+	 *	 	   '/path/to/my/file.php',
+	 *    ];
+	 * ```
+	 * @var array<int, string>
+	 */
+	public $files = [];
+}
\ No newline at end of file
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
new file mode 100644
index 000000000..05a861258
--- /dev/null
+++ b/app/Config/Boot/development.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
+ */
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
+ */
+defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. This will control whether Kint is loaded, and a few other
+ | items. It can always be used within your own application too.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php
new file mode 100644
index 000000000..21d258056
--- /dev/null
+++ b/app/Config/Boot/production.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | Don't show ANY in production environments. Instead, let the system catch
+ | it and display a generic error message.
+ */
+ini_set('display_errors', '0');
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', false);
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
new file mode 100644
index 000000000..e07a1d43f
--- /dev/null
+++ b/app/Config/Boot/testing.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
+ */
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
+ */
+defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
+
+/*
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
+ */
+defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
new file mode 100644
index 000000000..a785efe13
--- /dev/null
+++ b/app/Config/Cache.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Cache\Handlers\DummyHandler;
+use CodeIgniter\Cache\Handlers\FileHandler;
+use CodeIgniter\Cache\Handlers\MemcachedHandler;
+use CodeIgniter\Cache\Handlers\PredisHandler;
+use CodeIgniter\Cache\Handlers\RedisHandler;
+use CodeIgniter\Cache\Handlers\WincacheHandler;
+use CodeIgniter\Config\BaseConfig;
+
+class Cache extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Primary Handler
+	 * --------------------------------------------------------------------------
+	 *
+	 * The name of the preferred handler that should be used. If for some reason
+	 * it is not available, the $backupHandler will be used in its place.
+	 *
+	 * @var string
+	 */
+	public $handler = 'file';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Backup Handler
+	 * --------------------------------------------------------------------------
+	 *
+	 * The name of the handler that will be used in case the first one is
+	 * unreachable. Often, 'file' is used here since the filesystem is
+	 * always available, though that's not always practical for the app.
+	 *
+	 * @var string
+	 */
+	public $backupHandler = 'dummy';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cache Directory Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The path to where cache files should be stored, if using a file-based
+	 * system.
+	 *
+	 * @var string
+	 *
+	 * @deprecated Use the driver-specific variant under $file
+	 */
+	public $storePath = WRITEPATH . 'cache/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cache Include Query String
+	 * --------------------------------------------------------------------------
+	 *
+	 * Whether to take the URL query string into consideration when generating
+	 * output cache files. Valid options are:
+	 *
+	 *    false      = Disabled
+	 *    true       = Enabled, take all query parameters into account.
+	 *                 Please be aware that this may result in numerous cache
+	 *                 files generated for the same page over and over again.
+	 *    ['q') = Enabled, but only take into account the specified list
+	 *                 of query parameters.
+	 *
+	 * @var boolean|string[]
+	 */
+	public $cacheQueryString = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Key Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * This string is added to all cache item names to help avoid collisions
+	 * if you run multiple applications with the same cache engine.
+	 *
+	 * @var string
+	 */
+	public $prefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Default TTL
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default number of seconds to save items when none is specified.
+	 *
+	 * WARNING: This is not used by framework handlers where 60 seconds is
+	 * hard-coded, but may be useful to projects and modules. This will replace
+	 * the hard-coded value in a future release.
+	 *
+	 * @var integer
+	 */
+	public $ttl = 60;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * File settings
+	 * --------------------------------------------------------------------------
+	 * Your file storage preferences can be specified below, if you are using
+	 * the File driver.
+	 *
+	 * @var array<string, string|int|null>
+	 */
+	public $file = [
+		'storePath' => WRITEPATH . 'cache/',
+		'mode'      => 0640,
+	];
+
+	/**
+	 * -------------------------------------------------------------------------
+	 * Memcached settings
+	 * -------------------------------------------------------------------------
+	 * Your Memcached servers can be specified below, if you are using
+	 * the Memcached drivers.
+	 *
+	 * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
+	 *
+	 * @var array<string, string|int|boolean>
+	 */
+	public $memcached = [
+		'host'   => '127.0.0.1',
+		'port'   => 11211,
+		'weight' => 1,
+		'raw'    => false,
+	];
+
+	/**
+	 * -------------------------------------------------------------------------
+	 * Redis settings
+	 * -------------------------------------------------------------------------
+	 * Your Redis server can be specified below, if you are using
+	 * the Redis or Predis drivers.
+	 *
+	 * @var array<string, string|int|null>
+	 */
+	public $redis = [
+		'host'     => '127.0.0.1',
+		'password' => null,
+		'port'     => 6379,
+		'timeout'  => 0,
+		'database' => 0,
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Available Cache Handlers
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is an array of cache engine alias' and class names. Only engines
+	 * that are listed here are allowed to be used.
+	 *
+	 * @var array<string, string>
+	 */
+	public $validHandlers = [
+		'dummy'     => DummyHandler::class,
+		'file'      => FileHandler::class,
+		'memcached' => MemcachedHandler::class,
+		'predis'    => PredisHandler::class,
+		'redis'     => RedisHandler::class,
+		'wincache'  => WincacheHandler::class,
+	];
+}
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
new file mode 100644
index 000000000..16be5e47f
--- /dev/null
+++ b/app/Config/Constants.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * --------------------------------------------------------------------
+ * App Namespace
+ * --------------------------------------------------------------------
+ *
+ * This defines the default Namespace that is used throughout
+ * CodeIgniter to refer to the Application directory. Change
+ * this constant to change the namespace that all application
+ * classes should use.
+ *
+ * NOTE: changing this will require manually modifying the
+ * existing namespaces of App\* namespaced-classes.
+ */
+defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
+
+/**
+ * --------------------------------------------------------------------------
+ * Composer Path
+ * --------------------------------------------------------------------------
+ *
+ * The path that Composer's autoload file is expected to live. By default,
+ * the vendor folder is in the Root directory, but you can customize that here.
+ */
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.php');
+
+/**
+ * --------------------------------------------------------------------------
+ * Timing Constants
+ * --------------------------------------------------------------------------
+ *
+ * Provide simple ways to work with the myriad of PHP functions that
+ * require information to be in seconds.
+ */
+defined('SECOND') || define('SECOND', 1);
+defined('MINUTE') || define('MINUTE', 60);
+defined('HOUR')   || define('HOUR', 3600);
+defined('DAY')    || define('DAY', 86400);
+defined('WEEK')   || define('WEEK', 604800);
+defined('MONTH')  || define('MONTH', 2592000);
+defined('YEAR')   || define('YEAR', 31536000);
+defined('DECADE') || define('DECADE', 315360000);
+
+/**
+ * --------------------------------------------------------------------------
+ * Exit Status Codes
+ * --------------------------------------------------------------------------
+ *
+ * Used to indicate the conditions under which the script is exit()ing.
+ * While there is no universal standard for error codes, there are some
+ * broad conventions.  Three such conventions are mentioned below, for
+ * those who wish to make use of them.  The CodeIgniter defaults were
+ * chosen for the least overlap with these conventions, while still
+ * leaving room for others to be defined in future versions and user
+ * applications.
+ *
+ * The three main conventions used for determining exit status codes
+ * are as follows:
+ *
+ *    Standard C/C++ Library (stdlibc):
+ *       http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
+ *       (This link also contains other GNU-specific conventions)
+ *    BSD sysexits.h:
+ *       http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
+ *    Bash scripting:
+ *       http://tldp.org/LDP/abs/html/exitcodes.html
+ *
+ */
+defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR')          || define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE')   || define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS')  || define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
+defined('EXIT_USER_INPUT')     || define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+
+/**
+ * Attribute Related Constants.
+ */
+const GROUP = 'GROUP';
+const DROPDOWN = 'DROPDOWN';
+const DECIMAL = 'DECIMAL';
+const DATE = 'DATE';
+const TEXT = 'TEXT';
+const CHECKBOX = 'CHECKBOX';
+const NO_DEFINITION_ID = 0;
+const CATEGORY_DEFINITION_ID = -1;
+const DEFINITION_TYPES = [GROUP, DROPDOWN, DECIMAL, TEXT, DATE, CHECKBOX];
+
+/**
+ * Item Related Constants.
+ */
+const HAS_STOCK = 0;
+const HAS_NO_STOCK = 1;
+
+const ITEM = 0;
+const ITEM_KIT = 1;
+const ITEM_AMOUNT_ENTRY = 2;
+const ITEM_TEMP = 3;
+const NEW_ITEM = -1;
+
+const PRINT_ALL = 0;
+const PRINT_PRICED = 1;
+const PRINT_KIT = 2;
+
+const PRINT_YES = 0;
+const PRINT_NO = 1;
+
+const PRICE_ALL = 0;
+const PRICE_KIT = 1;
+const PRICE_KIT_ITEMS = 2;
+
+const PRICE_OPTION_ALL = 0;
+const PRICE_OPTION_KIT = 1;
+const PRICE_OPTION_KIT_STOCK = 2;
+
+const NAME_SEPARATOR = ' | ';
+
+/**
+ * Sale Related Constants.
+ */
+const COMPLETED = 0;
+const SUSPENDED = 1;
+const CANCELED = 2;
+
+const SALE_TYPE_POS = 0;
+const SALE_TYPE_INVOICE = 1;
+const SALE_TYPE_WORK_ORDER = 2;
+const SALE_TYPE_QUOTE = 3;
+const SALE_TYPE_RETURN = 4;
+
+const PERCENT = 0;
+const FIXED = 1;
+
+const PRICE_MODE_STANDARD = 0;
+const PRICE_MODE_KIT = 1;
+
+const PAYMENT_TYPE_UNASSIGNED = '--';
+
+const CASH_ADJUSTMENT_TRUE = 1;
+const CASH_ADJUSTMENT_FALSE = 0;
+const CASH_MODE_TRUE = 1;
+const CASH_MODE_FALSE = 0;
+
+/**
+ * Supplier Related Constants
+ */
+const GOODS_SUPPLIER = 0;
+const COST_SUPPLIER = 1;
+
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
new file mode 100644
index 000000000..a04e3d0f9
--- /dev/null
+++ b/app/Config/ContentSecurityPolicy.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Stores the default settings for the ContentSecurityPolicy, if you
+ * choose to use it. The values here will be read in and set as defaults
+ * for the site. If needed, they can be overridden on a page-by-page basis.
+ *
+ * Suggested reference for explanations:
+ *
+ * @see https://www.html5rocks.com/en/tutorials/security/content-security-policy/
+ */
+class ContentSecurityPolicy extends BaseConfig
+{
+	//-------------------------------------------------------------------------
+	// Broadbrush CSP management
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Default CSP report context
+	 *
+	 * @var boolean
+	 */
+	public $reportOnly = false;
+
+	/**
+	 * Specifies a URL where a browser will send reports
+	 * when a content security policy is violated.
+	 *
+	 * @var string|null
+	 */
+	public $reportURI = null;
+
+	/**
+	 * Instructs user agents to rewrite URL schemes, changing
+	 * HTTP to HTTPS. This directive is for websites with
+	 * large numbers of old URLs that need to be rewritten.
+	 *
+	 * @var boolean
+	 */
+	public $upgradeInsecureRequests = false;
+
+	//-------------------------------------------------------------------------
+	// Sources allowed
+	// Note: once you set a policy to 'none', it cannot be further restricted
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $defaultSrc = null;
+
+	/**
+	 * Lists allowed scripts' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $scriptSrc = 'self';
+
+	/**
+	 * Lists allowed stylesheets' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $styleSrc = 'self';
+
+	/**
+	 * Defines the origins from which images can be loaded.
+	 *
+	 * @var string|string[]
+	 */
+	public $imageSrc = 'self';
+
+	/**
+	 * Restricts the URLs that can appear in a page's `<base>` element.
+	 *
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $baseURI = null;
+
+	/**
+	 * Lists the URLs for workers and embedded frame contents
+	 *
+	 * @var string|string[]
+	 */
+	public $childSrc = 'self';
+
+	/**
+	 * Limits the origins that you can connect to (via XHR,
+	 * WebSockets, and EventSource).
+	 *
+	 * @var string|string[]
+	 */
+	public $connectSrc = 'self';
+
+	/**
+	 * Specifies the origins that can serve web fonts.
+	 *
+	 * @var string|string[]
+	 */
+	public $fontSrc = null;
+
+	/**
+	 * Lists valid endpoints for submission from `<form>` tags.
+	 *
+	 * @var string|string[]
+	 */
+	public $formAction = 'self';
+
+	/**
+	 * Specifies the sources that can embed the current page.
+	 * This directive applies to `<frame>`, `<iframe>`, `<embed>`,
+	 * and `<applet>` tags. This directive can't be used in
+	 * `<meta>` tags and applies only to non-HTML resources.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $frameAncestors = null;
+
+	/**
+	 * The frame-src directive restricts the URLs which may
+	 * be loaded into nested browsing contexts.
+	 *
+	 * @var array|string|null
+	 */
+	public $frameSrc = null;
+
+	/**
+	 * Restricts the origins allowed to deliver video and audio.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $mediaSrc = null;
+
+	/**
+	 * Allows control over Flash and other plugins.
+	 *
+	 * @var string|string[]
+	 */
+	public $objectSrc = 'self';
+
+	/**
+	 * @var string|string[]|null
+	 */
+	public $manifestSrc = null;
+
+	/**
+	 * Limits the kinds of plugins a page may invoke.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $pluginTypes = null;
+
+	/**
+	 * List of actions allowed.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $sandbox = null;
+}
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
new file mode 100644
index 000000000..2ee3c97fa
--- /dev/null
+++ b/app/Config/Cookie.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use DateTimeInterface;
+
+class Cookie extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 */
+	public $prefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Expires Timestamp
+	 * --------------------------------------------------------------------------
+	 *
+	 * Default expires timestamp for cookies. Setting this to `0` will mean the
+	 * cookie will not have the `Expires` attribute and will behave as a session
+	 * cookie.
+	 *
+	 * @var DateTimeInterface|integer|string
+	 */
+	public $expires = 0;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 */
+	public $path = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 */
+	public $domain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 */
+	public $secure;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HTTPOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 */
+	public $httponly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$secure` must also be set.
+	 *
+	 * @var string
+	 */
+	public $samesite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Raw
+	 * --------------------------------------------------------------------------
+	 *
+	 * This flag allows setting a "raw" cookie, i.e., its name and value are
+	 * not URL encoded using `rawurlencode()`.
+	 *
+	 * If this is set to `true`, cookie names should be compliant of RFC 2616's
+	 * list of allowed characters.
+	 *
+	 * @var boolean
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
+	 */
+	public $raw = false;
+
+	function __construct()
+	{
+		parent::__construct();
+		$config = config('App');
+		$this->secure = $config->https_on;
+	}
+}
diff --git a/app/Config/Database.php b/app/Config/Database.php
new file mode 100644
index 000000000..1d4638b25
--- /dev/null
+++ b/app/Config/Database.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
+/**
+ * Database Configuration
+ */
+class Database extends Config
+{
+	/**
+	 * The directory that holds the Migrations
+	 * and Seeds directories.
+	 *
+	 * @var string
+	 */
+	public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
+
+	/**
+	 * Lets you choose which connection group to
+	 * use if no other is specified.
+	 *
+	 * @var string
+	 */
+	public $defaultGroup = 'default';
+
+	/**
+	 * The default database connection.
+	 *
+	 * @var array
+	 */
+	public $default;
+
+	/**
+	 * This database connection is used when
+	 * running PHPUnit database tests.
+	 *
+	 * @var array
+	 */
+	public $tests;
+
+	/**
+	 * This database connection is used when
+	 * developing against non-production data.
+	 *
+	 * @var array
+	 */
+	public $development;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->default = [
+			'DSN' => '',
+			'hostname' => !empty(getenv('MYSQL_HOST_NAME')) ? getenv('MYSQL_HOST_NAME') : 'localhost',
+			'username' => !empty(getenv('MYSQL_USERNAME')) ? getenv('MYSQL_USERNAME') : 'admin',
+			'password' => !empty(getenv('MYSQL_PASSWORD')) ? getenv('MYSQL_PASSWORD') : 'pointofsale',
+			'database' => !empty(getenv('MYSQL_DB_NAME')) ? getenv('MYSQL_DB_NAME') : 'ospos',
+			'DBDriver' => 'MySQLi',
+			'DBPrefix' => 'ospos_',
+			'pConnect' => false,
+			'DBDebug' => (ENVIRONMENT !== 'production'),
+			'charset' => 'utf8',
+			'DBCollat' => 'utf8_general_ci',
+			'swapPre' => '',
+			'encrypt' => false,
+			'compress' => false,
+			'strictOn' => false,
+			'failover' => [],
+			'port' => 3306
+		];
+
+		$this->development = [
+			'DSN' => '',
+			'hostname' => !empty(getenv('MYSQL_HOST_NAME')) ? getenv('MYSQL_HOST_NAME') : 'localhost',
+			'username' => !empty(getenv('MYSQL_USERNAME')) ? getenv('MYSQL_USERNAME') : 'admin',
+			'password' => !empty(getenv('MYSQL_PASSWORD')) ? getenv('MYSQL_PASSWORD') : 'pointofsale',
+			'database' => !empty(getenv('MYSQL_DB_NAME')) ? getenv('MYSQL_DB_NAME') : 'ospos',
+			'DBDriver' => 'MySQLi',
+			'DBPrefix' => 'ospos_',
+			'pConnect' => false,
+			'DBDebug' => (ENVIRONMENT !== 'production'),
+			'charset' => 'utf8',
+			'DBCollat' => 'utf8_general_ci',
+			'swapPre' => '',
+			'encrypt' => false,
+			'compress' => false,
+			'strictOn' => false,
+			'failover' => [],
+			'port' => 3306
+		];
+
+		$this->tests = [
+			'DSN' => '',
+			'hostname' => !empty(getenv('MYSQL_HOST_NAME')) ? getenv('MYSQL_HOST_NAME') : 'localhost',
+			'username' => !empty(getenv('MYSQL_USERNAME')) ? getenv('MYSQL_USERNAME') : 'admin',
+			'password' => !empty(getenv('MYSQL_PASSWORD')) ? getenv('MYSQL_PASSWORD') : 'pointofsale',
+			'database' => !empty(getenv('MYSQL_DB_NAME')) ? getenv('MYSQL_DB_NAME') : 'ospos',
+			'DBDriver' => 'MySQLi',
+			'DBPrefix' => 'ospos_',
+			'pConnect' => false,
+			'DBDebug' => (ENVIRONMENT !== 'production'),
+			'charset' => 'utf8',
+			'DBCollat' => 'utf8_general_ci',
+			'swapPre' => '',
+			'encrypt' => false,
+			'compress' => false,
+			'strictOn' => false,
+			'failover' => [],
+			'port' => 3306
+		];
+
+		// Ensure that we always set the database group to 'tests' if
+		// we are currently running an automated test suite, so that
+		// we don't overwrite live data on accident.
+		switch(ENVIRONMENT)
+		{
+			case 'testing':
+				$this->defaultGroup = 'tests';
+				break;
+			case 'development';
+				$this->defaultGroup = 'development';
+				break;
+		}
+	}
+}
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
new file mode 100644
index 000000000..dc85c0440
--- /dev/null
+++ b/app/Config/DocTypes.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Config;
+
+class DocTypes
+{
+	/**
+	 * List of valid document types.
+	 *
+	 * @var array<string, string>
+	 */
+	public $list = [
+		'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+		'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+		'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+		'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+		'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+		'html5'             => '<!DOCTYPE html>',
+		'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+		'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+		'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+		'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+		'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+		'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+		'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+		'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+		'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+		'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+		'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+		'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+		'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+	];
+}
diff --git a/app/Config/Email.php b/app/Config/Email.php
new file mode 100644
index 000000000..1d0c181e3
--- /dev/null
+++ b/app/Config/Email.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Email extends BaseConfig
+{
+	/**
+	 * @var string
+	 */
+	public $fromEmail;
+
+	/**
+	 * @var string
+	 */
+	public $fromName;
+
+	/**
+	 * @var string
+	 */
+	public $recipients;
+
+	/**
+	 * The "user agent"
+	 *
+	 * @var string
+	 */
+	public $userAgent = 'CodeIgniter';
+
+	/**
+	 * The mail sending protocol: mail, sendmail, smtp
+	 *
+	 * @var string
+	 */
+	public $protocol = 'mail';
+
+	/**
+	 * The server path to Sendmail.
+	 *
+	 * @var string
+	 */
+	public $mailPath = '/usr/sbin/sendmail';
+
+	/**
+	 * SMTP Server Address
+	 *
+	 * @var string
+	 */
+	public $SMTPHost;
+
+	/**
+	 * SMTP Username
+	 *
+	 * @var string
+	 */
+	public $SMTPUser;
+
+	/**
+	 * SMTP Password
+	 *
+	 * @var string
+	 */
+	public $SMTPPass;
+
+	/**
+	 * SMTP Port
+	 *
+	 * @var integer
+	 */
+	public $SMTPPort = 25;
+
+	/**
+	 * SMTP Timeout (in seconds)
+	 *
+	 * @var integer
+	 */
+	public $SMTPTimeout = 5;
+
+	/**
+	 * Enable persistent SMTP connections
+	 *
+	 * @var boolean
+	 */
+	public $SMTPKeepAlive = false;
+
+	/**
+	 * SMTP Encryption. Either tls or ssl
+	 *
+	 * @var string
+	 */
+	public $SMTPCrypto = 'tls';
+
+	/**
+	 * Enable word-wrap
+	 *
+	 * @var boolean
+	 */
+	public $wordWrap = true;
+
+	/**
+	 * Character count to wrap at
+	 *
+	 * @var integer
+	 */
+	public $wrapChars = 76;
+
+	/**
+	 * Type of mail, either 'text' or 'html'
+	 *
+	 * @var string
+	 */
+	public $mailType = 'text';
+
+	/**
+	 * Character set (utf-8, iso-8859-1, etc.)
+	 *
+	 * @var string
+	 */
+	public $charset = 'UTF-8';
+
+	/**
+	 * Whether to validate the email address
+	 *
+	 * @var boolean
+	 */
+	public $validate = false;
+
+	/**
+	 * Email Priority. 1 = highest. 5 = lowest. 3 = normal
+	 *
+	 * @var integer
+	 */
+	public $priority = 3;
+
+	/**
+	 * Newline character. (Use “\r\n” to comply with RFC 822)
+	 *
+	 * @var string
+	 */
+	public $CRLF = "\r\n";
+
+	/**
+	 * Newline character. (Use “\r\n” to comply with RFC 822)
+	 *
+	 * @var string
+	 */
+	public $newline = "\r\n";
+
+	/**
+	 * Enable BCC Batch Mode.
+	 *
+	 * @var boolean
+	 */
+	public $BCCBatchMode = false;
+
+	/**
+	 * Number of emails in each BCC batch
+	 *
+	 * @var integer
+	 */
+	public $BCCBatchSize = 200;
+
+	/**
+	 * Enable notify message from server
+	 *
+	 * @var boolean
+	 */
+	public $DSN = false;
+
+}
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
new file mode 100644
index 000000000..d1c54b8f6
--- /dev/null
+++ b/app/Config/Encryption.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Encryption configuration.
+ *
+ * These are the settings used for encryption, if you don't pass a parameter
+ * array to the encrypter for creation/initialization.
+ */
+class Encryption extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption Key Starter
+	 * --------------------------------------------------------------------------
+	 *
+	 * If you use the Encryption class you must set an encryption key (seed).
+	 * You need to ensure it is long enough for the cipher and mode you plan to use.
+	 * See the user guide for more info.
+	 *
+	 * @var string
+	 */
+	public $key;	//Set in the constructor
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption Driver to Use
+	 * --------------------------------------------------------------------------
+	 *
+	 * One of the supported encryption drivers.
+	 *
+	 * Available drivers:
+	 * - OpenSSL
+	 * - Sodium
+	 *
+	 * @var string
+	 */
+	public $driver = 'OpenSSL';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * SodiumHandler's Padding Length in Bytes
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the number of bytes that will be padded to the plaintext message
+	 * before it is encrypted. This value should be greater than zero.
+	 *
+	 * See the user guide for more information on padding.
+	 *
+	 * @var integer
+	 */
+	public $blockSize = 16;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Encryption digest
+	 * --------------------------------------------------------------------------
+	 *
+	 * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
+	 *
+	 * @var string
+	 */
+	public $digest = 'SHA512';
+
+	function __construct()
+	{
+		parent::__construct();
+		$this->key = getenv('ENCRYPTION_KEY') !== FALSE ? getenv('ENCRYPTION_KEY') : '';
+	}
+}
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 720344df9..97f7b0af7 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -1,45 +1,72 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+
+namespace Config;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+use Exception;
+use Dotenv\Dotenv;
 
 /*
-| -------------------------------------------------------------------------
-| Hooks
-| -------------------------------------------------------------------------
-| This file lets you define "hooks" to extend CI without hacking the core
-| files.  Please see the user guide for info:
-|
-|	https://codeigniter.com/user_guide/general/hooks.html
-|
-*/
-$hook['post_controller_constructor'][] = array(
-                                    'class'    => '',
-                                    'function' => 'load_config',
-                                    'filename' => 'load_config.php',
-                                    'filepath' => 'hooks'
-                                );
+ * --------------------------------------------------------------------
+ * Application Events
+ * --------------------------------------------------------------------
+ * Events allow you to tap into the execution of the program without
+ * modifying or extending core files. This file provides a central
+ * location to define your events, though they can always be added
+ * at run-time, also, if needed.
+ *
+ * You create code that can execute by subscribing to events with
+ * the 'on()' method. This accepts any form of callable, including
+ * Closures, that will be executed when the event is triggered.
+ *
+ * Example:
+ *      Events::on('create', [$myInstance, 'myMethod']);
+ */
 
-// 'post_controller' indicated execution of hooks after controller is finished
-$hook['post_controller'] = array(
-                                    'class' => '',
-                                    'function' => 'db_log_queries',
-                                    'filename' => 'db_log.php',
-                                    'filepath' => 'hooks'
-                                );
+Events::on('pre_system', function ()
+{
+	if (ENVIRONMENT !== 'testing')
+	{
+		if (ini_get('zlib.output_compression'))
+		{
+			throw FrameworkException::forEnabledZlibOutputCompression();
+		}
 
-$hook['pre_controller'][] = array(
-    'class'    => '',
-    'function' => 'validate_method',
-    'filename' => 'method_hook.php',
-    'filepath' => 'hooks'
-);
+		while (ob_get_level() > 0)
+		{
+			ob_end_flush();
+		}
 
+		ob_start(static function ($buffer) { return $buffer; });
 
-$hook['pre_system'] = function() {
-    $config_path = APPPATH . (ENVIRONMENT == 'testing' ? 'tests/' : 'config/');
-	try {
-		$dotenv = new Dotenv\Dotenv($config_path);
-		$dotenv->overload();
-	} catch(Exception $e) {
-		// continue, .env file not present
+		try
+		{
+			$config_path = APPPATH . 'config/config.php';
+			$dotenv = new Dotenv($config_path);
+			$dotenv->overload();
+		}
+		catch (Exception $e)
+		{
+			// continue, .env file not present
+		}
 	}
-};
+
+	/*
+	 * --------------------------------------------------------------------
+	 * Debug Toolbar Listeners.
+	 * --------------------------------------------------------------------
+	 * If you delete, they will no longer be collected.
+	 */
+	if (CI_DEBUG && !is_cli())
+	{
+		Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+		Services::toolbar()->respond();
+	}
+});
+
+Events::on('post_controller_constructor', ['Load_config', 'load_config']);	//TODO: This fails. Load_config not found
+
+Events::on('post_controller', ['Db_log', 'db_log_queries']);
+
+Events::on('pre_controller', ['Save', 'validate_save']);
diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php
new file mode 100644
index 000000000..671b078a4
--- /dev/null
+++ b/app/Config/Exceptions.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Setup how the exception handler works.
+ */
+class Exceptions extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * LOG EXCEPTIONS?
+	 * --------------------------------------------------------------------------
+	 * If true, then exceptions will be logged
+	 * through Services::Log.
+	 *
+	 * Default: true
+	 *
+	 * @var boolean
+	 */
+	public $log = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * DO NOT LOG STATUS CODES
+	 * --------------------------------------------------------------------------
+	 * Any status codes here will NOT be logged if logging is turned on.
+	 * By default, only 404 (Page Not Found) exceptions are ignored.
+	 *
+	 * @var array
+	 */
+	public $ignoreCodes = [404];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Error Views Path
+	 * --------------------------------------------------------------------------
+	 * This is the path to the directory that contains the 'cli' and 'html'
+	 * directories that hold the views used to generate errors.
+	 *
+	 * Default: APPPATH.'Views/errors'
+	 *
+	 * @var string
+	 */
+	public $errorViewPath = APPPATH . 'Views/errors';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * HIDE FROM DEBUG TRACE
+	 * --------------------------------------------------------------------------
+	 * Any data that you would like to hide from the debug trace.
+	 * In order to specify 2 levels, use "/" to separate.
+	 * ex. ['server', 'setup/password', 'secret_token']
+	 *
+	 * @var array
+	 */
+	public $sensitiveDataInTrace = [];
+}
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
new file mode 100644
index 000000000..793ae9a56
--- /dev/null
+++ b/app/Config/Filters.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Filters\CSRF;
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\Honeypot;
+
+class Filters extends BaseConfig
+{
+	/**
+	 * Configures aliases for Filter classes to
+	 * make reading things nicer and simpler.
+	 *
+	 * @var array
+	 */
+	public $aliases = [
+		'csrf'     => CSRF::class,
+		'toolbar'  => DebugToolbar::class,
+		'honeypot' => Honeypot::class,
+	];
+
+	/**
+	 * List of filter aliases that are always
+	 * applied before and after every request.
+	 *
+	 * @var array
+	 */
+	public $globals = [
+		'before' => [
+			'honeypot',
+			'csrf' => ['except' => 'login']
+		],
+		'after'  => [
+			'toolbar',
+			'honeypot',
+		],
+	];
+
+	/**
+	 * List of filter aliases that works on a
+	 * particular HTTP method (GET, POST, etc.).
+	 *
+	 * Example:
+	 * 'post' => ['csrf', 'throttle']
+	 *
+	 * @var array
+	 */
+	public $methods = [];
+
+	/**
+	 * List of filter aliases that should run on any
+	 * before or after URI patterns.
+	 *
+	 * Example:
+	 * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
+	 *
+	 * @var array
+	 */
+	public $filters = [];
+}
diff --git a/app/Config/ForeignCharacters.php b/app/Config/ForeignCharacters.php
new file mode 100644
index 000000000..174ddb16a
--- /dev/null
+++ b/app/Config/ForeignCharacters.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
+
+class ForeignCharacters extends BaseForeignCharacters
+{
+}
diff --git a/app/Config/Format.php b/app/Config/Format.php
new file mode 100644
index 000000000..3303b6e5b
--- /dev/null
+++ b/app/Config/Format.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Format\FormatterInterface;
+
+class Format extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Available Response Formats
+	 * --------------------------------------------------------------------------
+	 *
+	 * When you perform content negotiation with the request, these are the
+	 * available formats that your application supports. This is currently
+	 * only used with the API\ResponseTrait. A valid Formatter must exist
+	 * for the specified format.
+	 *
+	 * These formats are only checked when the data passed to the respond()
+	 * method is an array.
+	 *
+	 * @var string[]
+	 */
+	public $supportedResponseFormats = [
+		'application/json',
+		'application/xml', // machine-readable XML
+		'text/xml', // human-readable XML
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Formatters
+	 * --------------------------------------------------------------------------
+	 *
+	 * Lists the class to use to format responses with of a particular type.
+	 * For each mime type, list the class that should be used. Formatters
+	 * can be retrieved through the getFormatter() method.
+	 *
+	 * @var array<string, string>
+	 */
+	public $formatters = [
+		'application/json' => 'CodeIgniter\Format\JSONFormatter',
+		'application/xml'  => 'CodeIgniter\Format\XMLFormatter',
+		'text/xml'         => 'CodeIgniter\Format\XMLFormatter',
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Formatters Options
+	 * --------------------------------------------------------------------------
+	 *
+	 * Additional Options to adjust default formatters behaviour.
+	 * For each mime type, list the additional options that should be used.
+	 *
+	 * @var array<string, int>
+	 */
+	public $formatterOptions = [
+		'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+		'application/xml'  => 0,
+		'text/xml'         => 0,
+	];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A Factory method to return the appropriate formatter for the given mime type.
+	 * @param string $mime
+	 * @return FormatterInterface
+	 * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
+	 */
+	public function getFormatter(string $mime): FormatterInterface
+	{
+		return Services::format()->getFormatter($mime);
+	}
+}
diff --git a/app/Config/Generators.php b/app/Config/Generators.php
new file mode 100644
index 000000000..2c32587a1
--- /dev/null
+++ b/app/Config/Generators.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Generators extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Generator Commands' Views
+	 * --------------------------------------------------------------------------
+	 *
+	 * This array defines the mapping of generator commands to the view files
+	 * they are using. If you need to customize them for your own, copy these
+	 * view files in your own folder and indicate the location here.
+	 *
+	 * You will notice that the views have special placeholders enclosed in
+	 * curly braces `{...}`. These placeholders are used internally by the
+	 * generator commands in processing replacements, thus you are warned
+	 * not to delete them or modify the names. If you will do so, you may
+	 * end up disrupting the scaffolding process and throw errors.
+	 *
+	 * YOU HAVE BEEN WARNED!
+	 *
+	 * @var array<string, string>
+	 */
+	public $views = [
+		'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+		'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
+		'make:entity'       => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
+		'make:filter'       => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',
+		'make:migration'    => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+		'make:model'        => 'CodeIgniter\Commands\Generators\Views\model.tpl.php',
+		'make:seeder'       => 'CodeIgniter\Commands\Generators\Views\seeder.tpl.php',
+		'make:validation'   => 'CodeIgniter\Commands\Generators\Views\validation.tpl.php',
+		'session:migration' => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+	];
+}
diff --git a/app/Config/Honeypot.php b/app/Config/Honeypot.php
new file mode 100644
index 000000000..54bdcd4d0
--- /dev/null
+++ b/app/Config/Honeypot.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Honeypot extends BaseConfig
+{
+	/**
+	 * Makes Honeypot visible or not to human
+	 *
+	 * @var boolean
+	 */
+	public $hidden = true;
+
+	/**
+	 * Honeypot Label Content
+	 *
+	 * @var string
+	 */
+	public $label = 'Fill This Field';
+
+	/**
+	 * Honeypot Field Name
+	 *
+	 * @var string
+	 */
+	public $name = 'honeypot';
+
+	/**
+	 * Honeypot HTML Template
+	 *
+	 * @var string
+	 */
+	public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
+
+	/**
+	 * Honeypot container
+	 *
+	 * @var string
+	 */
+	public $container = '<div style="display:none">{template}</div>';
+}
diff --git a/app/Config/Images.php b/app/Config/Images.php
new file mode 100644
index 000000000..87cc5f86b
--- /dev/null
+++ b/app/Config/Images.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Images\Handlers\GDHandler;
+use CodeIgniter\Images\Handlers\ImageMagickHandler;
+
+class Images extends BaseConfig
+{
+	/**
+	 * Default handler used if no other handler is specified.
+	 *
+	 * @var string
+	 */
+	public $defaultHandler = 'gd';
+
+	/**
+	 * The path to the image library.
+	 * Required for ImageMagick, GraphicsMagick, or NetPBM.
+	 *
+	 * @var string
+	 */
+	public $libraryPath = '/usr/local/bin/convert';
+
+	/**
+	 * The available handler classes.
+	 *
+	 * @var array<string, string>
+	 */
+	public $handlers = [
+		'gd'      => GDHandler::class,
+		'imagick' => ImageMagickHandler::class,
+	];
+}
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
new file mode 100644
index 000000000..665de0bb1
--- /dev/null
+++ b/app/Config/Kint.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use Kint\Renderer\Renderer;
+
+/**
+ * --------------------------------------------------------------------------
+ * Kint
+ * --------------------------------------------------------------------------
+ *
+ * We use Kint's `RichRenderer` and `CLIRenderer`. This area contains options
+ * that you can set to customize how Kint works for you.
+ *
+ * @see https://kint-php.github.io/kint/ for details on these settings.
+ */
+class Kint extends BaseConfig
+{
+	/*
+	|--------------------------------------------------------------------------
+	| Global Settings
+	|--------------------------------------------------------------------------
+	*/
+
+	public $plugins = null;
+
+	public $maxDepth = 6;
+
+	public $displayCalledFrom = true;
+
+	public $expanded = false;
+
+	/*
+	|--------------------------------------------------------------------------
+	| RichRenderer Settings
+	|--------------------------------------------------------------------------
+	*/
+	public $richTheme = 'aante-light.css';
+
+	public $richFolder = false;
+
+	public $richSort = Renderer::SORT_FULL;
+
+	public $richObjectPlugins = null;
+
+	public $richTabPlugins = null;
+
+	/*
+	|--------------------------------------------------------------------------
+	| CLI Settings
+	|--------------------------------------------------------------------------
+	*/
+	public $cliColors = true;
+
+	public $cliForceUTF8 = false;
+
+	public $cliDetectWidth = true;
+
+	public $cliMinWidth = 40;
+}
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
new file mode 100644
index 000000000..848458037
--- /dev/null
+++ b/app/Config/Logger.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Logger extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Error Logging Threshold
+	 * --------------------------------------------------------------------------
+	 *
+	 * You can enable error logging by setting a threshold over zero. The
+	 * threshold determines what gets logged. Any values below or equal to the
+	 * threshold will be logged.
+	 *
+	 * Threshold options are:
+	 *
+	 * - 0 = Disables logging, Error logging TURNED OFF
+	 * - 1 = Emergency Messages - System is unusable
+	 * - 2 = Alert Messages - Action Must Be Taken Immediately
+	 * - 3 = Critical Messages - Application component unavailable, unexpected exception.
+	 * - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+	 * - 5 = Warnings - Exceptional occurrences that are not errors.
+	 * - 6 = Notices - Normal but significant events.
+	 * - 7 = Info - Interesting events, like user logging in, etc.
+	 * - 8 = Debug - Detailed debug information.
+	 * - 9 = All Messages
+	 *
+	 * You can also pass an array with threshold levels to show individual error types
+	 *
+	 *     [1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
+	 *
+	 * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
+	 * your log files will fill up very fast.
+	 *
+	 * @var integer|array
+	 */
+	public $threshold = 0;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Date Format for Logs
+	 * --------------------------------------------------------------------------
+	 *
+	 * Each item that is logged has an associated date. You can use PHP date
+	 * codes to set your own date formatting
+	 *
+	 * @var string
+	 */
+	public $dateFormat = 'Y-m-d H:i:s';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Log Handlers
+	 * --------------------------------------------------------------------------
+	 *
+	 * The logging system supports multiple actions to be taken when something
+	 * is logged. This is done by allowing for multiple Handlers, special classes
+	 * designed to write the log to their chosen destinations, whether that is
+	 * a file on the getServer, a cloud-based service, or even taking actions such
+	 * as emailing the dev team.
+	 *
+	 * Each handler is defined by the class name used for that handler, and it
+	 * MUST implement the `CodeIgniter\Log\Handlers\HandlerInterface` interface.
+	 *
+	 * The value of each key is an array of configuration items that are sent
+	 * to the constructor of each handler. The only required configuration item
+	 * is the 'handles' element, which must be an array of integer log levels.
+	 * This is most easily handled by using the constants defined in the
+	 * `Psr\Log\LogLevel` class.
+	 *
+	 * Handlers are executed in the order defined in this array, starting with
+	 * the handler on top and continuing down.
+	 *
+	 * @var array
+	 */
+	public $handlers = [
+
+		/*
+		 * --------------------------------------------------------------------
+		 * File Handler
+		 * --------------------------------------------------------------------
+		 */
+		'CodeIgniter\Log\Handlers\FileHandler' => [
+
+			/*
+			 * The log levels that this handler will handle.
+			 */
+			'handles'         => [
+				'critical',
+				'alert',
+				'emergency',
+				'debug',
+				'error',
+				'info',
+				'notice',
+				'warning',
+			],
+
+			/*
+			 * The default filename extension for log files.
+			 * An extension of 'php' allows for protecting the log files via basic
+			 * scripting, when they are to be stored under a publicly accessible directory.
+			 *
+			 * Note: Leaving it blank will default to 'log'.
+			 */
+			'fileExtension'   => '',
+
+			/*
+			 * The file system permissions to be applied on newly created log files.
+			 *
+			 * IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+			 * integer notation (i.e. 0700, 0644, etc.)
+			 */
+			'filePermissions' => 0640,
+
+			/*
+			 * Logging Directory Path
+			 *
+			 * By default, logs are written to WRITEPATH . 'logs/'
+			 * Specify a different destination here, if desired.
+			 */
+			'path'            => '',
+		],
+
+		/**
+		 * The ChromeLoggerHandler requires the use of the Chrome web browser
+		 * and the ChromeLogger extension. Uncomment this block to use it.
+		 */
+		// 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
+		//     /*
+		//      * The log levels that this handler will handle.
+		//      */
+		//     'handles' => ['critical', 'alert', 'emergency', 'debug',
+		//                   'error', 'info', 'notice', 'warning'],
+		// ],
+
+		/**
+		 * The ErrorlogHandler writes the logs to PHP's native `error_log()` function.
+		 * Uncomment this block to use it.
+		 */
+		// 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
+		// 		/* The log levels this handler can handle. */
+		// 		'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+		//
+		// 		/*
+		// 		 * The message type where the error should go. Can be 0 or 4, or use the
+		// 		 * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
+		// 		 */
+		// 		'messageType' => 0,
+		// ],
+	];
+}
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
new file mode 100644
index 000000000..1fa3100af
--- /dev/null
+++ b/app/Config/Migrations.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Migrations extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable/Disable Migrations
+	 * --------------------------------------------------------------------------
+	 *
+	 * Migrations are enabled by default.
+	 *
+	 * You should enable migrations whenever you intend to do a schema migration
+	 * and disable it back when you're done.
+	 *
+	 * @var boolean
+	 */
+	public $enabled = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Migrations Table
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the name of the table that will store the current migrations state.
+	 * When migrations runs it will store in a database table which migration
+	 * level the system is at. It then compares the migration level in this
+	 * table to the $config['migration_version'] if they are not the same it
+	 * will migrate up. This must be set.
+	 *
+	 * @var string
+	 */
+	public $table = 'migrations';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Timestamp Format
+	 * --------------------------------------------------------------------------
+	 *
+	 * This is the format that will be used when creating new migrations
+	 * using the CLI command:
+	 *   > php spark migrate:create
+	 *
+	 * Typical formats:
+	 * - YmdHis_
+	 * - Y-m-d-His_
+	 * - Y_m_d_His_
+	 *
+	 * @var string
+	 */
+	public $timestampFormat = 'Y-m-d-His_';
+}
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
new file mode 100644
index 000000000..d0dec0779
--- /dev/null
+++ b/app/Config/Mimes.php
@@ -0,0 +1,543 @@
+<?php
+
+namespace Config;
+
+/**
+ * Mimes
+ *
+ * This file contains an array of mime types.  It is used by the
+ * Upload class to help identify allowed file types.
+ *
+ * When more than one variation for an extension exist (like jpg, jpeg, etc)
+ * the most common one should be first in the array to aid the guess*
+ * methods. The same applies when more than one mime-type exists for a
+ * single extension.
+ *
+ * When working with mime types, please make sure you have the ´fileinfo´
+ * extension enabled to reliably detect the media types.
+ */
+
+class Mimes
+{
+	/**
+	 * Map of extensions to mime types.
+	 *
+	 * @var array
+	 */
+	public static $mimes = [
+		'hqx'   => [
+			'application/mac-binhex40',
+			'application/mac-binhex',
+			'application/x-binhex40',
+			'application/x-mac-binhex40',
+		],
+		'cpt'   => 'application/mac-compactpro',
+		'csv'   => [
+			'text/csv',
+			'text/x-comma-separated-values',
+			'text/comma-separated-values',
+			'application/vnd.ms-excel',
+			'application/x-csv',
+			'text/x-csv',
+			'application/csv',
+			'application/excel',
+			'application/vnd.msexcel',
+			'text/plain',
+		],
+		'bin'   => [
+			'application/macbinary',
+			'application/mac-binary',
+			'application/octet-stream',
+			'application/x-binary',
+			'application/x-macbinary',
+		],
+		'dms'   => 'application/octet-stream',
+		'lha'   => 'application/octet-stream',
+		'lzh'   => 'application/octet-stream',
+		'exe'   => [
+			'application/octet-stream',
+			'application/x-msdownload',
+		],
+		'class' => 'application/octet-stream',
+		'psd'   => [
+			'application/x-photoshop',
+			'image/vnd.adobe.photoshop',
+		],
+		'so'    => 'application/octet-stream',
+		'sea'   => 'application/octet-stream',
+		'dll'   => 'application/octet-stream',
+		'oda'   => 'application/oda',
+		'pdf'   => [
+			'application/pdf',
+			'application/force-download',
+			'application/x-download',
+		],
+		'ai'    => [
+			'application/pdf',
+			'application/postscript',
+		],
+		'eps'   => 'application/postscript',
+		'ps'    => 'application/postscript',
+		'smi'   => 'application/smil',
+		'smil'  => 'application/smil',
+		'mif'   => 'application/vnd.mif',
+		'xls'   => [
+			'application/vnd.ms-excel',
+			'application/msexcel',
+			'application/x-msexcel',
+			'application/x-ms-excel',
+			'application/x-excel',
+			'application/x-dos_ms_excel',
+			'application/xls',
+			'application/x-xls',
+			'application/excel',
+			'application/download',
+			'application/vnd.ms-office',
+			'application/msword',
+		],
+		'ppt'   => [
+			'application/vnd.ms-powerpoint',
+			'application/powerpoint',
+			'application/vnd.ms-office',
+			'application/msword',
+		],
+		'pptx'  => [
+			'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+			'application/x-zip',
+			'application/zip',
+		],
+		'wbxml' => 'application/wbxml',
+		'wmlc'  => 'application/wmlc',
+		'dcr'   => 'application/x-director',
+		'dir'   => 'application/x-director',
+		'dxr'   => 'application/x-director',
+		'dvi'   => 'application/x-dvi',
+		'gtar'  => 'application/x-gtar',
+		'gz'    => 'application/x-gzip',
+		'gzip'  => 'application/x-gzip',
+		'php'   => [
+			'application/x-php',
+			'application/x-httpd-php',
+			'application/php',
+			'text/php',
+			'text/x-php',
+			'application/x-httpd-php-source',
+		],
+		'php4'  => 'application/x-httpd-php',
+		'php3'  => 'application/x-httpd-php',
+		'phtml' => 'application/x-httpd-php',
+		'phps'  => 'application/x-httpd-php-source',
+		'js'    => [
+			'application/x-javascript',
+			'text/plain',
+		],
+		'swf'   => 'application/x-shockwave-flash',
+		'sit'   => 'application/x-stuffit',
+		'tar'   => 'application/x-tar',
+		'tgz'   => [
+			'application/x-tar',
+			'application/x-gzip-compressed',
+		],
+		'z'     => 'application/x-compress',
+		'xhtml' => 'application/xhtml+xml',
+		'xht'   => 'application/xhtml+xml',
+		'zip'   => [
+			'application/x-zip',
+			'application/zip',
+			'application/x-zip-compressed',
+			'application/s-compressed',
+			'multipart/x-zip',
+		],
+		'rar'   => [
+			'application/vnd.rar',
+			'application/x-rar',
+			'application/rar',
+			'application/x-rar-compressed',
+		],
+		'mid'   => 'audio/midi',
+		'midi'  => 'audio/midi',
+		'mpga'  => 'audio/mpeg',
+		'mp2'   => 'audio/mpeg',
+		'mp3'   => [
+			'audio/mpeg',
+			'audio/mpg',
+			'audio/mpeg3',
+			'audio/mp3',
+		],
+		'aif'   => [
+			'audio/x-aiff',
+			'audio/aiff',
+		],
+		'aiff'  => [
+			'audio/x-aiff',
+			'audio/aiff',
+		],
+		'aifc'  => 'audio/x-aiff',
+		'ram'   => 'audio/x-pn-realaudio',
+		'rm'    => 'audio/x-pn-realaudio',
+		'rpm'   => 'audio/x-pn-realaudio-plugin',
+		'ra'    => 'audio/x-realaudio',
+		'rv'    => 'video/vnd.rn-realvideo',
+		'wav'   => [
+			'audio/x-wav',
+			'audio/wave',
+			'audio/wav',
+		],
+		'bmp'   => [
+			'image/bmp',
+			'image/x-bmp',
+			'image/x-bitmap',
+			'image/x-xbitmap',
+			'image/x-win-bitmap',
+			'image/x-windows-bmp',
+			'image/ms-bmp',
+			'image/x-ms-bmp',
+			'application/bmp',
+			'application/x-bmp',
+			'application/x-win-bitmap',
+		],
+		'gif'   => 'image/gif',
+		'jpg'   => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jpeg'  => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jpe'   => [
+			'image/jpeg',
+			'image/pjpeg',
+		],
+		'jp2'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'j2k'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpf'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpg2'  => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpx'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'jpm'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'mj2'   => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'mjp2'  => [
+			'image/jp2',
+			'video/mj2',
+			'image/jpx',
+			'image/jpm',
+		],
+		'png'   => [
+			'image/png',
+			'image/x-png',
+		],
+		'tif'   => 'image/tiff',
+		'tiff'  => 'image/tiff',
+		'css'   => [
+			'text/css',
+			'text/plain',
+		],
+		'html'  => [
+			'text/html',
+			'text/plain',
+		],
+		'htm'   => [
+			'text/html',
+			'text/plain',
+		],
+		'shtml' => [
+			'text/html',
+			'text/plain',
+		],
+		'txt'   => 'text/plain',
+		'text'  => 'text/plain',
+		'log'   => [
+			'text/plain',
+			'text/x-log',
+		],
+		'rtx'   => 'text/richtext',
+		'rtf'   => 'text/rtf',
+		'xml'   => [
+			'application/xml',
+			'text/xml',
+			'text/plain',
+		],
+		'xsl'   => [
+			'application/xml',
+			'text/xsl',
+			'text/xml',
+		],
+		'mpeg'  => 'video/mpeg',
+		'mpg'   => 'video/mpeg',
+		'mpe'   => 'video/mpeg',
+		'qt'    => 'video/quicktime',
+		'mov'   => 'video/quicktime',
+		'avi'   => [
+			'video/x-msvideo',
+			'video/msvideo',
+			'video/avi',
+			'application/x-troff-msvideo',
+		],
+		'movie' => 'video/x-sgi-movie',
+		'doc'   => [
+			'application/msword',
+			'application/vnd.ms-office',
+		],
+		'docx'  => [
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'application/zip',
+			'application/msword',
+			'application/x-zip',
+		],
+		'dot'   => [
+			'application/msword',
+			'application/vnd.ms-office',
+		],
+		'dotx'  => [
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'application/zip',
+			'application/msword',
+		],
+		'xlsx'  => [
+			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+			'application/zip',
+			'application/vnd.ms-excel',
+			'application/msword',
+			'application/x-zip',
+		],
+		'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+		'xlsm'  => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+		'word'  => [
+			'application/msword',
+			'application/octet-stream',
+		],
+		'xl'    => 'application/excel',
+		'eml'   => 'message/rfc822',
+		'json'  => [
+			'application/json',
+			'text/json',
+		],
+		'pem'   => [
+			'application/x-x509-user-cert',
+			'application/x-pem-file',
+			'application/octet-stream',
+		],
+		'p10'   => [
+			'application/x-pkcs10',
+			'application/pkcs10',
+		],
+		'p12'   => 'application/x-pkcs12',
+		'p7a'   => 'application/x-pkcs7-signature',
+		'p7c'   => [
+			'application/pkcs7-mime',
+			'application/x-pkcs7-mime',
+		],
+		'p7m'   => [
+			'application/pkcs7-mime',
+			'application/x-pkcs7-mime',
+		],
+		'p7r'   => 'application/x-pkcs7-certreqresp',
+		'p7s'   => 'application/pkcs7-signature',
+		'crt'   => [
+			'application/x-x509-ca-cert',
+			'application/x-x509-user-cert',
+			'application/pkix-cert',
+		],
+		'crl'   => [
+			'application/pkix-crl',
+			'application/pkcs-crl',
+		],
+		'der'   => 'application/x-x509-ca-cert',
+		'kdb'   => 'application/octet-stream',
+		'pgp'   => 'application/pgp',
+		'gpg'   => 'application/gpg-keys',
+		'sst'   => 'application/octet-stream',
+		'csr'   => 'application/octet-stream',
+		'rsa'   => 'application/x-pkcs7',
+		'cer'   => [
+			'application/pkix-cert',
+			'application/x-x509-ca-cert',
+		],
+		'3g2'   => 'video/3gpp2',
+		'3gp'   => [
+			'video/3gp',
+			'video/3gpp',
+		],
+		'mp4'   => 'video/mp4',
+		'm4a'   => 'audio/x-m4a',
+		'f4v'   => [
+			'video/mp4',
+			'video/x-f4v',
+		],
+		'flv'   => 'video/x-flv',
+		'webm'  => 'video/webm',
+		'aac'   => 'audio/x-acc',
+		'm4u'   => 'application/vnd.mpegurl',
+		'm3u'   => 'text/plain',
+		'xspf'  => 'application/xspf+xml',
+		'vlc'   => 'application/videolan',
+		'wmv'   => [
+			'video/x-ms-wmv',
+			'video/x-ms-asf',
+		],
+		'au'    => 'audio/x-au',
+		'ac3'   => 'audio/ac3',
+		'flac'  => 'audio/x-flac',
+		'ogg'   => [
+			'audio/ogg',
+			'video/ogg',
+			'application/ogg',
+		],
+		'kmz'   => [
+			'application/vnd.google-earth.kmz',
+			'application/zip',
+			'application/x-zip',
+		],
+		'kml'   => [
+			'application/vnd.google-earth.kml+xml',
+			'application/xml',
+			'text/xml',
+		],
+		'ics'   => 'text/calendar',
+		'ical'  => 'text/calendar',
+		'zsh'   => 'text/x-scriptzsh',
+		'7zip'  => [
+			'application/x-compressed',
+			'application/x-zip-compressed',
+			'application/zip',
+			'multipart/x-zip',
+		],
+		'cdr'   => [
+			'application/cdr',
+			'application/coreldraw',
+			'application/x-cdr',
+			'application/x-coreldraw',
+			'image/cdr',
+			'image/x-cdr',
+			'zz-application/zz-winassoc-cdr',
+		],
+		'wma'   => [
+			'audio/x-ms-wma',
+			'video/x-ms-asf',
+		],
+		'jar'   => [
+			'application/java-archive',
+			'application/x-java-application',
+			'application/x-jar',
+			'application/x-compressed',
+		],
+		'svg'   => [
+			'image/svg+xml',
+			'image/svg',
+			'application/xml',
+			'text/xml',
+		],
+		'vcf'   => 'text/x-vcard',
+		'srt'   => [
+			'text/srt',
+			'text/plain',
+		],
+		'vtt'   => [
+			'text/vtt',
+			'text/plain',
+		],
+		'ico'   => [
+			'image/x-icon',
+			'image/x-ico',
+			'image/vnd.microsoft.icon',
+		],
+		'stl'   => [
+			'application/sla',
+			'application/vnd.ms-pki.stl',
+			'application/x-navistyle',
+		],
+	];
+
+	/**
+	 * Attempts to determine the best mime type for the given file extension.
+	 *
+	 * @param string $extension
+	 *
+	 * @return string|null The mime type found, or none if unable to determine.
+	 */
+	public static function guessTypeFromExtension(string $extension): ?string
+	{
+		$extension = trim(strtolower($extension), '. ');
+
+		if (! array_key_exists($extension, static::$mimes))
+		{
+			return null;
+		}
+
+		return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
+	}
+
+	/**
+	 * Attempts to determine the best file extension for a given mime type.
+	 *
+	 * @param string      $type
+	 * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
+	 *
+	 * @return string|null The extension determined, or null if unable to match.
+	 */
+	public static function guessExtensionFromType(string $type, string $proposedExtension = null): ?string
+	{
+		$type = trim(strtolower($type), '. ');
+
+		$proposedExtension = trim(strtolower($proposedExtension));
+
+		if ($proposedExtension !== '')
+		{
+			if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true))
+			{
+				// The detected mime type matches with the proposed extension.
+				return $proposedExtension;
+			}
+
+			// An extension was proposed, but the media type does not match the mime type list.
+			return null;
+		}
+
+		// Reverse check the mime type list if no extension was proposed.
+		// This search is order sensitive!
+		foreach (static::$mimes as $ext => $types)
+		{
+			if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true)))
+			{
+				return $ext;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
new file mode 100644
index 000000000..0814a0cfd
--- /dev/null
+++ b/app/Config/Modules.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Modules\Modules as BaseModules;
+
+class Modules extends BaseModules
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable Auto-Discovery?
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, then auto-discovery will happen across all elements listed in
+	 * $aliases below. If false, no auto-discovery will happen at all,
+	 * giving a slight performance boost.
+	 *
+	 * @var boolean
+	 */
+	public $enabled = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable Auto-Discovery Within Composer Packages?
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, then auto-discovery will happen across all namespaces loaded
+	 * by Composer, as well as the namespaces configured locally.
+	 *
+	 * @var boolean
+	 */
+	public $discoverInComposer = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Auto-Discovery Rules
+	 * --------------------------------------------------------------------------
+	 *
+	 * Aliases list of all discovery classes that will be active and used during
+	 * the current application request.
+	 *
+	 * If it is not listed, only the base application elements will be used.
+	 *
+	 * @var string[]
+	 */
+	public $aliases = [
+		'events',
+		'filters',
+		'registrars',
+		'routes',
+		'services',
+	];
+}
diff --git a/app/Config/OSPOS.php b/app/Config/OSPOS.php
new file mode 100644
index 000000000..5ed4e66a6
--- /dev/null
+++ b/app/Config/OSPOS.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * This class holds the configuration options stored from the database so that on launch those settings can be cached
+ * once in memory.  The settings are referenced frequently, so there is a significant performance hit to not storing
+ * them.
+ */
+class OSPOS extends BaseConfig
+{
+
+}
\ No newline at end of file
diff --git a/app/Config/Pager.php b/app/Config/Pager.php
new file mode 100644
index 000000000..00f15097d
--- /dev/null
+++ b/app/Config/Pager.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Pager extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Templates
+	 * --------------------------------------------------------------------------
+	 *
+	 * Pagination links are rendered out using views to configure their
+	 * appearance. This array contains aliases and the view names to
+	 * use when rendering the links.
+	 *
+	 * Within each view, the Pager object will be available as $pager,
+	 * and the desired group as $pagerGroup;
+	 *
+	 * @var array<string, string>
+	 */
+	public $templates = [
+		'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+		'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+		'default_head'   => 'CodeIgniter\Pager\Views\default_head',
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Items Per Page
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default number of results shown in a single page.
+	 *
+	 * @var integer
+	 */
+	public $perPage = 20;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Bootstrap 3 pagination links styling
+	 * --------------------------------------------------------------------------
+	 *
+	 * Source code from http://stackoverflow.com/questions/20088779/bootstrap-3-pagination-with-codeigniter
+	 */
+	public $config = [
+		'full_tag_open' => "<ul class='pagination pagination-sm'>",
+		'full_tag_close' => '</ul>',
+		'num_tag_open' => '<li>',
+		'num_tag_close' => '</li>',
+		'cur_tag_open' => "<li class='disabled'><li class='active'><a href='#'>",
+		'cur_tag_close' => "<span class='sr-only'></span></a></li>",
+		'next_tag_open' => "<li>",
+		'next_tagl_close' => "</li>",
+		'prev_tag_open' => "<li>",
+		'prev_tagl_close' => "</li>",
+		'first_tag_open' => "<li>",
+		'first_tagl_close' => "</li>",
+		'last_tag_open' => "<li>",
+		'last_tagl_close' => "</li>"
+	];
+}
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
new file mode 100644
index 000000000..007a6d328
--- /dev/null
+++ b/app/Config/Paths.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Config;
+
+/**
+ * Paths
+ *
+ * Holds the paths that are used by the system to
+ * locate the main directories, app, system, etc.
+ *
+ * Modifying these allows you to restructure your application,
+ * share a system folder between multiple applications, and more.
+ *
+ * All paths are relative to the project's root folder.
+ */
+
+class Paths
+{
+	/**
+	 * ---------------------------------------------------------------
+	 * SYSTEM FOLDER NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This must contain the name of your "system" folder. Include
+	 * the path if the folder is not in the same directory as this file.
+	 *
+	 * @var string
+	 */
+	public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * APPLICATION FOLDER NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * If you want this front controller to use a different "app"
+	 * folder than the default one you can set its name here. The folder
+	 * can also be renamed or relocated anywhere on your getServer. If
+	 * you do, use a full getServer path.
+	 *
+	 * @see http://codeigniter.com/user_guide/general/managing_apps.html
+	 *
+	 * @var string
+	 */
+	public $appDirectory = __DIR__ . '/..';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * WRITABLE DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of your "writable" directory.
+	 * The writable directory allows you to group all directories that
+	 * need write permission to a single place that can be tucked away
+	 * for maximum security, keeping it out of the app and/or
+	 * system directories.
+	 *
+	 * @var string
+	 */
+	public $writableDirectory = __DIR__ . '/../../writable';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * TESTS DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of your "tests" directory.
+	 *
+	 * @var string
+	 */
+	public $testsDirectory = __DIR__ . '/../../tests';
+
+	/**
+	 * ---------------------------------------------------------------
+	 * VIEW DIRECTORY NAME
+	 * ---------------------------------------------------------------
+	 *
+	 * This variable must contain the name of the directory that
+	 * contains the view files used by your application. By
+	 * default this is in `app/Views`. This value
+	 * is used when no value is provided to `Services::renderer()`.
+	 *
+	 * @var string
+	 */
+	public $viewDirectory = __DIR__ . '/../Views';
+}
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
new file mode 100644
index 000000000..32b5c5365
--- /dev/null
+++ b/app/Config/Routes.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Config;
+
+// Create a new instance of our RouteCollection class.
+$routes = Services::routes();
+
+// Load the system's routing file first, so that the app and ENVIRONMENT
+// can override as needed.
+if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
+{
+	require SYSTEMPATH . 'Config/Routes.php';
+}
+
+/*
+ * --------------------------------------------------------------------
+ * Router Setup
+ * --------------------------------------------------------------------
+ */
+$routes->setDefaultNamespace('App\Controllers');
+$routes->setDefaultController('Login');
+$routes->setDefaultMethod('index');
+$routes->setTranslateURIDashes(false);
+$routes->set404Override();
+$routes->setAutoRoute(true);
+
+/*
+ * --------------------------------------------------------------------
+ * Route Definitions
+ * --------------------------------------------------------------------
+ */
+
+// We get a performance increase by specifying the default
+// route since we don't have to scan directories.
+$routes->get('/', 'Login::index');
+
+$routes->add('no_access/([^/]+)', 'No_access::index/$1');
+$routes->add('no_access/([^/]+)/([^/]+)', 'No_access::index/$1/$2');
+
+$routes->add('sales/index/([^/]+)', 'Sales::manage/$1');
+$routes->add('sales/index/([^/]+)/([^/]+)', 'Sales::manage/$1/$2');
+$routes->add('sales/index/([^/]+)/([^/]+)/([^/]+)', 'Sales::manage/$1/$2/$3');
+
+$routes->add('reports/(summary_:any)/([^/]+)/([^/]+)', 'Reports::summary_(.+)/$1/$2/$3/$4'); //TODO - double check all TODOs
+$routes->add('reports/summary_expenses_categories', 'Reports::date_input_only');
+$routes->add('reports/summary_payments', 'Reports::date_input_only');
+$routes->add('reports/summary_discounts', 'Reports::summary_discounts_input');
+$routes->add('reports/summary_:any', 'Reports::date_input');
+
+$routes->add('reports/(graphical_:any)/([^/]+)/([^/]+)', 'Reports::/$1/$2/$3/$4'); //TODO
+$routes->add('reports/graphical_summary_expenses_categories', 'Reports::date_input_only');
+$routes->add('reports/graphical_summary_discounts', 'Reports::summary_discounts_input');
+$routes->add('reports/graphical_:any', 'Reports::date_input');
+
+$routes->add('reports/(inventory_:any)/([^/]+)', 'Reports::/$1/$2'); //TODO
+$routes->add('reports/inventory_summary', 'Reports::inventory_summary_input');
+$routes->add('reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)', 'Reports::/$1/$2'); //TODO
+
+$routes->add('reports/(detailed_:any)/([^/]+)/([^/]+)/([^/]+)', 'Reports::/$1/$2/$3/$4'); //TODO
+$routes->add('reports/detailed_sales', 'Reports::date_input_sales');
+$routes->add('reports/detailed_receivings', 'Reports::date_input_recv');
+
+$routes->add('reports/(specific_:any)/([^/]+)/([^/]+)/([^/]+)', 'Reports::/$1/$2/$3/$4'); //TODO
+$routes->add('reports/specific_customer', 'Reports::specific_customer_input');
+$routes->add('reports/specific_employee', 'Reports::specific_employee_input');
+$routes->add('reports/specific_discount', 'Reports::specific_discount_input');
+$routes->add('reports/specific_supplier', 'Reports::specific_supplier_input');
+
+/*
+ * --------------------------------------------------------------------
+ * Additional Routing
+ * --------------------------------------------------------------------
+ *
+ * There will often be times that you need additional routing and you
+ * need it to be able to override any defaults in this file. Environment
+ * based routes is one such time. require() additional route files here
+ * to make that happen.
+ *
+ * You will have access to the $routes object within that file without
+ * needing to reload it.
+ */
+if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php'))
+{
+	require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
+}
diff --git a/app/Config/Security.php b/app/Config/Security.php
new file mode 100644
index 000000000..c3819174c
--- /dev/null
+++ b/app/Config/Security.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Security extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	public $tokenName = 'csrf_ospos_v4';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Header Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Token name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	public $headerName = 'X-CSRF-TOKEN';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie name for Cross Site Request Forgery protection cookie.
+	 *
+	 * @var string
+	 */
+	 public $cookieName = 'csrf_cookie_ospos_v4';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Expires
+	 * --------------------------------------------------------------------------
+	 *
+	 * Expiration time for Cross Site Request Forgery protection cookie.
+	 *
+	 * Defaults to two hours (in seconds).
+	 *
+	 * @var integer
+	 */
+	public $expires = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Regenerate
+	 * --------------------------------------------------------------------------
+	 *
+	 * Regenerate CSRF Token on every request.
+	 *
+	 * @var boolean
+	 */
+	public $regenerate = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Redirect
+	 * --------------------------------------------------------------------------
+	 *
+	 * Redirect to previous page with error on failure.
+	 *
+	 * @var boolean
+	 */
+	public $redirect = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Setting for CSRF SameSite cookie token.
+	 *
+	 * Allowed values are: None - Lax - Strict - ''.
+	 *
+	 * Defaults to `Lax` as recommended in this link:
+	 *
+	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
+	 *
+	 * @var string
+	 *
+	 * @deprecated
+	 */
+	public $samesite = 'Lax';
+}
diff --git a/app/Config/Services.php b/app/Config/Services.php
new file mode 100644
index 000000000..898bcd030
--- /dev/null
+++ b/app/Config/Services.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
+/**
+ * Services Configuration file.
+ *
+ * Services are simply other classes/libraries that the system uses
+ * to do its job. This is used by CodeIgniter to allow the core of the
+ * framework to be swapped out easily without affecting the usage within
+ * the rest of your application.
+ *
+ * This file holds any application-specific services, or service overrides
+ * that you might need. An example has been included with the general
+ * method format you should use for your service methods. For more examples,
+ * see the core Services file at system/Config/Services.php.
+ */
+class Services extends BaseService
+{
+	// public static function example($getShared = true)
+	// {
+	//     if ($getShared)
+	//     {
+	//         return static::getSharedInstance('example');
+	//     }
+	//
+	//     return new \CodeIgniter\Example();
+	// }
+}
diff --git a/app/Config/Smileys.php b/app/Config/Smileys.php
new file mode 100644
index 000000000..8f24227b4
--- /dev/null
+++ b/app/Config/Smileys.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Smileys extends BaseConfig
+{
+	/*
+	| -------------------------------------------------------------------
+	| SMILEYS
+	| -------------------------------------------------------------------
+	| This file contains an array of smileys for use with the emoticon helper.
+	| Individual images can be used to replace multiple smileys.  For example:
+	| :-) and :) use the same image replacement.
+	|
+	| Please see user guide for more info:
+	| https://codeigniter.com/user_guide/helpers/smiley_helper.html
+	|
+	*/
+	public $smileys = [
+	//	smiley			image name					width	height	alt
+	':-)'			=>	['grin.gif',			'19',	'19',	'grin'],
+	':lol:'			=>	['lol.gif',			'19',	'19',	'LOL'],
+	':cheese:'		=>	['cheese.gif',			'19',	'19',	'cheese'],
+	':)'			=>	['smile.gif',			'19',	'19',	'smile'],
+	';-)'			=>	['wink.gif',			'19',	'19',	'wink'],
+	';)'			=>	['wink.gif',			'19',	'19',	'wink'],
+	':smirk:'		=>	['smirk.gif',			'19',	'19',	'smirk'],
+	':roll:'		=>	['rolleyes.gif',		'19',	'19',	'rolleyes'],
+	':-S'			=>	['confused.gif',		'19',	'19',	'confused'],
+	':wow:'			=>	['surprise.gif',		'19',	'19',	'surprised'],
+	':bug:'			=>	['bigsurprise.gif',	'19',	'19',	'big surprise'],
+	':-P'			=>	['tongue_laugh.gif',	'19',	'19',	'tongue laugh'],
+	'%-P'			=>	['tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'],
+	';-P'			=>	['tongue_wink.gif',	'19',	'19',	'tongue wink'],
+	':P'			=>	['raspberry.gif',		'19',	'19',	'raspberry'],
+	':blank:'		=>	['blank.gif',			'19',	'19',	'blank stare'],
+	':long:'		=>	['longface.gif',		'19',	'19',	'long face'],
+	':ohh:'			=>	['ohh.gif',			'19',	'19',	'ohh'],
+	':grrr:'		=>	['grrr.gif',			'19',	'19',	'grrr'],
+	':gulp:'		=>	['gulp.gif',			'19',	'19',	'gulp'],
+	'8-/'			=>	['ohoh.gif',			'19',	'19',	'oh oh'],
+	':down:'		=>	['downer.gif',			'19',	'19',	'downer'],
+	':red:'			=>	['embarrassed.gif',	'19',	'19',	'red face'],
+	':sick:'		=>	['sick.gif',			'19',	'19',	'sick'],
+	':shut:'		=>	['shuteye.gif',		'19',	'19',	'shut eye'],
+	':-/'			=>	['hmm.gif',			'19',	'19',	'hmmm'],
+	'>:('			=>	['mad.gif',			'19',	'19',	'mad'],
+	':mad:'			=>	['mad.gif',			'19',	'19',	'mad'],
+	'>:-('			=>	['angry.gif',			'19',	'19',	'angry'],
+	':angry:'		=>	['angry.gif',			'19',	'19',	'angry'],
+	':zip:'			=>	['zip.gif',			'19',	'19',	'zipper'],
+	':kiss:'		=>	['kiss.gif',			'19',	'19',	'kiss'],
+	':ahhh:'		=>	['shock.gif',			'19',	'19',	'shock'],
+	':coolsmile:'	=>	['shade_smile.gif',	'19',	'19',	'cool smile'],
+	':coolsmirk:'	=>	['shade_smirk.gif',	'19',	'19',	'cool smirk'],
+	':coolgrin:'	=>	['shade_grin.gif',		'19',	'19',	'cool grin'],
+	':coolhmm:'		=>	['shade_hmm.gif',		'19',	'19',	'cool hmm'],
+	':coolmad:'		=>	['shade_mad.gif',		'19',	'19',	'cool mad'],
+	':coolcheese:'	=>	['shade_cheese.gif',	'19',	'19',	'cool cheese'],
+	':vampire:'		=>	['vampire.gif',		'19',	'19',	'vampire'],
+	':snake:'		=>	['snake.gif',			'19',	'19',	'snake'],
+	':exclaim:'		=>	['exclaim.gif',		'19',	'19',	'exclaim'],
+	':question:'	=>	['question.gif',		'19',	'19',	'question']
+	];
+}
+
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
new file mode 100644
index 000000000..c7603e2f4
--- /dev/null
+++ b/app/Config/Toolbar.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\Toolbar\Collectors\Database;
+use CodeIgniter\Debug\Toolbar\Collectors\Events;
+use CodeIgniter\Debug\Toolbar\Collectors\Files;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\Debug\Toolbar\Collectors\Routes;
+use CodeIgniter\Debug\Toolbar\Collectors\Timers;
+use CodeIgniter\Debug\Toolbar\Collectors\Views;
+
+/**
+ * --------------------------------------------------------------------------
+ * Debug Toolbar
+ * --------------------------------------------------------------------------
+ *
+ * The Debug Toolbar provides a way to see information about the performance
+ * and state of your application during that page display. By default it will
+ * NOT be displayed under production environments, and will only display if
+ * `CI_DEBUG` is true, since if it's not, there's not much to display anyway.
+ */
+class Toolbar extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Toolbar Collectors
+	 * --------------------------------------------------------------------------
+	 *
+	 * List of toolbar collectors that will be called when Debug Toolbar
+	 * fires up and collects data from.
+	 *
+	 * @var string[]
+	 */
+	public $collectors = [
+		Timers::class,
+		Database::class,
+		Logs::class,
+		Views::class,
+		// \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+		Files::class,
+		Routes::class,
+		Events::class,
+	];
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Max History
+	 * --------------------------------------------------------------------------
+	 *
+	 * `$maxHistory` sets a limit on the number of past requests that are stored,
+	 * helping to conserve file space used to store them. You can set it to
+	 * 0 (zero) to not have any history stored, or -1 for unlimited history.
+	 *
+	 * @var integer
+	 */
+	public $maxHistory = 20;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Toolbar Views Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * The full path to the the views that are used by the toolbar.
+	 * This MUST have a trailing slash.
+	 *
+	 * @var string
+	 */
+	public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Max Queries
+	 * --------------------------------------------------------------------------
+	 *
+	 * If the Database Collector is enabled, it will log every query that the
+	 * the system generates so they can be displayed on the toolbar's timeline
+	 * and in the query log. This can lead to memory issues in some instances
+	 * with hundreds of queries.
+	 *
+	 * `$maxQueries` defines the maximum amount of queries that will be stored.
+	 *
+	 * @var integer
+	 */
+	public $maxQueries = 100;
+}
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
new file mode 100644
index 000000000..db17d737a
--- /dev/null
+++ b/app/Config/UserAgents.php
@@ -0,0 +1,252 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * -------------------------------------------------------------------
+ * User Agents
+ * -------------------------------------------------------------------
+ *
+ * This file contains four arrays of user agent data. It is used by the
+ * User Agent Class to help identify browser, platform, robot, and
+ * mobile device data. The array keys are used to identify the device
+ * and the array values are used to set the actual name of the item.
+ */
+class UserAgents extends BaseConfig
+{
+	/**
+	 * -------------------------------------------------------------------
+	 * OS Platforms
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
+	public $platforms = [
+		'windows nt 10.0' => 'Windows 10',
+		'windows nt 6.3'  => 'Windows 8.1',
+		'windows nt 6.2'  => 'Windows 8',
+		'windows nt 6.1'  => 'Windows 7',
+		'windows nt 6.0'  => 'Windows Vista',
+		'windows nt 5.2'  => 'Windows 2003',
+		'windows nt 5.1'  => 'Windows XP',
+		'windows nt 5.0'  => 'Windows 2000',
+		'windows nt 4.0'  => 'Windows NT 4.0',
+		'winnt4.0'        => 'Windows NT 4.0',
+		'winnt 4.0'       => 'Windows NT',
+		'winnt'           => 'Windows NT',
+		'windows 98'      => 'Windows 98',
+		'win98'           => 'Windows 98',
+		'windows 95'      => 'Windows 95',
+		'win95'           => 'Windows 95',
+		'windows phone'   => 'Windows Phone',
+		'windows'         => 'Unknown Windows OS',
+		'android'         => 'Android',
+		'blackberry'      => 'BlackBerry',
+		'iphone'          => 'iOS',
+		'ipad'            => 'iOS',
+		'ipod'            => 'iOS',
+		'os x'            => 'Mac OS X',
+		'ppc mac'         => 'Power PC Mac',
+		'freebsd'         => 'FreeBSD',
+		'ppc'             => 'Macintosh',
+		'linux'           => 'Linux',
+		'debian'          => 'Debian',
+		'sunos'           => 'Sun Solaris',
+		'beos'            => 'BeOS',
+		'apachebench'     => 'ApacheBench',
+		'aix'             => 'AIX',
+		'irix'            => 'Irix',
+		'osf'             => 'DEC OSF',
+		'hp-ux'           => 'HP-UX',
+		'netbsd'          => 'NetBSD',
+		'bsdi'            => 'BSDi',
+		'openbsd'         => 'OpenBSD',
+		'gnu'             => 'GNU/Linux',
+		'unix'            => 'Unknown Unix OS',
+		'symbian'         => 'Symbian OS',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Browsers
+	 * -------------------------------------------------------------------
+	 *
+	 * The order of this array should NOT be changed. Many browsers return
+	 * multiple browser types so we want to identify the subtype first.
+	 *
+	 * @var array<string, string>
+	 */
+	public $browsers = [
+		'OPR'               => 'Opera',
+		'Flock'             => 'Flock',
+		'Edge'              => 'Spartan',
+		'Edg'               => 'Edge',
+		'Chrome'            => 'Chrome',
+		// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
+		'Opera.*?Version'   => 'Opera',
+		'Opera'             => 'Opera',
+		'MSIE'              => 'Internet Explorer',
+		'Internet Explorer' => 'Internet Explorer',
+		'Trident.* rv'      => 'Internet Explorer',
+		'Shiira'            => 'Shiira',
+		'Firefox'           => 'Firefox',
+		'Chimera'           => 'Chimera',
+		'Phoenix'           => 'Phoenix',
+		'Firebird'          => 'Firebird',
+		'Camino'            => 'Camino',
+		'Netscape'          => 'Netscape',
+		'OmniWeb'           => 'OmniWeb',
+		'Safari'            => 'Safari',
+		'Mozilla'           => 'Mozilla',
+		'Konqueror'         => 'Konqueror',
+		'icab'              => 'iCab',
+		'Lynx'              => 'Lynx',
+		'Links'             => 'Links',
+		'hotjava'           => 'HotJava',
+		'amaya'             => 'Amaya',
+		'IBrowse'           => 'IBrowse',
+		'Maxthon'           => 'Maxthon',
+		'Ubuntu'            => 'Ubuntu Web Browser',
+		'Vivaldi'           => 'Vivaldi',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Mobiles
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
+	public $mobiles = [
+		// legacy array, old values commented out
+		'mobileexplorer'       => 'Mobile Explorer',
+		// 'openwave'             => 'Open Wave',
+		// 'opera mini'           => 'Opera Mini',
+		// 'operamini'            => 'Opera Mini',
+		// 'elaine'               => 'Palm',
+		'palmsource'           => 'Palm',
+		// 'digital paths'        => 'Palm',
+		// 'avantgo'              => 'Avantgo',
+		// 'xiino'                => 'Xiino',
+		'palmscape'            => 'Palmscape',
+		// 'nokia'                => 'Nokia',
+		// 'ericsson'             => 'Ericsson',
+		// 'blackberry'           => 'BlackBerry',
+		// 'motorola'             => 'Motorola'
+
+		// Phones and Manufacturers
+		'motorola'             => 'Motorola',
+		'nokia'                => 'Nokia',
+		'palm'                 => 'Palm',
+		'iphone'               => 'Apple iPhone',
+		'ipad'                 => 'iPad',
+		'ipod'                 => 'Apple iPod Touch',
+		'sony'                 => 'Sony Ericsson',
+		'ericsson'             => 'Sony Ericsson',
+		'blackberry'           => 'BlackBerry',
+		'cocoon'               => 'O2 Cocoon',
+		'blazer'               => 'Treo',
+		'lg'                   => 'LG',
+		'amoi'                 => 'Amoi',
+		'xda'                  => 'XDA',
+		'mda'                  => 'MDA',
+		'vario'                => 'Vario',
+		'htc'                  => 'HTC',
+		'samsung'              => 'Samsung',
+		'sharp'                => 'Sharp',
+		'sie-'                 => 'Siemens',
+		'alcatel'              => 'Alcatel',
+		'benq'                 => 'BenQ',
+		'ipaq'                 => 'HP iPaq',
+		'mot-'                 => 'Motorola',
+		'playstation portable' => 'PlayStation Portable',
+		'playstation 3'        => 'PlayStation 3',
+		'playstation vita'     => 'PlayStation Vita',
+		'hiptop'               => 'Danger Hiptop',
+		'nec-'                 => 'NEC',
+		'panasonic'            => 'Panasonic',
+		'philips'              => 'Philips',
+		'sagem'                => 'Sagem',
+		'sanyo'                => 'Sanyo',
+		'spv'                  => 'SPV',
+		'zte'                  => 'ZTE',
+		'sendo'                => 'Sendo',
+		'nintendo dsi'         => 'Nintendo DSi',
+		'nintendo ds'          => 'Nintendo DS',
+		'nintendo 3ds'         => 'Nintendo 3DS',
+		'wii'                  => 'Nintendo Wii',
+		'open web'             => 'Open Web',
+		'openweb'              => 'OpenWeb',
+
+		// Operating Systems
+		'android'              => 'Android',
+		'symbian'              => 'Symbian',
+		'SymbianOS'            => 'SymbianOS',
+		'elaine'               => 'Palm',
+		'series60'             => 'Symbian S60',
+		'windows ce'           => 'Windows CE',
+
+		// Browsers
+		'obigo'                => 'Obigo',
+		'netfront'             => 'Netfront Browser',
+		'openwave'             => 'Openwave Browser',
+		'mobilexplorer'        => 'Mobile Explorer',
+		'operamini'            => 'Opera Mini',
+		'opera mini'           => 'Opera Mini',
+		'opera mobi'           => 'Opera Mobile',
+		'fennec'               => 'Firefox Mobile',
+
+		// Other
+		'digital paths'        => 'Digital Paths',
+		'avantgo'              => 'AvantGo',
+		'xiino'                => 'Xiino',
+		'novarra'              => 'Novarra Transcoder',
+		'vodafone'             => 'Vodafone',
+		'docomo'               => 'NTT DoCoMo',
+		'o2'                   => 'O2',
+
+		// Fallback
+		'mobile'               => 'Generic Mobile',
+		'wireless'             => 'Generic Mobile',
+		'j2me'                 => 'Generic Mobile',
+		'midp'                 => 'Generic Mobile',
+		'cldc'                 => 'Generic Mobile',
+		'up.link'              => 'Generic Mobile',
+		'up.browser'           => 'Generic Mobile',
+		'smartphone'           => 'Generic Mobile',
+		'cellphone'            => 'Generic Mobile',
+	];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Robots
+	 * -------------------------------------------------------------------
+	 *
+	 * There are hundred of bots but these are the most common.
+	 *
+	 * @var array<string, string>
+	 */
+	public $robots = [
+		'googlebot'            => 'Googlebot',
+		'msnbot'               => 'MSNBot',
+		'baiduspider'          => 'Baiduspider',
+		'bingbot'              => 'Bing',
+		'slurp'                => 'Inktomi Slurp',
+		'yahoo'                => 'Yahoo',
+		'ask jeeves'           => 'Ask Jeeves',
+		'fastcrawler'          => 'FastCrawler',
+		'infoseek'             => 'InfoSeek Robot 1.0',
+		'lycos'                => 'Lycos',
+		'yandex'               => 'YandexBot',
+		'mediapartners-google' => 'MediaPartners Google',
+		'CRAZYWEBCRAWLER'      => 'Crazy Webcrawler',
+		'adsbot-google'        => 'AdsBot Google',
+		'feedfetcher-google'   => 'Feedfetcher Google',
+		'curious george'       => 'Curious George',
+		'ia_archiver'          => 'Alexa Crawler',
+		'MJ12bot'              => 'Majestic-12',
+		'Uptimebot'            => 'Uptimebot',
+	];
+}
diff --git a/app/Config/Validation.php b/app/Config/Validation.php
new file mode 100644
index 000000000..aa7a5d236
--- /dev/null
+++ b/app/Config/Validation.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+use app\Libraries\MY_Validation;
+
+class Validation
+{
+	//--------------------------------------------------------------------
+	// Setup
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the classes that contain the
+	 * rules that are available.
+	 *
+	 * @var string[]
+	 */
+	public $ruleSets = [
+		Rules::class,
+		FormatRules::class,
+		FileRules::class,
+		CreditCardRules::class,
+		MY_Validation::class
+	];
+
+	/**
+	 * Specifies the views that are used to display the
+	 * errors.
+	 *
+	 * @var array<string, string>
+	 */
+	public $templates = [
+		'error'  => 'app\Views\errors\error.php',
+		'list'   => 'CodeIgniter\Validation\Views\list',
+		'single' => 'CodeIgniter\Validation\Views\single',
+	];
+
+	//--------------------------------------------------------------------
+	// Rules
+	//--------------------------------------------------------------------
+}
diff --git a/app/Config/View.php b/app/Config/View.php
new file mode 100644
index 000000000..c945e2e06
--- /dev/null
+++ b/app/Config/View.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
+class View extends BaseView
+{
+	/**
+	 * When false, the view method will clear the data between each
+	 * call. This keeps your data safe and ensures there is no accidental
+	 * leaking between calls, so you would need to explicitly pass the data
+	 * to each view. You might prefer to have the data stick around between
+	 * calls so that it is available to all views. If that is the case,
+	 * set $saveData to true.
+	 *
+	 * @var boolean
+	 */
+	public $saveData = true;
+
+	/**
+	 * Parser Filters map a filter name with any PHP callable. When the
+	 * Parser prepares a variable for display, it will chain it
+	 * through the filters in the order defined, inserting any parameters.
+	 * To prevent potential abuse, all filters MUST be defined here
+	 * in order for them to be available for use within the Parser.
+	 *
+	 * Examples:
+	 *  { title|esc(js) }
+	 *  { created_on|date(Y-m-d)|esc(attr) }
+	 *
+	 * @var array
+	 */
+	public $filters = [];
+
+	/**
+	 * Parser Plugins provide a way to extend the functionality provided
+	 * by the core Parser by creating aliases that will be replaced with
+	 * any callable. Can be single or tag pair.
+	 *
+	 * @var array
+	 */
+	public $plugins = [];
+}
diff --git a/app/Language/en-US/index.html b/app/Config/index.html
similarity index 87%
rename from app/Language/en-US/index.html
rename to app/Config/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Language/en-US/index.html
+++ b/app/Config/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/application/config/migration.php b/app/Config/migration.php
similarity index 97%
rename from application/config/migration.php
rename to app/Config/migration.php
index 7c7a1acfc..7047dc9c6 100644
--- a/application/config/migration.php
+++ b/app/Config/migration.php
@@ -1,6 +1,4 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
 /*
 |--------------------------------------------------------------------------
 | Enable/Disable Migrations
diff --git a/application/config/profiler.php b/app/Config/profiler.php
similarity index 86%
rename from application/config/profiler.php
rename to app/Config/profiler.php
index 3db22e39c..541c14602 100644
--- a/application/config/profiler.php
+++ b/app/Config/profiler.php
@@ -1,6 +1,4 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
 /*
 | -------------------------------------------------------------------------
 | Profiler Sections
diff --git a/app/Controllers/Attributes.php b/app/Controllers/Attributes.php
index 8a07a32f0..22673c68e 100644
--- a/app/Controllers/Attributes.php
+++ b/app/Controllers/Attributes.php
@@ -1,74 +1,94 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Controllers;
+
+use app\Models\Attribute;
 
 require_once('Secure_Controller.php');
 
+/**
+ * Attributes controls the custom attributes assigned to items
+ * 
+ * @property attribute attribute
+ * 
+ */
 class Attributes extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('attributes');
+
+		$this->attribute = model('Attribute');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_attribute_definition_manage_table_headers());
+		$data['table_headers'] = get_attribute_definition_manage_table_headers();
 
-		$this->load->view('attributes/manage', $data);
+		echo view('attributes/manage', $data);
 	}
 
 	/**
 	 * Returns customer table data rows. This will be called with AJAX.
 	 */
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Attribute->get_found_rows($search);
+		$attributes = $this->attribute->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->attribute->get_found_rows($search);
 
 		$data_rows = [];
-		foreach($attributes->result() as $attribute)
+		foreach($attributes->getResult() as $attribute)
 		{
 			$attribute->definition_flags = $this->get_attributes($attribute->definition_flags);
-			$data_rows[] = get_attribute_definition_data_row($attribute, $this);
+			$data_rows[] = get_attribute_definition_data_row($attribute);
 		}
 
-		$data_rows = $this->xss_clean($data_rows);
-
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function save_attribute_value()
+	/**
+	 * @return void
+	 */
+	public function save_attribute_value(): void
 	{
-		$success = $this->Attribute->save_value(
-			$this->input->post('attribute_value'),
-			$this->input->post('definition_id'),
-			$this->input->post('item_id'),
-			$this->input->post('attribute_id')
+		$success = $this->attribute->save_value(
+			$this->request->getPost('attribute_value', FILTER_SANITIZE_STRING),
+			$this->request->getPost('definition_id', FILTER_SANITIZE_NUMBER_INT),
+			$this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT),
+			$this->request->getPost('attribute_id', FILTER_SANITIZE_NUMBER_INT)
 		);
 
-		echo json_encode(array('success' => $success != 0));
+		echo json_encode(['success' => $success != 0]);
 	}
 
-	public function delete_attribute_value()
+	/**
+	 * @return void
+	 */
+	public function delete_attribute_value(): void
 	{
-		$success = $this->Attribute->delete_value(
-			$this->input->post('attribute_value'),
-			$this->input->post('definition_id')
+		$success = $this->attribute->delete_value(
+			$this->request->getPost('attribute_value', FILTER_SANITIZE_STRING),
+			$this->request->getPost('definition_id', FILTER_SANITIZE_NUMBER_INT)
 		);
 
-		echo json_encode(array('success' => $success));
+		echo json_encode(['success' => $success]);
 	}
 
-	public function save_definition($definition_id = NO_DEFINITION_ID)
+	/**
+	 * @param int $definition_id
+	 * @return void
+	 */
+	public function save_definition(int $definition_id = NO_DEFINITION_ID): void
 	{
 		$definition_flags = 0;
 
-		$flags = (empty($this->input->post('definition_flags'))) ? [] : $this->input->post('definition_flags');
+		$flags = (empty($this->request->getPost('definition_flags'))) ? [] : $this->request->getPost('definition_flags', FILTER_SANITIZE_STRING);
 
 		foreach($flags as $flag)
 		{
@@ -76,90 +96,104 @@ class Attributes extends Secure_Controller
 		}
 
 	//Save definition data
-		$definition_data = array(
-			'definition_name' => $this->input->post('definition_name'),
-			'definition_unit' => $this->input->post('definition_unit') != '' ? $this->input->post('definition_unit') : NULL,
+		$definition_data = [
+			'definition_name' => $this->request->getPost('definition_name', FILTER_SANITIZE_STRING),
+			'definition_unit' => $this->request->getPost('definition_unit') != '' ? $this->request->getPost('definition_unit', FILTER_SANITIZE_STRING) : NULL,
 			'definition_flags' => $definition_flags,
-			'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL
-		);
+			'definition_fk' => $this->request->getPost('definition_group') != '' ? $this->request->getPost('definition_group', FILTER_SANITIZE_STRING) : NULL
+		];
 
-		if ($this->input->post('definition_type') != null)
+		if ($this->request->getPost('definition_type') != NULL)
 		{
-			$definition_data['definition_type'] = DEFINITION_TYPES[$this->input->post('definition_type')];
+			$definition_data['definition_type'] = DEFINITION_TYPES[$this->request->getPost('definition_type', FILTER_SANITIZE_STRING)];
 		}
 
-		$definition_name = $this->xss_clean($definition_data['definition_name']);
+		$definition_name = $definition_data['definition_name'];
 
-		if($this->Attribute->save_definition($definition_data, $definition_id))
+		if($this->attribute->save_definition($definition_data, $definition_id))
 		{
 		//New definition
 			if($definition_id == 0)
 			{
-				$definition_values = json_decode($this->input->post('definition_values'));
+				$definition_values = json_decode($this->request->getPost('definition_values', FILTER_SANITIZE_STRING));
 
 				foreach($definition_values as $definition_value)
 				{
-					$this->Attribute->save_value($definition_value, $definition_data['definition_id']);
+					$this->attribute->save_value($definition_value, $definition_data['definition_id']);
 				}
 
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_adding').' '.
-					$definition_name, 'id' => $definition_data['definition_id']));
+				echo json_encode([
+					'success' => TRUE,
+					'message' => lang('Attributes.definition_successful_adding') . ' ' . $definition_name,
+					'id' => $definition_data['definition_id']
+				]);
 			}
 		//Existing definition
 			else
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('attributes_definition_successful_updating').' '.
-					$definition_name, 'id' => $definition_id));
+				echo json_encode([
+					'success' => TRUE,
+					'message' => lang('Attributes.definition_successful_updating') . ' ' . $definition_name,
+					'id' => $definition_id
+				]);
 			}
 		}
 	//Failure
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_error_adding_updating', $definition_name), 'id' => -1));
+			echo json_encode([
+				'success' => FALSE,
+				'message' => lang('Attributes.definition_error_adding_updating', ['definition_name' => $definition_name]),
+				'id' => -1
+			]);
 		}
 	}
 
-	public function suggest_attribute($definition_id)
+	/**
+	 * @param int $definition_id
+	 * @return void
+	 */
+	public function suggest_attribute(int $definition_id): void
 	{
-		$suggestions = $this->xss_clean($this->Attribute->get_suggestions($definition_id, $this->input->get('term')));
+		$suggestions = $this->attribute->get_suggestions($definition_id, $this->request->getGet('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$attribute_definition_info = $this->Attribute->get_info($row_id);
+		$attribute_definition_info = $this->attribute->get_info($row_id);
 		$attribute_definition_info->definition_flags = $this->get_attributes($attribute_definition_info->definition_flags);
-		$data_row = $this->xss_clean(get_attribute_definition_data_row($attribute_definition_info));
+		$data_row = get_attribute_definition_data_row($attribute_definition_info);
 
 		echo json_encode($data_row);
 	}
 
-	private function get_attributes($definition_flags = 0)
+	private function get_attributes(int $definition_flags = 0): array
 	{
 		$definition_flag_names = [];
 		foreach (Attribute::get_definition_flags() as $id => $term)
 		{
 			if ($id & $definition_flags)
 			{
-				$definition_flag_names[$id] = $this->lang->line('attributes_' . strtolower($term) . '_visibility');
+				$definition_flag_names[$id] = lang('Attributes.' . strtolower($term) . '_visibility');
 			}
 		}
 		return $definition_flag_names;
 	}
 
-	public function view($definition_id = NO_DEFINITION_ID)
+	public function view(int $definition_id = NO_DEFINITION_ID): void
 	{
-		$info = $this->Attribute->get_info($definition_id);
+		$info = $this->attribute->get_info($definition_id);
 		foreach(get_object_vars($info) as $property => $value)
 		{
-			$info->$property = $this->xss_clean($value);
+			$info->$property = $value;
 		}
 
 		$data['definition_id'] = $definition_id;
-		$data['definition_values'] = $this->Attribute->get_definition_values($definition_id);
-		$data['definition_group'] = $this->Attribute->get_definitions_by_type(GROUP, $definition_id);
-		$data['definition_group'][''] = $this->lang->line('common_none_selected_text');
+		$data['definition_values'] = $this->attribute->get_definition_values($definition_id);
+		$data['definition_group'] = $this->attribute->get_definitions_by_type(GROUP, $definition_id);
+		$data['definition_group'][''] = lang('Common.none_selected_text');
 		$data['definition_info'] = $info;
 
 		$show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
@@ -167,26 +201,26 @@ class Attributes extends Secure_Controller
 		$selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
 		$data['selected_definition_flags'] = $this->get_attributes($selected_flags);
 
-		$this->load->view('attributes/form', $data);
+		echo view('attributes/form', $data);
 	}
 
-	public function delete_value($attribute_id)
+	public function delete_value(int $attribute_id): bool	//TODO: This function appears to never be used in the codebase.  Is it needed?
 	{
-		return $this->Attribute->delete_value($attribute_id);
+		return $this->attribute->delete_value($attribute_id, NO_DEFINITION_ID);
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$attributes_to_delete = $this->input->post('ids');
+		$attributes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Attribute->delete_definition_list($attributes_to_delete))
+		if($this->attribute->delete_definition_list($attributes_to_delete))
 		{
-			$message = $this->lang->line('attributes_definition_successful_deleted') . ' ' . count($attributes_to_delete) . ' ' . $this->lang->line('attributes_definition_one_or_multiple');
-			echo json_encode(array('success' => TRUE, 'message' => $message));
+			$message = lang('Attributes.definition_successful_deleted') . ' ' . count($attributes_to_delete) . ' ' . lang('Attributes.definition_one_or_multiple');
+			echo json_encode(['success' => TRUE, 'message' => $message]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_cannot_be_deleted')));
+			echo json_encode(['success' => FALSE, 'message' => lang('Attributes.definition_cannot_be_deleted')]);
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
new file mode 100644
index 000000000..5ed3bdcee
--- /dev/null
+++ b/app/Controllers/BaseController.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Database;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class BaseController
+ *
+ * BaseController provides a convenient place for loading components
+ * and performing functions that are needed by all your controllers.
+ * Extend this class in any new controllers:
+ *     class Home extends BaseController
+ *
+ * For security be sure to declare any new methods as protected or private.
+ *
+ * @property BaseConnection db
+ */
+
+class BaseController extends Controller
+{
+	/**
+	 * Instance of the main Request object.
+	 *
+	 * @var IncomingRequest|CLIRequest
+	 */
+	protected $request;
+
+	/**
+	 * An array of helpers to be loaded automatically upon
+	 * class instantiation. These helpers will be available
+	 * to all other controllers that extend BaseController.
+	 *
+	 * @var array
+	 */
+	protected $helpers = ['form', 'url', 'tabular', 'text', 'locale', 'html', 'download', 'directory', 'migration', 'importfile'];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger	//TODO: Need to sort this out. Multiple definitions exist for class 'LoggerInterface'
+	 */
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+	{
+		// Do Not Edit This Line
+		parent::initController($request, $response, $logger);
+
+		//--------------------------------------------------------------------
+		// Preload any models, libraries, etc, here.
+		//--------------------------------------------------------------------
+		// E.g.: $this->session = \Config\Services::session();
+		$this->db = Database::connect();
+	}
+}
diff --git a/app/Controllers/Cashups.php b/app/Controllers/Cashups.php
index fe295bc97..b645dddfc 100644
--- a/app/Controllers/Cashups.php
+++ b/app/Controllers/Cashups.php
@@ -1,71 +1,84 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Cashup;
+use app\Models\Expense;
+use app\Models\Reports\Summary_payments;
+
+/**
+ * @property cashup cashup
+ * @property expense expense
+ * @property summary_payments summary_payments
+ */
 class Cashups extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('cashups');
+		
+		$this->cashup = model('Cashup');
+		$this->expense = model('Expense');
+		$this->summary_payments = model('Reports/Summary_payments');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_cashups_manage_table_headers());
+		$data['table_headers'] = get_cashups_manage_table_headers();
 
 		// filters that will be loaded in the multiselect dropdown
-		$data['filters'] = array('is_deleted' => $this->lang->line('cashups_is_deleted'));
+		$data['filters'] = ['is_deleted' => lang('Cashups.is_deleted')];
 
-		$this->load->view('cashups/manage', $data);
+		echo view('cashups/manage', $data);
 	}
 
-	public function search()
+	public function search(): void
 	{
-		$cash_up = 0;
-		$search   = $this->input->get('search');
-		$limit    = $this->input->get('limit');
-		$offset   = $this->input->get('offset');
-		$sort     = $this->input->get('sort');
-		$order    = $this->input->get('order');
-		$filters  = array(
-					 'start_date' => $this->input->get('start_date'),
-					 'end_date' => $this->input->get('end_date'),
-					 'is_deleted' => FALSE);
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order = $this->request->getGet('order', FILTER_SANITIZE_STRING);
+		$filters = [
+			 'start_date' => $this->request->getGet('start_date', FILTER_SANITIZE_STRING),	//TODO: Is this the best way to filter dates
+			 'end_date' => $this->request->getGet('end_date', FILTER_SANITIZE_STRING),
+			 'is_deleted' => FALSE
+		];
 
 		// check if any filter is set in the multiselect dropdown
-		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$filledup = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_STRING), TRUE);	//TODO: $filledup doesn't follow variable naming patterns we are using.
 		$filters = array_merge($filters, $filledup);
-		$cash_ups = $this->Cashup->search($search, $filters, $limit, $offset, $sort, $order);
-		$total_rows = $this->Cashup->get_found_rows($search, $filters);
-		$data_rows = array();
-		foreach($cash_ups->result() as $cash_up)
+		$cash_ups = $this->cashup->search($search, $filters, $limit, $offset, $sort, $order);
+		$total_rows = $this->cashup->get_found_rows($search, $filters);
+		$data_rows = [];
+		foreach($cash_ups->getResult() as $cash_up)
 		{
-			$data_rows[] = $this->xss_clean(get_cash_up_data_row($cash_up));
+			$data_rows[] = get_cash_up_data_row($cash_up);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function view($cashup_id = -1)
+	public function view(int $cashup_id = -1): void	//TODO: Need to replace -1 with a constant in constants.php
 	{
-		$data = array();
+		$data = [];
 
-		$data['employees'] = array();
-		foreach($this->Employee->get_all()->result() as $employee)
+		$data['employees'] = [];
+		foreach($this->employee->get_all()->getResult() as $employee)
 		{
 			foreach(get_object_vars($employee) as $property => $value)
 			{
-				$employee->$property = $this->xss_clean($value);
+				$employee->$property = $value;
 			}
 
 			$data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
 		}
 
-		$cash_ups_info = $this->Cashup->get_info($cashup_id);
+		$cash_ups_info = $this->cashup->get_info($cashup_id);
 
 		foreach(get_object_vars($cash_ups_info) as $property => $value)
 		{
-			$cash_ups_info->$property = $this->xss_clean($value);
+			$cash_ups_info->$property = $value;
 		}
 
 		// open cashup
@@ -73,14 +86,14 @@ class Cashups extends Secure_Controller
 		{
 			$cash_ups_info->open_date = date('Y-m-d H:i:s');
 			$cash_ups_info->close_date = $cash_ups_info->open_date;
-			$cash_ups_info->open_employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-			$cash_ups_info->close_employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+			$cash_ups_info->open_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+			$cash_ups_info->close_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 		}
 		// if all the amounts are null or 0 that means it's a close cashup
-		elseif(floatval($cash_ups_info->closed_amount_cash) == 0 &&
-			floatval($cash_ups_info->closed_amount_due) == 0 &&
-			floatval($cash_ups_info->closed_amount_card) == 0 &&
-			floatval($cash_ups_info->closed_amount_check) == 0)
+		elseif(floatval($cash_ups_info->closed_amount_cash) == 0
+			&& floatval($cash_ups_info->closed_amount_due) == 0
+			&& floatval($cash_ups_info->closed_amount_card) == 0
+			&& floatval($cash_ups_info->closed_amount_check) == 0)
 		{
 			// set the close date and time to the actual as this is a close session
 			$cash_ups_info->close_date = date('Y-m-d H:i:s');
@@ -89,58 +102,69 @@ class Cashups extends Secure_Controller
 			$cash_ups_info->closed_amount_cash = $cash_ups_info->open_amount_cash + $cash_ups_info->transfer_amount_cash;
 
 			// if it's date mode only and not date & time truncate the open and end date to date only
-			if(empty($this->config->item('date_or_time_format')))
+			if(empty(config('OSPOS')->date_or_time_format))
 			{
 				// search for all the payments given the time range
-				$inputs = array('start_date' => substr($cash_ups_info->open_date, 0, 10), 'end_date' => substr($cash_ups_info->close_date, 0, 10), 'sale_type' => 'complete', 'location_id' => 'all');
+				$inputs = [
+					'start_date' => substr($cash_ups_info->open_date, 0, 10),
+					'end_date' => substr($cash_ups_info->close_date, 0, 10),
+					'sale_type' => 'complete',
+					'location_id' => 'all'
+				];
 			}
 			else
 			{
 				// search for all the payments given the time range
-				$inputs = array('start_date' => $cash_ups_info->open_date, 'end_date' => $cash_ups_info->close_date, 'sale_type' => 'complete', 'location_id' => 'all');
+				$inputs = [
+					'start_date' => $cash_ups_info->open_date,
+					'end_date' => $cash_ups_info->close_date,
+					'sale_type' => 'complete',
+					'location_id' => 'all'
+				];
 			}
 
 			// get all the transactions payment summaries
-			$this->load->model('reports/Summary_payments');
-			$reports_data = $this->Summary_payments->getData($inputs);
+			$reports_data = $this->summary_payments->getData($inputs);
 
 			foreach($reports_data as $row)
 			{
-				if($row['trans_group'] == $this->lang->line('reports_trans_payments'))
+				if($row['trans_group'] == lang('Reports.trans_payments'))
 				{
-					if($row['trans_type'] == $this->lang->line('sales_cash'))
+					if($row['trans_type'] == lang('Sales.cash'))
 					{
-						$cash_ups_info->closed_amount_cash += $this->xss_clean($row['trans_amount']);
+						$cash_ups_info->closed_amount_cash += $row['trans_amount'];
 					}
-					elseif($row['trans_type'] == $this->lang->line('sales_due'))
+					elseif($row['trans_type'] == lang('Sales.due'))
 					{
-						$cash_ups_info->closed_amount_due += $this->xss_clean($row['trans_amount']);
+						$cash_ups_info->closed_amount_due += $row['trans_amount'];
 					}
-					elseif($row['trans_type'] == $this->lang->line('sales_debit') ||
-						$row['trans_type'] == $this->lang->line('sales_credit'))
+					elseif($row['trans_type'] == lang('Sales.debit') ||
+						$row['trans_type'] == lang('Sales.credit'))
 					{
-						$cash_ups_info->closed_amount_card += $this->xss_clean($row['trans_amount']);
+						$cash_ups_info->closed_amount_card += $row['trans_amount'];
 					}
-					elseif($row['trans_type'] == $this->lang->line('sales_check'))
+					elseif($row['trans_type'] == lang('Sales.check'))
 					{
-						$cash_ups_info->closed_amount_check += $this->xss_clean($row['trans_amount']);
+						$cash_ups_info->closed_amount_check += $row['trans_amount'];
 					}
 				}
 			}
 
 			// lookup expenses paid in cash
-			$filters = array(
+			$filters = [
 						 'only_cash' => TRUE,
 						 'only_due' => FALSE,
 						 'only_check' => FALSE,
 						 'only_credit' => FALSE,
 						 'only_debit' => FALSE,
-						 'is_deleted' => FALSE);
-			$payments = $this->Expense->get_payments_summary('', array_merge($inputs, $filters));
+						 'is_deleted' => FALSE
+			];
+
+			$payments = $this->expense->get_payments_summary('', array_merge($inputs, $filters));
 
 			foreach($payments as $row)
 			{
-				$cash_ups_info->closed_amount_cash -= $this->xss_clean($row['amount']);
+				$cash_ups_info->closed_amount_cash -= $row['amount'];
 			}
 
 			$cash_ups_info->closed_amount_total = $this->_calculate_total($cash_ups_info->open_amount_cash, $cash_ups_info->transfer_amount_cash, $cash_ups_info->closed_amount_cash, $cash_ups_info->closed_amount_due, $cash_ups_info->closed_amount_card, $cash_ups_info->closed_amount_check);
@@ -148,99 +172,96 @@ class Cashups extends Secure_Controller
 
 		$data['cash_ups_info'] = $cash_ups_info;
 
-		$this->load->view("cashups/form", $data);
+		echo view("cashups/form", $data);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$cash_ups_info = $this->Cashup->get_info($row_id);
-		$data_row = $this->xss_clean(get_cash_up_data_row($cash_ups_info));
+		$cash_ups_info = $this->cashup->get_info($row_id);
+		$data_row = get_cash_up_data_row($cash_ups_info);
 
 		echo json_encode($data_row);
 	}
 
-	public function save($cashup_id = -1)
+	public function save(int $cashup_id = -1): void	//TODO: Need to replace -1 with a constant in constants.php
 	{
-		$open_date = $this->input->post('open_date');
-		$open_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $open_date);
+		$open_date = $this->request->getPost('open_date', FILTER_SANITIZE_STRING);
+		$open_date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $open_date);
 
-		$close_date = $this->input->post('close_date');
-		$close_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $close_date);
+		$close_date = $this->request->getPost('close_date', FILTER_SANITIZE_NUMBER_INT);
+		$close_date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $close_date);
 
-		$cash_up_data = array(
+		$cash_up_data = [
 			'open_date' => $open_date_formatter->format('Y-m-d H:i:s'),
 			'close_date' => $close_date_formatter->format('Y-m-d H:i:s'),
-			'open_amount_cash' => parse_decimals($this->input->post('open_amount_cash')),
-			'transfer_amount_cash' => parse_decimals($this->input->post('transfer_amount_cash')),
-			'closed_amount_cash' => parse_decimals($this->input->post('closed_amount_cash')),
-			'closed_amount_due' => parse_decimals($this->input->post('closed_amount_due')),
-			'closed_amount_card' => parse_decimals($this->input->post('closed_amount_card')),
-			'closed_amount_check' => parse_decimals($this->input->post('closed_amount_check')),
-			'closed_amount_total' => parse_decimals($this->input->post('closed_amount_total')),
-			'note' => $this->input->post('note') != NULL,
-			'description' => $this->input->post('description'),
-			'open_employee_id' => $this->input->post('open_employee_id'),
-			'close_employee_id' => $this->input->post('close_employee_id'),
-			'deleted' => $this->input->post('deleted') != NULL
-		);
+			'open_amount_cash' => parse_decimals($this->request->getPost('open_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'transfer_amount_cash' => parse_decimals($this->request->getPost('transfer_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'closed_amount_cash' => parse_decimals($this->request->getPost('closed_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'closed_amount_due' => parse_decimals($this->request->getPost('closed_amount_due', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'closed_amount_card' => parse_decimals($this->request->getPost('closed_amount_card', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'closed_amount_check' => parse_decimals($this->request->getPost('closed_amount_check', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'closed_amount_total' => parse_decimals($this->request->getPost('closed_amount_total', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'note' => $this->request->getPost('note') != NULL,
+			'description' => $this->request->getPost('description', FILTER_SANITIZE_STRING),
+			'open_employee_id' => $this->request->getPost('open_employee_id', FILTER_SANITIZE_NUMBER_INT),
+			'close_employee_id' => $this->request->getPost('close_employee_id', FILTER_SANITIZE_NUMBER_INT),
+			'deleted' => $this->request->getPost('deleted') != NULL
+		];
 
-		if($this->Cashup->save($cash_up_data, $cashup_id))
+		if($this->cashup->save_value($cash_up_data, $cashup_id))
 		{
-			$cash_up_data = $this->xss_clean($cash_up_data);
-
 			//New cashup_id
-			if($cashup_id == -1)
+			if($cashup_id == -1)//TODO: Need to replace -1 with a constant in constants.php
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('cashups_successful_adding'), 'id' => $cash_up_data['cashup_id']));
+				echo json_encode(['success' => TRUE, 'message' => lang('Cashups.successful_adding'), 'id' => $cash_up_data['cashup_id']]);
 			}
 			else // Existing Cashup
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('cashups_successful_updating'), 'id' => $cashup_id));
+				echo json_encode(['success' => TRUE, 'message' => lang('Cashups.successful_updating'), 'id' => $cashup_id]);
 			}
 		}
 		else//failure
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('cashups_error_adding_updating'), 'id' => -1));
+			echo json_encode(['success' => FALSE, 'message' => lang('Cashups.error_adding_updating'), 'id' => -1]);//TODO: Need to replace -1 with a constant in constants.php
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$cash_ups_to_delete = $this->input->post('ids');
+		$cash_ups_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Cashup->delete_list($cash_ups_to_delete))
+		if($this->cashup->delete_list($cash_ups_to_delete))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('cashups_successful_deleted') . ' ' . count($cash_ups_to_delete) . ' ' . $this->lang->line('cashups_one_or_multiple'), 'ids' => $cash_ups_to_delete));
+			echo json_encode(['success' => TRUE, 'message' => lang('Cashups.successful_deleted') . ' ' . count($cash_ups_to_delete) . ' ' . lang('Cashups.one_or_multiple'), 'ids' => $cash_ups_to_delete]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('cashups_cannot_be_deleted'), 'ids' => $cash_ups_to_delete));
+			echo json_encode(['success' => FALSE, 'message' => lang('Cashups.cannot_be_deleted'), 'ids' => $cash_ups_to_delete]);
 		}
 	}
 
-	/*
-	AJAX call from cashup input form to calculate the total
-	*/
-	public function ajax_cashup_total()
+	/**
+	 * AJAX call from cashup input form to calculate the total. Called in the view.
+	 */
+	public function ajax_cashup_total(): void
 	{
-		$open_amount_cash = parse_decimals($this->input->post('open_amount_cash'));
-		$transfer_amount_cash = parse_decimals($this->input->post('transfer_amount_cash'));
-		$closed_amount_cash = parse_decimals($this->input->post('closed_amount_cash'));
-		$closed_amount_due = parse_decimals($this->input->post('closed_amount_due'));
-		$closed_amount_card = parse_decimals($this->input->post('closed_amount_card'));
-		$closed_amount_check = parse_decimals($this->input->post('closed_amount_check'));
+		$open_amount_cash = parse_decimals($this->request->getPost('open_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$transfer_amount_cash = parse_decimals($this->request->getPost('transfer_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$closed_amount_cash = parse_decimals($this->request->getPost('closed_amount_cash', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$closed_amount_due = parse_decimals($this->request->getPost('closed_amount_due', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$closed_amount_card = parse_decimals($this->request->getPost('closed_amount_card', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$closed_amount_check = parse_decimals($this->request->getPost('closed_amount_check', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
 
-		$total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check);
+		$total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check);	//TODO: hungarian notation
 
-		echo json_encode(array('total' => to_currency_no_money($total)));
+		echo json_encode(['total' => to_currency_no_money($total)]);
 	}
 
-	/*
-	Calculate total
+	/**
+	* Calculate total
 	*/
-	private function _calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check)
+	private function _calculate_total(float $open_amount_cash, float $transfer_amount_cash, float $closed_amount_due, float $closed_amount_cash, float $closed_amount_card, $closed_amount_check): float	//TODO: need to get rid of hungarian notation here. Also, the signature is pretty long.  Perhaps they need to go into an object or array?
 	{
 		return ($closed_amount_cash - $open_amount_cash - $transfer_amount_cash + $closed_amount_due + $closed_amount_card + $closed_amount_check);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Config.php b/app/Controllers/Config.php
index 098ab1d44..6b7dea100 100644
--- a/app/Controllers/Config.php
+++ b/app/Controllers/Config.php
@@ -1,32 +1,84 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Libraries\Barcode_lib;
+use app\Libraries\Mailchimp_lib;
+use app\Libraries\Receiving_lib;
+use app\Libraries\Sale_lib;
+use app\Libraries\Tax_lib;
+
+use app\Models\Appconfig;
+use app\Models\Attribute;
+use app\Models\Customer_rewards;
+use app\Models\Dinner_table;
+use app\Models\Module;
+use app\Models\Enums\Rounding_mode;
+use app\Models\Stock_location;
+use app\Models\Tax;
+
+use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Files\File;
+use DirectoryIterator;
+use NumberFormatter;
+use ReflectionException;
+
+/**
+ * @property barcode_lib barcode_lib
+ * @property mailchimp_lib mailchimp_lib
+ * @property receiving_lib receiving_lib
+ * @property sale_lib sale_lib
+ * @property tax_lib tax_lib
+ * @property encryption encryption
+ * @property encrypterinterface encrypter
+ * @property appconfig appconfig
+ * @property attribute attribute
+ * @property customer_rewards customer_rewards
+ * @property dinner_table dinner_table
+ * @property module module
+ * @property rounding_mode rounding_mode
+ * @property stock_location stock_location
+ * @property tax tax
+ */
 class Config extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('config');
 
-		$this->load->library('barcode_lib');
-		$this->load->library('sale_lib');
+		$this->barcode_lib = new Barcode_lib();
+		$this->sale_lib = new Sale_lib();
+		$this->receiving_lib = new receiving_lib();
+		$this->tax_lib = new Tax_lib();
+		
+		$this->attribute = model('Attribute');
+		$this->customer_rewards = model('Customer_rewards');
+		$this->dinner_table = model('Dinner_table');
+		$this->module = model('Module');
+		$this->rounding_mode = model('Rounding_mode');
+		$this->stock_location = model('Stock_location');
+		$this->tax = model('Tax');
+
+		$this->encryption = new Encryption();
+		$this->encrypter = $this->encryption->initialize();
 	}
 
 	/*
 	 * This function loads all the licenses starting with the first one being OSPOS one
 	 */
-	private function _licenses()
+	private function _licenses(): array    //TODO: remove hungarian notation.  Super long function.  Perhaps we need to refactor out functions?
 	{
 		$i = 0;
 		$bower = FALSE;
 		$composer = FALSE;
-		$license = array();
+		$license = [];
 
-		$license[$i]['title'] = 'Open Source Point Of Sale ' . $this->config->item('application_version');
+		$license[$i]['title'] = 'Open Source Point Of Sale ' . config('OSPOSConfig')->application_version;
 
 		if(file_exists('license/LICENSE'))
 		{
-			$license[$i]['text'] = $this->xss_clean(file_get_contents('license/LICENSE', NULL, NULL, 0, 2000));
+			$license[$i]['text'] = file_get_contents('license/LICENSE', NULL, NULL, 0, 2000);
 		}
 		else
 		{
@@ -35,7 +87,7 @@ class Config extends Secure_Controller
 
 		$dir = new DirectoryIterator('license');	// read all the files in the dir license
 
-		foreach($dir as $fileinfo)
+		foreach($dir as $fileinfo)	//TODO: $fileinfo doesn't match our variable naming convention
 		{
 			// license files must be in couples: .version (name & version) & .license (license text)
 			if($fileinfo->isFile())
@@ -46,13 +98,13 @@ class Config extends Secure_Controller
 
 					$basename = 'license/' . $fileinfo->getBasename('.version');
 
-					$license[$i]['title'] = $this->xss_clean(file_get_contents($basename . '.version', NULL, NULL, 0, 100));
+					$license[$i]['title'] = file_get_contents($basename . '.version', NULL, NULL, 0, 100);
 
 					$license_text_file = $basename . '.license';
 
 					if(file_exists($license_text_file))
 					{
-						$license[$i]['text'] = $this->xss_clean(file_get_contents($license_text_file , NULL, NULL, 0, 2000));
+						$license[$i]['text'] = file_get_contents($license_text_file , NULL, NULL, 0, 2000);
 					}
 					else
 					{
@@ -90,38 +142,36 @@ class Config extends Secure_Controller
 					{
 						if(is_array($val1))
 						{
-							$license[$i]['text'] .= 'component: ' . $key1 . "\n";
+							$license[$i]['text'] .= "component: $key1\n";	//TODO: Duplicated Code
 
 							foreach($val1 as $key2 => $val2)
 							{
 								if(is_array($val2))
 								{
-									$license[$i]['text'] .= $key2 . ': ';
+									$license[$i]['text'] .= "$key2: ";
 
 									foreach($val2 as $key3 => $val3)
 									{
-										$license[$i]['text'] .= $val3 . ' ';
+										$license[$i]['text'] .= "$val3 ";
 									}
 
-									$license[$i]['text'] .= "\n";
+									$license[$i]['text'] .= '\n';
 								}
 								else
 								{
-									$license[$i]['text'] .= $key2 . ': ' . $val2 . "\n";
+									$license[$i]['text'] .= "$key2: $val2\n";
 								}
 							}
 
-							$license[$i]['text'] .= "\n";
+							$license[$i]['text'] .= '\n';
 						}
 						else
 						{
-							$license[$i]['text'] .= $key1 . ': ' . $val1 . "\n";
+							$license[$i]['text'] .= "$key1: $val1\n";
 						}
 					}
 				}
 			}
-
-			$license[$i]['text'] = $this->xss_clean($license[$i]['text']);
 		}
 
 		// attach the licenses from the LICENSES file generated by bower
@@ -138,32 +188,30 @@ class Config extends Secure_Controller
 			{
 				if(is_array($val))
 				{
-					$license[$i]['text'] .= 'component: ' . $key . "\n";
+					$license[$i]['text'] .= "component: $key\n";	//TODO: Duplicated Code.
 
 					foreach($val as $key1 => $val1)
 					{
 						if(is_array($val1))
 						{
-							$license[$i]['text'] .= $key1 . ': ';
+							$license[$i]['text'] .= "$key1: ";
 
 							foreach($val1 as $key2 => $val2)
 							{
-								$license[$i]['text'] .= $val2 . ' ';
+								$license[$i]['text'] .= "$val2 ";
 							}
 
-							$license[$i]['text'] .= "\n";
+							$license[$i]['text'] .= '\n';
 						}
 						else
 						{
-							$license[$i]['text'] .= $key1 . ': ' . $val1 . "\n";
+							$license[$i]['text'] .= "$key1: $val1\n";
 						}
 					}
 
-					$license[$i]['text'] .= "\n";
+					$license[$i]['text'] .= '\n';
 				}
 			}
-
-			$license[$i]['text'] = $this->xss_clean($license[$i]['text']);
 		}
 
 		return $license;
@@ -172,18 +220,18 @@ class Config extends Secure_Controller
 	/*
 	 * This function loads all the available themes in the dist/bootswatch directory
 	 */
-	private function _themes()
+	private function _themes(): array	//TODO: Hungarian notation
 	{
-		$themes = array();
+		$themes = [];
 
 		// read all themes in the dist folder
 		$dir = new DirectoryIterator('dist/bootswatch');
 
-		foreach($dir as $dirinfo)
+		foreach($dir as $dirinfo)	//TODO: $dirinfo doesn't follow naming convention
 		{
 			if($dirinfo->isDir() && !$dirinfo->isDot() && $dirinfo->getFileName() != 'fonts')
 			{
-				$file = $this->xss_clean($dirinfo->getFileName());
+				$file = $dirinfo->getFileName();
 				$themes[$file] = ucfirst($file);
 			}
 		}
@@ -193,24 +241,25 @@ class Config extends Secure_Controller
 		return $themes;
 	}
 
-	public function index()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function index(): void
 	{
-		$data['stock_locations'] = $this->Stock_location->get_all()->result_array();
-		$data['dinner_tables'] = $this->Dinner_table->get_all()->result_array();
-		$data['customer_rewards'] = $this->Customer_rewards->get_all()->result_array();
+		$data['stock_locations'] = $this->stock_location->get_all()->getResultArray();
+		$data['dinner_tables'] = $this->dinner_table->get_all()->getResultArray();
+		$data['customer_rewards'] = $this->customer_rewards->get_all()->getResultArray();
 		$data['support_barcode'] = $this->barcode_lib->get_list_barcodes();
-		$data['logo_exists'] = $this->config->item('company_logo') != '';
+		$data['logo_exists'] = config('OSPOS')->company_logo != '';
 		$data['line_sequence_options'] = $this->sale_lib->get_line_sequence_options();
 		$data['register_mode_options'] = $this->sale_lib->get_register_mode_options();
 		$data['invoice_type_options'] = $this->sale_lib->get_invoice_type_options();
-		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['rounding_options'] = rounding_mode::get_rounding_options();
 		$data['tax_code_options'] = $this->tax_lib->get_tax_code_options();
 		$data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
 		$data['tax_jurisdiction_options'] = $this->tax_lib->get_tax_jurisdiction_options();
-		$data['show_office_group'] = $this->Module->get_show_office_group();
-		$data['currency_code'] = $this->config->item('currency_code');
-
-		$data = $this->xss_clean($data);
+		$data['show_office_group'] = $this->module->get_show_office_group();
+		$data['currency_code'] = config('OSPOS')->currency_code;
 
 		// load all the license statements, they are already XSS cleaned in the private function
 		$data['licenses'] = $this->_licenses();
@@ -219,18 +268,18 @@ class Config extends Secure_Controller
 		$data['themes'] = $this->_themes();
 
 		//Load General related fields
-		$image_allowed_types 		= array('jpg','jpeg','gif','svg','webp','bmp','png','tif','tiff');
-		$data['image_allowed_types']	= array_combine($image_allowed_types,$image_allowed_types);
+		$image_allowed_types = ['jpg','jpeg','gif','svg','webp','bmp','png','tif','tiff'];
+		$data['image_allowed_types'] = array_combine($image_allowed_types,$image_allowed_types);
 
-		$data['selected_image_allowed_types'] 	= explode('|',$this->config->item('image_allowed_types'));
+		$data['selected_image_allowed_types'] = explode('|', config('OSPOS')->image_allowed_types);
 
 		//Load Integrations Related fields
-		$data['mailchimp']	= array();
+		$data['mailchimp']	= [];
 
-		if($this->_check_encryption())
+		if($this->_check_encryption())	//TODO: Hungarian notation
 		{
-			$data['mailchimp']['api_key'] = $this->encryption->decrypt($this->config->item('mailchimp_api_key'));
-			$data['mailchimp']['list_id'] = $this->encryption->decrypt($this->config->item('mailchimp_list_id'));
+			$data['mailchimp']['api_key'] = $this->encrypter->decrypt(config('OSPOS')->mailchimp_api_key);
+			$data['mailchimp']['list_id'] = $this->encrypter->decrypt(config('OSPOS')->mailchimp_list_id);
 		}
 		else
 		{
@@ -241,76 +290,115 @@ class Config extends Secure_Controller
 		// load mailchimp lists associated to the given api key, already XSS cleaned in the private function
 		$data['mailchimp']['lists'] = $this->_mailchimp();
 
-		$this->load->view("configs/manage", $data);
+		echo view('configs/manage', $data);
 	}
 
-	public function save_info()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_info(): void
 	{
-		$upload_success = $this->_handle_logo_upload();
-		$upload_data = $this->upload->data();
+		$upload_data = $this->upload_logo();
+		$upload_success = !empty($upload_data['error']);
 
-		$batch_save_data = array(
-			'company' => $this->input->post('company'),
-			'address' => $this->input->post('address'),
-			'phone' => $this->input->post('phone'),
-			'email' => $this->input->post('email'),
-			'fax' => $this->input->post('fax'),
-			'website' => $this->input->post('website'),
-			'return_policy' => $this->input->post('return_policy')
-		);
+		$batch_save_data = [
+			'company' => $this->request->getPost('company', FILTER_SANITIZE_STRING),
+			'address' => $this->request->getPost('address', FILTER_SANITIZE_STRING),
+			'phone' => $this->request->getPost('phone', FILTER_SANITIZE_STRING),
+			'email' => $this->request->getPost('email', FILTER_SANITIZE_EMAIL),
+			'fax' => $this->request->getPost('fax', FILTER_SANITIZE_STRING),
+			'website' => $this->request->getPost('website', FILTER_SANITIZE_URL),
+			'return_policy' => $this->request->getPost('return_policy', FILTER_SANITIZE_STRING)
+		];
 
-		if(!empty($upload_data['orig_name']))
+		if(!empty($upload_data['orig_name']) && $upload_data['raw_name'] === TRUE)
 		{
-			// XSS file image sanity check
-			if($this->xss_clean($upload_data['raw_name'], TRUE) === TRUE)
-			{
-				$batch_save_data['company_logo'] = $upload_data['raw_name'] . $upload_data['file_ext'];
-			}
+			$batch_save_data['company_logo'] = $upload_data['raw_name'] . $upload_data['file_ext'];
 		}
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $upload_success && $result ? TRUE : FALSE;
-		$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
-		$message = $upload_success ? $message : strip_tags($this->upload->display_errors());
+		$result = $this->appconfig->batch_save($batch_save_data);
+		$success = $upload_success && $result;
+		$message = lang('Config.saved_' . ($success ? '' : 'un') . 'successfully');
+		$message = $upload_success ? $message : strip_tags($upload_data['error']);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $message
-		));
+		echo json_encode(['success' => $success, 'message' => $message]);
 	}
 
-	public function save_general()
-	{
-		$batch_save_data = array(
-			'theme' => $this->input->post('theme'),
-			'login_form' => $this->input->post('login_form'),
-			'default_sales_discount_type' => $this->input->post('default_sales_discount_type') != NULL,
-			'default_sales_discount' => $this->input->post('default_sales_discount'),
-			'default_receivings_discount_type' => $this->input->post('default_receivings_discount_type') != NULL,
-			'default_receivings_discount' => $this->input->post('default_receivings_discount'),
-			'enforce_privacy' => $this->input->post('enforce_privacy'),
-			'receiving_calculate_average_price' => $this->input->post('receiving_calculate_average_price') != NULL,
-			'lines_per_page' => $this->input->post('lines_per_page'),
-			'notify_horizontal_position' => $this->input->post('notify_horizontal_position'),
-			'notify_vertical_position' => $this->input->post('notify_vertical_position'),
-			'image_max_width' => $this->input->post('image_max_width'),
-			'image_max_height' => $this->input->post('image_max_height'),
-			'image_max_size' => $this->input->post('image_max_size'),
-			'image_allowed_types' => implode('|', $this->input->post('image_allowed_types')),
-			'gcaptcha_enable' => $this->input->post('gcaptcha_enable') != NULL,
-			'gcaptcha_secret_key' => $this->input->post('gcaptcha_secret_key'),
-			'gcaptcha_site_key' => $this->input->post('gcaptcha_site_key'),
-			'suggestions_first_column' => $this->input->post('suggestions_first_column'),
-			'suggestions_second_column' => $this->input->post('suggestions_second_column'),
-			'suggestions_third_column' => $this->input->post('suggestions_third_column'),
-			'giftcard_number' => $this->input->post('giftcard_number'),
-			'derive_sale_quantity' => $this->input->post('derive_sale_quantity') != NULL,
-			'multi_pack_enabled' => $this->input->post('multi_pack_enabled') != NULL,
-			'include_hsn' => $this->input->post('include_hsn') != NULL,
-			'category_dropdown' => $this->input->post('category_dropdown') != NULL
-		);
 
-		$this->Module->set_show_office_group($this->input->post('show_office_group') != NULL);
+	/**
+	 * @return array
+	 */
+	private function upload_logo(): array
+	{
+		helper(['form']);
+		$validation_rule = [
+			'company_logo' => [
+				'label' => 'Company logo',
+				'rules' => [
+					'uploaded[company_logo]',
+					'is_image[company_logo]',
+					'max_size[company_logo,1024]',
+					'mime_in[company_logo,image/png,image/jpg,image/gif]',
+					'ext_in[company_logo,png,jpg,gif]',
+					'max_dims[company_logo,800,680]',
+				]
+			]
+		];
+
+		if (!$this->validate($validation_rule))
+		{
+			return (['error' => $this->validator->getError('company_logo')]);
+		}
+		else
+		{
+			$file = $this->request->getFile('company_logo');
+			$file->move(WRITEPATH . 'uploads');
+
+			$file_info = [
+				'orig_name' => $file->getClientName(),
+				'raw_name' => $file->getName(),
+				'file_ext' => $file->guessExtension()
+			];
+
+			return ($file_info);
+		}
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_general(): void
+	{
+		$batch_save_data = [
+			'theme' => $this->request->getPost('theme', FILTER_SANITIZE_STRING),
+			'login_form' => $this->request->getPost('login_form', FILTER_SANITIZE_STRING),
+			'default_sales_discount_type' => $this->request->getPost('default_sales_discount_type') != NULL,
+			'default_sales_discount' => $this->request->getPost('default_sales_discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+			'default_receivings_discount_type' => $this->request->getPost('default_receivings_discount_type') != NULL,
+			'default_receivings_discount' => $this->request->getPost('default_receivings_discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+			'enforce_privacy' => $this->request->getPost('enforce_privacy', FILTER_SANITIZE_NUMBER_INT),
+			'receiving_calculate_average_price' => $this->request->getPost('receiving_calculate_average_price') != NULL,
+			'lines_per_page' => $this->request->getPost('lines_per_page', FILTER_SANITIZE_NUMBER_INT),
+			'notify_horizontal_position' => $this->request->getPost('notify_horizontal_position', FILTER_SANITIZE_NUMBER_INT),
+			'notify_vertical_position' => $this->request->getPost('notify_vertical_position', FILTER_SANITIZE_NUMBER_INT),
+			'image_max_width' => $this->request->getPost('image_max_width', FILTER_SANITIZE_NUMBER_INT),
+			'image_max_height' => $this->request->getPost('image_max_height', FILTER_SANITIZE_NUMBER_INT),
+			'image_max_size' => $this->request->getPost('image_max_size', FILTER_SANITIZE_NUMBER_INT),
+			'image_allowed_types' => implode('|', $this->request->getPost('image_allowed_types', FILTER_SANITIZE_STRING)),
+			'gcaptcha_enable' => $this->request->getPost('gcaptcha_enable') != NULL,
+			'gcaptcha_secret_key' => $this->request->getPost('gcaptcha_secret_key', FILTER_SANITIZE_STRING),
+			'gcaptcha_site_key' => $this->request->getPost('gcaptcha_site_key', FILTER_SANITIZE_STRING),
+			'suggestions_first_column' => $this->request->getPost('suggestions_first_column', FILTER_SANITIZE_STRING),
+			'suggestions_second_column' => $this->request->getPost('suggestions_second_column', FILTER_SANITIZE_STRING),
+			'suggestions_third_column' => $this->request->getPost('suggestions_third_column', FILTER_SANITIZE_STRING),
+			'giftcard_number' => $this->request->getPost('giftcard_number', FILTER_SANITIZE_STRING),
+			'derive_sale_quantity' => $this->request->getPost('derive_sale_quantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) != NULL,
+			'multi_pack_enabled' => $this->request->getPost('multi_pack_enabled') != NULL,
+			'include_hsn' => $this->request->getPost('include_hsn') != NULL,
+			'category_dropdown' => $this->request->getPost('category_dropdown') != NULL
+		];
+
+		$this->module->set_show_office_group($this->request->getPost('show_office_group') != NULL);
 
 		if($batch_save_data['category_dropdown'] == 1)
 		{
@@ -320,160 +408,156 @@ class Config extends Secure_Controller
 			$definition_data['definition_id'] = CATEGORY_DEFINITION_ID;
 			$definition_data['deleted'] = 0;
 
-			$this->Attribute->save_definition($definition_data, CATEGORY_DEFINITION_ID);
+			$this->attribute->save_definition($definition_data, CATEGORY_DEFINITION_ID);
 		}
 		else if($batch_save_data['category_dropdown'] == NO_DEFINITION_ID)
 		{
-			$this->Attribute->delete_definition(CATEGORY_DEFINITION_ID);
+			$this->attribute->delete_definition(CATEGORY_DEFINITION_ID);
 		}
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function ajax_check_number_locale()
+	/**
+	 * @return void
+	 */
+	public function ajax_check_number_locale(): void
 	{
-		$number_locale = $this->input->post('number_locale');
-		$save_number_locale = $this->input->post('save_number_locale');
+		$number_locale = $this->request->getPost('number_locale', FILTER_SANITIZE_STRING);
+		$save_number_locale = $this->request->getPost('save_number_locale', FILTER_SANITIZE_STRING);
 
-		$fmt = new \NumberFormatter($number_locale, \NumberFormatter::CURRENCY);
+		$fmt = new NumberFormatter($number_locale, NumberFormatter::CURRENCY);
 		if($number_locale != $save_number_locale)
 		{
-			$currency_symbol = $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
-			$currency_code = $fmt->getTextAttribute(\NumberFormatter::CURRENCY_CODE);
+			$currency_symbol = $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL);
+			$currency_code = $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE);
 			$save_number_locale = $number_locale;
 		}
 		else
 		{
-			$currency_symbol = empty($this->input->post('currency_symbol')) ? $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL) : $this->input->post('currency_symbol');
-			$currency_code = empty($this->input->post('currency_code')) ? $fmt->getTextAttribute(\NumberFormatter::CURRENCY_CODE) : $this->input->post('currency_code');
+			$currency_symbol = empty($this->request->getPost('currency_symbol')) ? $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL) : $this->request->getPost('currency_symbol', FILTER_SANITIZE_STRING);
+			$currency_code = empty($this->request->getPost('currency_code')) ? $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE) : $this->request->getPost('currency_code', FILTER_SANITIZE_STRING);
 		}
 
-		if($this->input->post('thousands_separator') == 'false')
+		if($this->request->getPost('thousands_separator') == 'false')
 		{
-			$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
+			$fmt->setAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
 		}
 
-		$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $currency_symbol);
+		$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $currency_symbol);
 		$number_local_example = $fmt->format(1234567890.12300);
 
-		echo json_encode(array(
+		echo json_encode([
 			'success' => $number_local_example != FALSE,
 			'save_number_locale' => $save_number_locale,
 			'number_locale_example' => $number_local_example,
 			'currency_symbol' => $currency_symbol,
 			'currency_code' => $currency_code,
-		));
+		]);
 	}
 
-	public function save_locale()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_locale(): void
 	{
-		$exploded = explode(":", $this->input->post('language'));
-		$batch_save_data = array(
-			'currency_symbol' => $this->input->post('currency_symbol'),
-			'currency_code' => $this->input->post('currency_code'),
+		$exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_STRING));
+		$batch_save_data = [
+			'currency_symbol' => $this->request->getPost('currency_symbol', FILTER_SANITIZE_STRING),
+			'currency_code' => $this->request->getPost('currency_code', FILTER_SANITIZE_STRING),
 			'language_code' => $exploded[0],
 			'language' => $exploded[1],
-			'timezone' => $this->input->post('timezone'),
-			'dateformat' => $this->input->post('dateformat'),
-			'timeformat' => $this->input->post('timeformat'),
-			'thousands_separator' => !empty($this->input->post('thousands_separator')),
-			'number_locale' => $this->input->post('number_locale'),
-			'currency_decimals' => $this->input->post('currency_decimals'),
-			'tax_decimals' => $this->input->post('tax_decimals'),
-			'quantity_decimals' => $this->input->post('quantity_decimals'),
-			'country_codes' => $this->input->post('country_codes'),
-			'payment_options_order' => $this->input->post('payment_options_order'),
-			'date_or_time_format' => $this->input->post('date_or_time_format'),
-			'cash_decimals' => $this->input->post('cash_decimals'),
-			'cash_rounding_code' => $this->input->post('cash_rounding_code'),
-			'financial_year' => $this->input->post('financial_year')
-		);
+			'timezone' => $this->request->getPost('timezone', FILTER_SANITIZE_STRING),
+			'dateformat' => $this->request->getPost('dateformat', FILTER_SANITIZE_STRING),
+			'timeformat' => $this->request->getPost('timeformat', FILTER_SANITIZE_STRING),
+			'thousands_separator' => !empty($this->request->getPost('thousands_separator', FILTER_SANITIZE_NUMBER_INT)),
+			'number_locale' => $this->request->getPost('number_locale', FILTER_SANITIZE_STRING),
+			'currency_decimals' => $this->request->getPost('currency_decimals', FILTER_SANITIZE_NUMBER_INT),
+			'tax_decimals' => $this->request->getPost('tax_decimals', FILTER_SANITIZE_NUMBER_INT),
+			'quantity_decimals' => $this->request->getPost('quantity_decimals', FILTER_SANITIZE_NUMBER_INT),
+			'country_codes' => $this->request->getPost('country_codes', FILTER_SANITIZE_STRING),
+			'payment_options_order' => $this->request->getPost('payment_options_order', FILTER_SANITIZE_STRING),
+			'date_or_time_format' => $this->request->getPost('date_or_time_format', FILTER_SANITIZE_NUMBER_INT),
+			'cash_decimals' => $this->request->getPost('cash_decimals', FILTER_SANITIZE_NUMBER_INT),
+			'cash_rounding_code' => $this->request->getPost('cash_rounding_code', FILTER_SANITIZE_STRING),
+			'financial_year' => $this->request->getPost('financial_year', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_email()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_email(): void
 	{
 		$password = '';
 
 		if($this->_check_encryption())
 		{
-			$password = $this->encryption->encrypt($this->input->post('smtp_pass'));
+			$password = $this->encrypter->encrypt($this->request->getPost('smtp_pass'));
 		}
 
-		$batch_save_data = array(
-			'protocol' => $this->input->post('protocol'),
-			'mailpath' => $this->input->post('mailpath'),
-			'smtp_host' => $this->input->post('smtp_host'),
-			'smtp_user' => $this->input->post('smtp_user'),
+		$batch_save_data = [
+			'protocol' => $this->request->getPost('protocol', FILTER_SANITIZE_STRING),
+			'mailpath' => $this->request->getPost('mailpath', FILTER_SANITIZE_STRING),
+			'smtp_host' => $this->request->getPost('smtp_host', FILTER_SANITIZE_STRING),
+			'smtp_user' => $this->request->getPost('smtp_user', FILTER_SANITIZE_STRING),
 			'smtp_pass' => $password,
-			'smtp_port' => $this->input->post('smtp_port'),
-			'smtp_timeout' => $this->input->post('smtp_timeout'),
-			'smtp_crypto' => $this->input->post('smtp_crypto')
-		);
+			'smtp_port' => $this->request->getPost('smtp_port', FILTER_SANITIZE_NUMBER_INT),
+			'smtp_timeout' => $this->request->getPost('smtp_timeout', FILTER_SANITIZE_NUMBER_INT),
+			'smtp_crypto' => $this->request->getPost('smtp_crypto', FILTER_SANITIZE_STRING)
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_message()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_message(): void
 	{
 		$password = '';
 
 		if($this->_check_encryption())
 		{
-			$password = $this->encryption->encrypt($this->input->post('msg_pwd'));
+			$password = $this->encrypter->encrypt($this->request->getPost('msg_pwd'));
 		}
 
-		$batch_save_data = array(
-			'msg_msg' => $this->input->post('msg_msg'),
-			'msg_uid' => $this->input->post('msg_uid'),
+		$batch_save_data = [
+			'msg_msg' => $this->request->getPost('msg_msg', FILTER_SANITIZE_STRING),
+			'msg_uid' => $this->request->getPost('msg_uid', FILTER_SANITIZE_STRING),
 			'msg_pwd' => $password,
-			'msg_src' => $this->input->post('msg_src')
-		);
+			'msg_src' => $this->request->getPost('msg_src', FILTER_SANITIZE_STRING)
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
 	/*
 	 * This function fetches all the available lists from Mailchimp for the given API key
 	 */
-	private function _mailchimp($api_key = '')
+	private function _mailchimp(string $api_key = ''): array	//TODO: Hungarian notation
 	{
-		$this->load->library('mailchimp_lib', array('api_key' => $api_key));
+		$this->mailchimp_lib = new Mailchimp_lib(['api_key' => $api_key]);
 
-		$result = array();
+		$result = [];
 
-		if(($lists = $this->mailchimp_lib->getLists()) !== FALSE)
+		$lists = $this->mailchimp_lib->getLists();
+		if($lists !== FALSE)
 		{
 			if(is_array($lists) && !empty($lists['lists']) && is_array($lists['lists']))
 			{
 				foreach($lists['lists'] as $list)
 				{
-					$list = $this->xss_clean($list);
 					$result[$list['id']] = $list['name'] . ' [' . $list['stats']['member_count'] . ']';
 				}
 			}
@@ -482,110 +566,100 @@ class Config extends Secure_Controller
 		return $result;
 	}
 
-	/*
-	 AJAX call from mailchimp config form to fetch the Mailchimp lists when a valid API key is inserted
+	/**
+	 * AJAX call from mailchimp config form to fetch the Mailchimp lists when a valid API key is inserted
+	 *
+	 * @return void
 	 */
-	public function ajax_check_mailchimp_api_key()
+	public function ajax_check_mailchimp_api_key(): void
 	{
 		// load mailchimp lists associated to the given api key, already XSS cleaned in the private function
-		$lists = $this->_mailchimp($this->input->post('mailchimp_api_key'));
-		$success = count($lists) > 0 ? TRUE : FALSE;
+		$lists = $this->_mailchimp($this->request->getPost('mailchimp_api_key', FILTER_SANITIZE_STRING));
+		$success = count($lists) > 0;
 
-		echo json_encode(array(
+		echo json_encode ([
 			'success' => $success,
-			'message' => $this->lang->line('config_mailchimp_key_' . ($success ? '' : 'un') . 'successfully'),
+			'message' => lang('Config.mailchimp_key_' . ($success ? '' : 'un') . 'successfully'),
 			'mailchimp_lists' => $lists
-		));
+		]);
 	}
 
-	public function save_mailchimp()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_mailchimp(): void
 	{
 		$api_key = '';
 		$list_id = '';
 
-		if($this->_check_encryption())
+		if($this->_check_encryption())	//TODO: Hungarian notation
 		{
-			$api_key = $this->encryption->encrypt($this->input->post('mailchimp_api_key'));
-			$list_id = $this->encryption->encrypt($this->input->post('mailchimp_list_id'));
+			$api_key = $this->encrypter->encrypt($this->request->getPost('mailchimp_api_key', FILTER_SANITIZE_STRING));
+			$list_id = $this->encrypter->encrypt($this->request->getPost('mailchimp_list_id', FILTER_SANITIZE_STRING));
 		}
 
-		$batch_save_data = array(
-			'mailchimp_api_key' => $api_key,
-			'mailchimp_list_id' => $list_id
-		);
+		$batch_save_data = ['mailchimp_api_key' => $api_key, 'mailchimp_list_id' => $list_id];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function ajax_stock_locations()
+	public function ajax_stock_locations(): void
 	{
-		$stock_locations = $this->Stock_location->get_all()->result_array();
+		$stock_locations = $this->stock_location->get_all()->getResultArray();
 
-		$stock_locations = $this->xss_clean($stock_locations);
-
-		$this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations));
+		echo view('partial/stock_locations', ['stock_locations' => $stock_locations]);
 	}
 
-	public function ajax_dinner_tables()
+	public function ajax_dinner_tables(): void
 	{
-		$dinner_tables = $this->Dinner_table->get_all()->result_array();
+		$dinner_tables = $this->dinner_table->get_all()->getResultArray();
 
-		$dinner_tables = $this->xss_clean($dinner_tables);
-
-		$this->load->view('partial/dinner_tables', array('dinner_tables' => $dinner_tables));
+		echo view('partial/dinner_tables', ['dinner_tables' => $dinner_tables]);
 	}
 
-	public function ajax_tax_categories()
+	public function ajax_tax_categories(): void
 	{
-		$tax_categories = $this->Tax->get_all_tax_categories()->result_array();
+		$tax_categories = $this->tax->get_all_tax_categories()->getResultArray();
 
-		$tax_categories = $this->xss_clean($tax_categories);
-
-		$this->load->view('partial/tax_categories', array('tax_categories' => $tax_categories));
+		echo view('partial/tax_categories', ['tax_categories' => $tax_categories]);
 	}
 
-	public function ajax_customer_rewards()
+	public function ajax_customer_rewards(): void
 	{
-		$customer_rewards = $this->Customer_rewards->get_all()->result_array();
+		$customer_rewards = $this->customer_rewards->get_all()->getResultArray();
 
-		$customer_rewards = $this->xss_clean($customer_rewards);
-
-		$this->load->view('partial/customer_rewards', array('customer_rewards' => $customer_rewards));
+		echo view('partial/customer_rewards', ['customer_rewards' => $customer_rewards]);
 	}
 
-	private function _clear_session_state()
+	private function _clear_session_state(): void	//TODO: Hungarian notation
 	{
 		$this->sale_lib->clear_sale_location();
 		$this->sale_lib->clear_table();
 		$this->sale_lib->clear_all();
-		$this->load->library('receiving_lib');
+		$this->receiving_lib = new Receiving_lib();
 		$this->receiving_lib->clear_stock_source();
 		$this->receiving_lib->clear_stock_destination();
 		$this->receiving_lib->clear_all();
 	}
 
-	public function save_locations()
+	public function save_locations(): void
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$not_to_delete = array();
-		foreach($this->input->post() as $key => $value)
+		$not_to_delete = [];
+		foreach($this->request->getPost(NULL, FILTER_SANITIZE_STRING) as $key => $value)	//TODO: Not sure if this is the best way to sanitize this array.
 		{
 			if(strstr($key, 'stock_location'))
 			{
 				// save or update
 				foreach ($value as $location_id => $location_name)
 				{
-					$location_data = array('location_name' => $location_name);
-					if($this->Stock_location->save($location_data, $location_id))
+					$location_data = ['location_name' => $location_name];
+					if($this->stock_location->save_value($location_data, $location_id))
 					{
-						$location_id = $this->Stock_location->get_location_id($location_name);
+						$location_id = $this->stock_location->get_location_id($location_name);
 						$not_to_delete[] = $location_id;
 						$this->_clear_session_state();
 					}
@@ -594,38 +668,38 @@ class Config extends Secure_Controller
 		}
 
 		// all locations not available in post will be deleted now
-		$deleted_locations = $this->Stock_location->get_all()->result_array();
+		$deleted_locations = $this->stock_location->get_all()->getResultArray();
 
 		foreach($deleted_locations as $location => $location_data)
 		{
 			if(!in_array($location_data['location_id'], $not_to_delete))
 			{
-				$this->Stock_location->delete($location_data['location_id']);
+				$this->stock_location->delete($location_data['location_id']);
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success = $this->db->trans_status();
+		$success = $this->db->transStatus();
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_tables()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_tables(): void
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$dinner_table_enable = $this->input->post('dinner_table_enable') != NULL;
+		$dinner_table_enable = $this->request->getPost('dinner_table_enable') != NULL;
 
-		$this->Appconfig->save('dinner_table_enable', $dinner_table_enable);
+		$this->appconfig->save(['dinner_table_enable' => $dinner_table_enable]);
 
 		if($dinner_table_enable)
 		{
-			$not_to_delete = array();
-			foreach($this->input->post() as $key => $value)
+			$not_to_delete = [];
+			foreach($this->request->getPost(NULL, FILTER_SANITIZE_STRING) as $key => $value)	//TODO: Not sure if this is the best way to filter the array
 			{
 				if(strstr($key, 'dinner_table') && $key != 'dinner_table_enable')
 				{
@@ -633,80 +707,80 @@ class Config extends Secure_Controller
 					$not_to_delete[] = $dinner_table_id;
 
 					// save or update
-					$table_data = array('name' => $value);
-					if($this->Dinner_table->save($table_data, $dinner_table_id))
+					$table_data = ['name' => $value];
+					if($this->dinner_table->save_value($table_data, $dinner_table_id))
 					{
-						$this->_clear_session_state();
+						$this->_clear_session_state();	//TODO: Remove hungarian notation.
 					}
 				}
 			}
 
 			// all tables not available in post will be deleted now
-			$deleted_tables = $this->Dinner_table->get_all()->result_array();
+			$deleted_tables = $this->dinner_table->get_all()->getResultArray();
 
 			foreach($deleted_tables as $dinner_tables => $table)
 			{
 				if(!in_array($table['dinner_table_id'], $not_to_delete))
 				{
-					$this->Dinner_table->delete($table['dinner_table_id']);
+					$this->dinner_table->delete($table['dinner_table_id']);
 				}
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success = $this->db->trans_status();
+		$success = $this->db->transStatus();
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success,'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_tax()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_tax(): void
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$batch_save_data = array(
-			'default_tax_1_rate' => parse_tax($this->input->post('default_tax_1_rate')),
-			'default_tax_1_name' => $this->input->post('default_tax_1_name'),
-			'default_tax_2_rate' => parse_tax($this->input->post('default_tax_2_rate')),
-			'default_tax_2_name' => $this->input->post('default_tax_2_name'),
-			'tax_included' => $this->input->post('tax_included') != NULL,
-			'use_destination_based_tax' => $this->input->post('use_destination_based_tax') != NULL,
-			'default_tax_code' => $this->input->post('default_tax_code'),
-			'default_tax_category' => $this->input->post('default_tax_category'),
-			'default_tax_jurisdiction' => $this->input->post('default_tax_jurisdiction'),
-			'tax_id' => $this->input->post('tax_id')
-		);
+		$batch_save_data = [
+			'default_tax_1_rate' => parse_tax($this->request->getPost('default_tax_1_rate', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'default_tax_1_name' => $this->request->getPost('default_tax_1_name', FILTER_SANITIZE_STRING),
+			'default_tax_2_rate' => parse_tax($this->request->getPost('default_tax_2_rate', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'default_tax_2_name' => $this->request->getPost('default_tax_2_name', FILTER_SANITIZE_STRING),
+			'tax_included' => $this->request->getPost('tax_included') != NULL,
+			'use_destination_based_tax' => $this->request->getPost('use_destination_based_tax') != NULL,
+			'default_tax_code' => $this->request->getPost('default_tax_code', FILTER_SANITIZE_STRING),
+			'default_tax_category' => $this->request->getPost('default_tax_category', FILTER_SANITIZE_STRING),
+			'default_tax_jurisdiction' => $this->request->getPost('default_tax_jurisdiction', FILTER_SANITIZE_STRING),
+			'tax_id' => $this->request->getPost('tax_id', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		$success = $this->Appconfig->batch_save($batch_save_data) ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
-		$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
+		$message = lang('Config.saved_' . ($success ? '' : 'un') . 'successfully');
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $message
-		));
+		echo json_encode (['success' => $success, 'message' => $message]);
 	}
 
-	public function save_rewards()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_rewards(): void
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$customer_reward_enable = $this->input->post('customer_reward_enable') != NULL;
+		$customer_reward_enable = $this->request->getPost('customer_reward_enable') != NULL;
 
-		$this->Appconfig->save('customer_reward_enable', $customer_reward_enable);
+		$this->appconfig->save(['customer_reward_enable' => $customer_reward_enable]);
 
 		if($customer_reward_enable)
 		{
-			$not_to_delete = array();
-			$array_save = array();
-			foreach($this->input->post() as $key => $value)
+			$not_to_delete = [];
+			$array_save = [];
+			foreach($this->request->getPost(NULL, FILTER_SANITIZE_STRING) as $key => $value)
 			{
 				if(strstr($key, 'customer_reward') && $key != 'customer_reward_enable')
 				{
@@ -726,121 +800,118 @@ class Config extends Secure_Controller
 				foreach($array_save as $key => $value)
 				{
 					// save or update
-					$package_data = array('package_name' => $value['package_name'], 'points_percent' => $value['points_percent']);
-					$this->Customer_rewards->save($package_data, $key);
+					$package_data = ['package_name' => $value['package_name'], 'points_percent' => $value['points_percent']];
+					$this->customer_rewards->save_value($package_data, $key);	//TODO: reflection exception
 				}
 			}
 
 			// all packages not available in post will be deleted now
-			$deleted_packages = $this->Customer_rewards->get_all()->result_array();
+			$deleted_packages = $this->customer_rewards->get_all()->getResultArray();
 
 			foreach($deleted_packages as $customer_rewards => $reward_category)
 			{
 				if(!in_array($reward_category['package_id'], $not_to_delete))
 				{
-					$this->Customer_rewards->delete($reward_category['package_id']);
+					$this->customer_rewards->delete($reward_category['package_id']);
 				}
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success = $this->db->trans_status();
+		$success = $this->db->transStatus();
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_barcode()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_barcode(): void
 	{
-		$batch_save_data = array(
-			'barcode_type' => $this->input->post('barcode_type'),
-			'barcode_width' => $this->input->post('barcode_width'),
-			'barcode_height' => $this->input->post('barcode_height'),
-			'barcode_font' => $this->input->post('barcode_font'),
-			'barcode_font_size' => $this->input->post('barcode_font_size'),
-			'barcode_first_row' => $this->input->post('barcode_first_row'),
-			'barcode_second_row' => $this->input->post('barcode_second_row'),
-			'barcode_third_row' => $this->input->post('barcode_third_row'),
-			'barcode_num_in_row' => $this->input->post('barcode_num_in_row'),
-			'barcode_page_width' => $this->input->post('barcode_page_width'),
-			'barcode_page_cellspacing' => $this->input->post('barcode_page_cellspacing'),
-			'barcode_generate_if_empty' => $this->input->post('barcode_generate_if_empty') != NULL,
-			'allow_duplicate_barcodes' => $this->input->post('allow_duplicate_barcodes') != NULL,
-			'barcode_content' => $this->input->post('barcode_content'),
-			'barcode_formats' => json_encode($this->input->post('barcode_formats'))
-		);
+		$batch_save_data = [
+			'barcode_type' => $this->request->getPost('barcode_type', FILTER_SANITIZE_STRING),
+			'barcode_width' => $this->request->getPost('barcode_width', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_height' => $this->request->getPost('barcode_height', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_font' => $this->request->getPost('barcode_font', FILTER_SANITIZE_STRING),
+			'barcode_font_size' => $this->request->getPost('barcode_font_size', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_first_row' => $this->request->getPost('barcode_first_row', FILTER_SANITIZE_STRING),
+			'barcode_second_row' => $this->request->getPost('barcode_second_row', FILTER_SANITIZE_STRING),
+			'barcode_third_row' => $this->request->getPost('barcode_third_row', FILTER_SANITIZE_STRING),
+			'barcode_num_in_row' => $this->request->getPost('barcode_num_in_row', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_page_width' => $this->request->getPost('barcode_page_width', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_page_cellspacing' => $this->request->getPost('barcode_page_cellspacing', FILTER_SANITIZE_NUMBER_INT),
+			'barcode_generate_if_empty' => $this->request->getPost('barcode_generate_if_empty') != NULL,
+			'allow_duplicate_barcodes' => $this->request->getPost('allow_duplicate_barcodes') != NULL,
+			'barcode_content' => $this->request->getPost('barcode_content', FILTER_SANITIZE_STRING),
+			'barcode_formats' => json_encode($this->request->getPost('barcode_formats', FILTER_SANITIZE_STRING))
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_receipt()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_receipt(): void
 	{
-		$batch_save_data = array (
-			'receipt_template' => $this->input->post('receipt_template'),
-			'receipt_font_size' => $this->input->post('receipt_font_size'),
-			'print_delay_autoreturn' => $this->input->post('print_delay_autoreturn'),
-			'email_receipt_check_behaviour' => $this->input->post('email_receipt_check_behaviour'),
-			'print_receipt_check_behaviour' => $this->input->post('print_receipt_check_behaviour'),
-			'receipt_show_company_name' => $this->input->post('receipt_show_company_name') != NULL,
-			'receipt_show_taxes' => ($this->input->post('receipt_show_taxes') != NULL),
-			'receipt_show_tax_ind' => ($this->input->post('receipt_show_tax_ind') != NULL),
-			'receipt_show_total_discount' => $this->input->post('receipt_show_total_discount') != NULL,
-			'receipt_show_description' => $this->input->post('receipt_show_description') != NULL,
-			'receipt_show_serialnumber' => $this->input->post('receipt_show_serialnumber') != NULL,
-			'print_silently' => $this->input->post('print_silently') != NULL,
-			'print_header' => $this->input->post('print_header') != NULL,
-			'print_footer' => $this->input->post('print_footer') != NULL,
-			'print_top_margin' => $this->input->post('print_top_margin'),
-			'print_left_margin' => $this->input->post('print_left_margin'),
-			'print_bottom_margin' => $this->input->post('print_bottom_margin'),
-			'print_right_margin' => $this->input->post('print_right_margin')
-		);
+		$batch_save_data = [
+			'receipt_template' => $this->request->getPost('receipt_template', FILTER_SANITIZE_STRING),
+			'receipt_font_size' => $this->request->getPost('receipt_font_size', FILTER_SANITIZE_NUMBER_INT),
+			'print_delay_autoreturn' => $this->request->getPost('print_delay_autoreturn', FILTER_SANITIZE_NUMBER_INT),
+			'email_receipt_check_behaviour' => $this->request->getPost('email_receipt_check_behaviour', FILTER_SANITIZE_STRING),
+			'print_receipt_check_behaviour' => $this->request->getPost('print_receipt_check_behaviour', FILTER_SANITIZE_STRING),
+			'receipt_show_company_name' => $this->request->getPost('receipt_show_company_name') != NULL,
+			'receipt_show_taxes' => ($this->request->getPost('receipt_show_taxes') != NULL),
+			'receipt_show_tax_ind' => ($this->request->getPost('receipt_show_tax_ind') != NULL),
+			'receipt_show_total_discount' => $this->request->getPost('receipt_show_total_discount') != NULL,
+			'receipt_show_description' => $this->request->getPost('receipt_show_description') != NULL,
+			'receipt_show_serialnumber' => $this->request->getPost('receipt_show_serialnumber') != NULL,
+			'print_silently' => $this->request->getPost('print_silently') != NULL,
+			'print_header' => $this->request->getPost('print_header') != NULL,
+			'print_footer' => $this->request->getPost('print_footer') != NULL,
+			'print_top_margin' => $this->request->getPost('print_top_margin', FILTER_SANITIZE_NUMBER_INT),
+			'print_left_margin' => $this->request->getPost('print_left_margin', FILTER_SANITIZE_NUMBER_INT),
+			'print_bottom_margin' => $this->request->getPost('print_bottom_margin', FILTER_SANITIZE_NUMBER_INT),
+			'print_right_margin' => $this->request->getPost('print_right_margin', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function save_invoice()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_invoice(): void
 	{
-		$batch_save_data = array (
-			'invoice_enable' => $this->input->post('invoice_enable') != NULL,
-			'sales_invoice_format' => $this->input->post('sales_invoice_format'),
-			'sales_quote_format' => $this->input->post('sales_quote_format'),
-			'recv_invoice_format' => $this->input->post('recv_invoice_format'),
-			'invoice_default_comments' => $this->input->post('invoice_default_comments'),
-			'invoice_email_message' => $this->input->post('invoice_email_message'),
-			'line_sequence' => $this->input->post('line_sequence'),
-			'last_used_invoice_number' => $this->input->post('last_used_invoice_number'),
-			'last_used_quote_number' => $this->input->post('last_used_quote_number'),
-			'quote_default_comments' => $this->input->post('quote_default_comments'),
-			'work_order_enable' => $this->input->post('work_order_enable') != NULL,
-			'work_order_format' => $this->input->post('work_order_format'),
-			'last_used_work_order_number' => $this->input->post('last_used_work_order_number'),
-			'invoice_type' => $this->input->post('invoice_type')
-		);
+		$batch_save_data = [
+			'invoice_enable' => $this->request->getPost('invoice_enable') != NULL,
+			'sales_invoice_format' => $this->request->getPost('sales_invoice_format', FILTER_SANITIZE_STRING),
+			'sales_quote_format' => $this->request->getPost('sales_quote_format', FILTER_SANITIZE_STRING),
+			'recv_invoice_format' => $this->request->getPost('recv_invoice_format', FILTER_SANITIZE_STRING),
+			'invoice_default_comments' => $this->request->getPost('invoice_default_comments', FILTER_SANITIZE_STRING),
+			'invoice_email_message' => $this->request->getPost('invoice_email_message', FILTER_SANITIZE_STRING),
+			'line_sequence' => $this->request->getPost('line_sequence', FILTER_SANITIZE_STRING),
+			'last_used_invoice_number' => $this->request->getPost('last_used_invoice_number', FILTER_SANITIZE_NUMBER_INT),
+			'last_used_quote_number' => $this->request->getPost('last_used_quote_number', FILTER_SANITIZE_NUMBER_INT),
+			'quote_default_comments' => $this->request->getPost('quote_default_comments', FILTER_SANITIZE_STRING),
+			'work_order_enable' => $this->request->getPost('work_order_enable') != NULL,
+			'work_order_format' => $this->request->getPost('work_order_format', FILTER_SANITIZE_STRING),
+			'last_used_work_order_number' => $this->request->getPost('last_used_work_order_number', FILTER_SANITIZE_NUMBER_INT),
+			'invoice_type' => $this->request->getPost('invoice_type', FILTER_SANITIZE_STRING)
+		];
 
-		$result = $this->Appconfig->batch_save($batch_save_data);
-		$success = $result ? TRUE : FALSE;
+		$success = $this->appconfig->batch_save($batch_save_data);
 
 		// Update the register mode with the latest change so that if the user
 		// switches immediately back to the register the mode reflects the change
 		if($success == TRUE)
 		{
-			if($this->config->item('invoice_enable') == '1')
+			if(config('OSPOS')->invoice_enable)
 			{
 				$this->sale_lib->set_mode($batch_save_data['default_register_mode']);
 			}
@@ -850,39 +921,25 @@ class Config extends Secure_Controller
 			}
 		}
 
-		echo json_encode(array(
-			'success' => $success,
-			'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+		echo json_encode (['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
 	}
 
-	public function remove_logo()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function remove_logo(): void
 	{
-		$result = $this->Appconfig->batch_save(array('company_logo' => ''));
+		$success = $this->appconfig->save(['company_logo' => '']);
 
-		echo json_encode(array('success' => $result));
+		echo json_encode (['success' => $success]);
 	}
 
-	private function _handle_logo_upload()
+	/**
+	 * @throws ReflectionException
+	 */
+	private function _check_encryption(): bool        //TODO: Hungarian notation
 	{
-		$this->load->helper('directory');
-
-		// load upload library
-		$config = array('upload_path' => './uploads/',
-			'allowed_types' => 'gif|jpg|png',
-			'max_size' => '1024',
-			'max_width' => '800',
-			'max_height' => '680',
-			'file_name' => 'company_logo');
-		$this->load->library('upload', $config);
-		$this->upload->do_upload('company_logo');
-
-		return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '<p>'.$this->lang->line('upload_no_file_selected').'</p>');
-	}
-
-	private function _check_encryption()
-	{
-		$encryption_key = $this->config->item('encryption_key');
+		$encryption_key = config('OSPOS')->encryption_key;
 
 		// check if the encryption_key config item is the default one
 		if($encryption_key == '' || $encryption_key == 'YOUR KEY')
@@ -894,10 +951,10 @@ class Config extends Secure_Controller
 			$config = file_get_contents($config_path);
 
 			// $key will be assigned a 32-byte (256-bit) hex-encoded random key
-			$key = bin2hex($this->encryption->create_key(32));
+			$key = bin2hex($this->encryption->createKey());
 
 			// set the encryption key in the config item
-			$this->config->set_item('encryption_key', $key);
+			$this->appconfig->save(['encryption_key' => $key]);
 
 			// replace the empty placeholder with a real randomly generated encryption key
 			$config = preg_replace("/(.*encryption_key.*)('');/", "$1'$key';", $config);
@@ -914,7 +971,7 @@ class Config extends Secure_Controller
 				$handle = @fopen($config_path, 'w+');
 
 				// Write the file
-				$result = (fwrite($handle, $config) === FALSE) ? FALSE : TRUE;
+				$result = !(fwrite($handle, $config) === FALSE);
 
 				fclose($handle);
 			}
@@ -927,35 +984,4 @@ class Config extends Secure_Controller
 
 		return TRUE;
 	}
-
-	public function backup_db()
-	{
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		if($this->Employee->has_module_grant('config', $employee_id))
-		{
-			$this->load->dbutil();
-
-			$prefs = array(
-				'format' => 'zip',
-				'filename' => 'ospos.sql'
-			);
-
-			$backup = $this->dbutil->backup($prefs);
-
-			$file_name = 'ospos-' . date("Y-m-d-H-i-s") .'.zip';
-			$save = 'uploads/' . $file_name;
-			$this->load->helper('download');
-			while(ob_get_level())
-			{
-				ob_end_clean();
-			}
-
-			force_download($file_name, $backup);
-		}
-		else
-		{
-			redirect('no_access/config');
-		}
-	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Customers.php b/app/Controllers/Customers.php
index 5f446da76..d21a27bfb 100644
--- a/app/Controllers/Customers.php
+++ b/app/Controllers/Customers.php
@@ -1,7 +1,30 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Persons.php");
+namespace App\Controllers;
 
+use app\Libraries\Mailchimp_lib;
+
+use app\Models\Customer;
+use app\Models\Customer_rewards;
+use app\Models\Tax_code;
+
+use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\EncrypterInterface;
+use stdClass;
+
+/**
+ *
+ *
+ * @property mailchimp_lib mailchimp_lib
+ *
+ * @property customer customer
+ * @property customer_rewards customer_rewards
+ * @property tax_code tax_code
+ *
+ * @property encryption encryption
+ * @property encrypterinterface encrypter
+ *
+ */
 class Customers extends Persons
 {
 	private $_list_id;
@@ -10,33 +33,38 @@ class Customers extends Persons
 	{
 		parent::__construct('customers');
 
-		$this->load->library('mailchimp_lib');
+		$this->mailchimp_lib = new Mailchimp_lib();
 
-		$CI =& get_instance();
+		$this->customer = model('Customer');
+		$this->tax_code = model('Tax_code');
 
-		$this->_list_id = $CI->encryption->decrypt($CI->Appconfig->get('mailchimp_list_id'));
+		$this->encryption = new Encryption();	//TODO: Is this the correct way to load the encryption service now?
+		$this->encrypter = $this->encryption->initialize();
+
+		$this->_list_id = $this->encrypter->decrypt(config('OSPOS')->mailchimp_list_id);
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_customer_manage_table_headers());
+		$data['table_headers'] = get_customer_manage_table_headers();
 
-		$this->load->view('people/manage', $data);
+		echo view('people/manage', $data);
 	}
 
-	/*
-	Gets one row for a customer manage table. This is called using AJAX to update one row.
-	*/
-	public function get_row($row_id)
+	/**
+	 * Gets one row for a customer manage table. This is called using AJAX to update one row.
+	 */
+	public function get_row(int $row_id): void
 	{
-		$person = $this->Customer->get_info($row_id);
+		$person = $this->customer->get_info($row_id);
 
 		// retrieve the total amount the customer spent so far together with min, max and average values
-		$stats = $this->Customer->get_stats($person->person_id);
+		$stats = $this->customer->get_stats($person->person_id);	//TODO: This and the next 11 lines are duplicated in search().  Extract a method.
+
 		if(empty($stats))
 		{
 			//create object with empty properties.
-			$stats = new stdClass;
+			$stats = new stdClass();
 			$stats->total = 0;
 			$stats->min = 0;
 			$stats->max = 0;
@@ -45,7 +73,7 @@ class Customers extends Persons
 			$stats->quantity = 0;
 		}
 
-		$data_row = $this->xss_clean(get_customer_data_row($person, $stats));
+		$data_row = get_customer_data_row($person, $stats);
 
 		echo json_encode($data_row);
 	}
@@ -53,26 +81,27 @@ class Customers extends Persons
 	/*
 	Returns customer table data rows. This will be called with AJAX.
 	*/
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$customers = $this->Customer->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Customer->get_found_rows($search);
+		$customers = $this->customer->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->customer->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($customers->result() as $person)
+		$data_rows = [];
+
+		foreach($customers->getResult() as $person)
 		{
 			// retrieve the total amount the customer spent so far together with min, max and average values
-			$stats = $this->Customer->get_stats($person->person_id);
+			$stats = $this->customer->get_stats($person->person_id);	//TODO: duplicated... see above
 			if(empty($stats))
 			{
 				//create object with empty properties.
-				$stats = new stdClass;
+				$stats = new stdClass();
 				$stats->total = 0;
 				$stats->min = 0;
 				$stats->max = 0;
@@ -81,71 +110,71 @@ class Customers extends Persons
 				$stats->quantity = 0;
 			}
 
-			$data_rows[] = $this->xss_clean(get_customer_data_row($person, $stats));
+			$data_rows[] = get_customer_data_row($person, $stats);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	/*
-	Gives search suggestions based on what is being searched for
-	*/
-	public function suggest()
+	/**
+	 * Gives search suggestions based on what is being searched for
+	 */
+	public function suggest(): void
 	{
-		$suggestions = $this->xss_clean($this->Customer->get_search_suggestions($this->input->get('term'), TRUE));
+		$suggestions = $this->customer->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), 25,TRUE);
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest_search()
+	public function suggest_search(): void
 	{
-		$suggestions = $this->xss_clean($this->Customer->get_search_suggestions($this->input->post('term'), FALSE));
+		$suggestions = $this->customer->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING), 25, FALSE);
 
 		echo json_encode($suggestions);
 	}
 
-	/*
-	Loads the customer edit form
-	*/
-	public function view($customer_id = -1)
+	/**
+	 * Loads the customer edit form
+	 */
+	public function view(int $customer_id = -1): void	//TODO: replace -1 with a constant
 	{
-		$info = $this->Customer->get_info($customer_id);
+		$info = $this->customer->get_info($customer_id);
 		foreach(get_object_vars($info) as $property => $value)
 		{
-			$info->$property = $this->xss_clean($value);
+			$info->$property = $value;
 		}
 		$data['person_info'] = $info;
 
 		if(empty($info->person_id) || empty($info->date) || empty($info->employee_id))
 		{
 			$data['person_info']->date = date('Y-m-d H:i:s');
-			$data['person_info']->employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+			$data['person_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 		}
 
-		$employee_info = $this->Employee->get_info($info->employee_id);
-		$data['employee'] = $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name);
+		$employee_info = $this->employee->get_info($info->employee_id);
+		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 
-		$tax_code_info = $this->Tax_code->get_info($info->sales_tax_code_id);
-		$tax_code_id = $tax_code_info->tax_code_id;
+		$tax_code_info = $this->tax_code->get_info($info->sales_tax_code_id);
+		$tax_code_id = $tax_code_info->tax_code_id;	//TODO: This variable is never used after this.
 
 		if($tax_code_info->tax_code != NULL)
 		{
-			$data['sales_tax_code_label'] = $this->xss_clean($tax_code_info->tax_code . ' ' . $tax_code_info->tax_code_name);
+			$data['sales_tax_code_label'] = $tax_code_info->tax_code . ' ' . $tax_code_info->tax_code_name;
 		}
 		else
 		{
 			$data['sales_tax_code_label'] = '';
 		}
 
-		$packages = array('' => $this->lang->line('items_none'));
-		foreach($this->Customer_rewards->get_all()->result_array() as $row)
+		$packages = ['' => lang('Items.none')];
+		foreach($this->customer_rewards->get_all()->getResultArray() as $row)
 		{
-			$packages[$this->xss_clean($row['package_id'])] = $this->xss_clean($row['package_name']);
+			$packages[$row['package_id']] = $row['package_name'];
 		}
 		$data['packages'] = $packages;
 		$data['selected_package'] = $info->package_id;
 
-		if($this->config->item('use_destination_based_tax') == '1')
+		if(config('OSPOS')->use_destination_based_tax)	//TODO: This can be shortened for ternary notation
 		{
 			$data['use_destination_based_tax'] = TRUE;
 		}
@@ -155,12 +184,12 @@ class Customers extends Persons
 		}
 
 		// retrieve the total amount the customer spent so far together with min, max and average values
-		$stats = $this->Customer->get_stats($customer_id);
+		$stats = $this->customer->get_stats($customer_id);
 		if(!empty($stats))
 		{
 			foreach(get_object_vars($stats) as $property => $value)
 			{
-				$info->$property = $this->xss_clean($value);
+				$info->$property = $value;
 			}
 			$data['stats'] = $stats;
 		}
@@ -171,7 +200,7 @@ class Customers extends Persons
 			// collect mailchimp customer info
 			if(($mailchimp_info = $this->mailchimp_lib->getMemberInfo($this->_list_id, $info->email)) !== FALSE)
 			{
-				$data['mailchimp_info'] = $this->xss_clean($mailchimp_info);
+				$data['mailchimp_info'] = $mailchimp_info;
 
 				// collect customer mailchimp emails activities (stats)
 				if(($activities = $this->mailchimp_lib->getMemberActivity($this->_list_id, $info->email)) !== FALSE)
@@ -220,113 +249,126 @@ class Customers extends Persons
 			}
 		}
 
-		$this->load->view("customers/form", $data);
+		echo view("customers/form", $data);
 	}
 
-	/*
-	Inserts/updates a customer
-	*/
-	public function save($customer_id = -1)
+	/**
+	 * Inserts/updates a customer
+	 */
+	public function save(int $customer_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$first_name = $this->xss_clean($this->input->post('first_name'));
-		$last_name = $this->xss_clean($this->input->post('last_name'));
-		$email = $this->xss_clean(strtolower($this->input->post('email')));
+		$first_name = $this->request->getPost('first_name', FILTER_SANITIZE_STRING);
+		$last_name = $this->request->getPost('last_name', FILTER_SANITIZE_STRING);
+		$email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
 		// format first and last name properly
 		$first_name = $this->nameize($first_name);
 		$last_name = $this->nameize($last_name);
 
-		$person_data = array(
+		$person_data = [
 			'first_name' => $first_name,
 			'last_name' => $last_name,
-			'gender' => $this->input->post('gender'),
+			'gender' => $this->request->getPost('gender', FILTER_SANITIZE_NUMBER_INT),
 			'email' => $email,
-			'phone_number' => $this->input->post('phone_number'),
-			'address_1' => $this->input->post('address_1'),
-			'address_2' => $this->input->post('address_2'),
-			'city' => $this->input->post('city'),
-			'state' => $this->input->post('state'),
-			'zip' => $this->input->post('zip'),
-			'country' => $this->input->post('country'),
-			'comments' => $this->input->post('comments')
-		);
+			'phone_number' => $this->request->getPost('phone_number', FILTER_SANITIZE_STRING),
+			'address_1' => $this->request->getPost('address_1', FILTER_SANITIZE_STRING),
+			'address_2' => $this->request->getPost('address_2', FILTER_SANITIZE_STRING),
+			'city' => $this->request->getPost('city', FILTER_SANITIZE_STRING),
+			'state' => $this->request->getPost('state', FILTER_SANITIZE_STRING),
+			'zip' => $this->request->getPost('zip', FILTER_SANITIZE_STRING),
+			'country' => $this->request->getPost('country', FILTER_SANITIZE_STRING),
+			'comments' => $this->request->getPost('comments', FILTER_SANITIZE_STRING)
+		];
 
-		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $this->input->post('date'));
+		$date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $this->request->getPost('date', FILTER_SANITIZE_STRING));
 
-		$customer_data = array(
-			'consent' => $this->input->post('consent') != NULL,
-			'account_number' => $this->input->post('account_number') == '' ? NULL : $this->input->post('account_number'),
-			'tax_id' => $this->input->post('tax_id'),
-			'company_name' => $this->input->post('company_name') == '' ? NULL : $this->input->post('company_name'),
-			'discount' => $this->input->post('discount') == '' ? 0.00 : $this->input->post('discount'),
-			'discount_type' => $this->input->post('discount_type') == NULL ? PERCENT : $this->input->post('discount_type'),
-			'package_id' => $this->input->post('package_id') == '' ? NULL : $this->input->post('package_id'),
-			'taxable' => $this->input->post('taxable') != NULL,
+		$customer_data = [
+			'consent' => $this->request->getPost('consent') != NULL,
+			'account_number' => $this->request->getPost('account_number') == '' ? NULL : $this->request->getPost('account_number', FILTER_SANITIZE_STRING),
+			'tax_id' => $this->request->getPost('tax_id', FILTER_SANITIZE_STRING),
+			'company_name' => $this->request->getPost('company_name') == '' ? NULL : $this->request->getPost('company_name', FILTER_SANITIZE_STRING),
+			'discount' => $this->request->getPost('discount') == '' ? 0.00 : $this->request->getPost('discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+			'discount_type' => $this->request->getPost('discount_type') == NULL ? PERCENT : $this->request->getPost('discount_type', FILTER_SANITIZE_NUMBER_INT),
+			'package_id' => $this->request->getPost('package_id') == '' ? NULL : $this->request->getPost('package_id', FILTER_SANITIZE_STRING),
+			'taxable' => $this->request->getPost('taxable') != NULL,
 			'date' => $date_formatter->format('Y-m-d H:i:s'),
-			'employee_id' => $this->input->post('employee_id'),
-			'sales_tax_code_id' => $this->input->post('sales_tax_code_id') == '' ? NULL : $this->input->post('sales_tax_code_id')
-		);
+			'employee_id' => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
+			'sales_tax_code_id' => $this->request->getPost('sales_tax_code_id') == '' ? NULL : $this->request->getPost('sales_tax_code_id', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		if($this->Customer->save_customer($person_data, $customer_data, $customer_id))
+		if($this->customer->save_customer($person_data, $customer_data, $customer_id))
 		{
-			// save customer to Mailchimp selected list
-			$this->mailchimp_lib->addOrUpdateMember($this->_list_id, $email, $first_name, $last_name, $this->input->post('mailchimp_status'), array('vip' => $this->input->post('mailchimp_vip') != NULL));
+			// save customer to Mailchimp selected list	//TODO: addOrUpdateMember should be refactored... potentially pass an array or object instead of 6 parameters.
+			$this->mailchimp_lib->addOrUpdateMember(
+				$this->_list_id,
+				$email,
+				$first_name,
+				$last_name,
+				$this->request->getPost('mailchimp_status', FILTER_SANITIZE_STRING),
+				['vip' => $this->request->getPost('mailchimp_vip') != NULL]
+			);
 
 			// New customer
 			if($customer_id == -1)
 			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('customers_successful_adding') . ' ' . $first_name . ' ' . $last_name,
-								'id' => $this->xss_clean($customer_data['person_id'])));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Customers.successful_adding') . ' ' . $first_name . ' ' . $last_name,
+					'id' => $customer_data['person_id']
+				]);
 			}
 			else // Existing customer
 			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('customers_successful_updating') . ' ' . $first_name . ' ' . $last_name,
-								'id' => $customer_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Customers.successful_updating') . ' ' . $first_name . ' ' . $last_name,
+					'id' => $customer_id
+				]);
 			}
 		}
 		else // Failure
 		{
-			echo json_encode(array('success' => FALSE,
-							'message' => $this->lang->line('customers_error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
-							'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Customers.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
+				'id' => -1
+			]);
 		}
 	}
 
-	/*
-	AJAX call to verify if an email address already exists
-	*/
-	public function ajax_check_email()
+	/**
+	 * AJAX call to verify if an email address already exists
+	 */
+	public function ajax_check_email(): void
 	{
-		$exists = $this->Customer->check_email_exists(strtolower($this->input->post('email')), $this->input->post('person_id'));
+		$exists = $this->customer->check_email_exists(strtolower($this->request->getPost('email')), $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT));
 
 		echo !$exists ? 'true' : 'false';
 	}
 
-	/*
-	AJAX call to verify if an account number already exists
-	*/
-	public function ajax_check_account_number()
+	/**
+	 * AJAX call to verify if an account number already exists
+	 */
+	public function ajax_check_account_number(): void
 	{
-		$exists = $this->Customer->check_account_number_exists($this->input->post('account_number'), $this->input->post('person_id'));
+		$exists = $this->customer->check_account_number_exists($this->request->getPost('account_number'), $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT));
 
 		echo !$exists ? 'true' : 'false';
 	}
 
-	/*
-	This deletes customers from the customers table
-	*/
-	public function delete()
+	/**
+	 * This deletes customers from the customers table
+	 */
+	public function delete(): void
 	{
-		$customers_to_delete = $this->input->post('ids');
-		$customers_info = $this->Customer->get_multiple_info($customers_to_delete);
+		$customers_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
+		$customers_info = $this->customer->get_multiple_info($customers_to_delete);
 
 		$count = 0;
 
-		foreach($customers_info->result() as $info)
+		foreach($customers_info->getResult() as $info)
 		{
-			if($this->Customer->delete($info->person_id))
+			if($this->customer->delete($info->person_id))
 			{
 				// remove customer from Mailchimp selected list
 				$this->mailchimp_lib->removeMember($this->_list_id, $info->email);
@@ -337,35 +379,35 @@ class Customers extends Persons
 
 		if($count == count($customers_to_delete))
 		{
-			echo json_encode(array('success' => TRUE,
-				'message' => $this->lang->line('customers_successful_deleted') . ' ' . $count . ' ' . $this->lang->line('customers_one_or_multiple')));
+			echo json_encode (['success' => TRUE,
+				'message' => lang('Customers.successful_deleted') . ' ' . $count . ' ' . lang('Customers.one_or_multiple')]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Customers.cannot_be_deleted')]);
 		}
 	}
 
-	/*
-	Customers import from csv spreadsheet
-	*/
-	public function csv()
+	/**
+	 * Customers import from csv spreadsheet
+	 */
+	public function csv(): void
 	{
 		$name = 'import_customers.csv';
 		$data = file_get_contents('../' . $name);
 		force_download($name, $data);
 	}
 
-	public function csv_import()
+	public function csv_import(): void
 	{
-		$this->load->view('customers/form_csv_import', NULL);
+		echo view('customers/form_csv_import', NULL);
 	}
 
-	public function do_csv_import()
+	public function do_csv_import(): void
 	{
 		if($_FILES['file_path']['error'] != UPLOAD_ERR_OK)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_failed')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Customers.csv_import_failed')]);
 		}
 		else
 		{
@@ -375,51 +417,48 @@ class Customers extends Persons
 				fgetcsv($handle);
 				$i = 1;
 
-				$failCodes = array();
+				$failCodes = [];
 
 				while(($data = fgetcsv($handle)) !== FALSE)
 				{
-					// XSS file data sanity check
-					$data = $this->xss_clean($data);
-
 					$consent = $data[3] == '' ? 0 : 1;
 
 					if(sizeof($data) >= 16 && $consent)
 					{
 						$email = strtolower($data[4]);
-						$person_data = array(
-							'first_name'	=> $data[0],
-							'last_name'		=> $data[1],
-							'gender'		=> $data[2],
-							'email'			=> $email,
-							'phone_number'	=> $data[5],
-							'address_1'		=> $data[6],
-							'address_2'		=> $data[7],
-							'city'			=> $data[8],
-							'state'			=> $data[9],
-							'zip'			=> $data[10],
-							'country'		=> $data[11],
-							'comments'		=> $data[12]
-						);
+						$person_data = [
+							'first_name' => $data[0],
+							'last_name' => $data[1],
+							'gender' => $data[2],
+							'email' => $email,
+							'phone_number' => $data[5],
+							'address_1' => $data[6],
+							'address_2' => $data[7],
+							'city' => $data[8],
+							'state' => $data[9],
+							'zip' => $data[10],
+							'country' => $data[11],
+							'comments' => $data[12]
+						];
 
-						$customer_data = array(
-							'consent'			=> $consent,
-							'company_name'		=> $data[13],
-							'discount'			=> $data[15],
-							'discount_type'		=> $data[16],
-							'taxable'			=> $data[17] == '' ? 0 : 1,
-							'date'				=> date('Y-m-d H:i:s'),
-							'employee_id'		=> $this->Employee->get_logged_in_employee_info()->person_id
-						);
+						$customer_data = [
+							'consent' => $consent,
+							'company_name' => $data[13],
+							'discount' => $data[15],
+							'discount_type' => $data[16],
+							'taxable' => $data[17] == '' ? 0 : 1,
+							'date' => date('Y-m-d H:i:s'),
+							'employee_id' => $this->employee->get_logged_in_employee_info()->person_id
+						];
 						$account_number = $data[14];
 
 						// don't duplicate people with same email
-						$invalidated = $this->Customer->check_email_exists($email);
+						$invalidated = $this->customer->check_email_exists($email);
 
 						if($account_number != '')
 						{
 							$customer_data['account_number'] = $account_number;
-							$invalidated &= $this->Customer->check_account_number_exists($account_number);
+							$invalidated &= $this->customer->check_account_number_exists($account_number);
 						}
 					}
 					else
@@ -431,7 +470,7 @@ class Customers extends Persons
 					{
 						$failCodes[] = $i;
 					}
-					elseif($this->Customer->save_customer($person_data, $customer_data))
+					elseif($this->customer->save_customer($person_data, $customer_data))
 					{
 						// save customer to Mailchimp selected list
 						$this->mailchimp_lib->addOrUpdateMember($this->_list_id, $person_data['email'], $person_data['first_name'], '', $person_data['last_name']);
@@ -446,20 +485,19 @@ class Customers extends Persons
 
 				if(count($failCodes) > 0)
 				{
-					$message = $this->lang->line('customers_csv_import_partially_failed') . ' (' . count($failCodes) . '): ' . implode(', ', $failCodes);
+					$message = lang('Customers.csv_import_partially_failed', ['failures' => count($failCodes), 'fail_rows' => implode(', ', $failCodes)]);
 
-					echo json_encode(array('success' => FALSE, 'message' => $message));
+					echo json_encode (['success' => FALSE, 'message' => $message]);
 				}
 				else
 				{
-					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_csv_import_success')));
+					echo json_encode (['success' => TRUE, 'message' => lang('Customers.csv_import_success')]);
 				}
 			}
 			else
 			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_nodata_wrongformat')));
+				echo json_encode (['success' => FALSE, 'message' => lang('Customers.csv_import_nodata_wrongformat')]);
 			}
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Employees.php b/app/Controllers/Employees.php
index d101dc75c..f37ed8bbe 100644
--- a/app/Controllers/Employees.php
+++ b/app/Controllers/Employees.php
@@ -1,201 +1,221 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Persons.php");
+namespace App\Controllers;
 
+use app\Models\Module;
+
+/**
+ *
+ *
+ * @property module module
+ *
+ */
 class Employees extends Persons
 {
 	public function __construct()
 	{
 		parent::__construct('employees');
+
+		$this->module = model('Module');
 	}
 
-	/*
-	Returns employee table data rows. This will be called with AJAX.
-	*/
-	public function search()
+	/**
+	 * Returns employee table data rows. This will be called with AJAX.
+	 */
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$employees = $this->Employee->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Employee->get_found_rows($search);
+		$employees = $this->employee->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->employee->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($employees->result() as $person)
+		$data_rows = [];
+		foreach($employees->getResult() as $person)
 		{
-			$data_rows[] = $this->xss_clean(get_person_data_row($person));
+			$data_rows[] = get_person_data_row($person);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	/*
-	Gives search suggestions based on what is being searched for
-	*/
-	public function suggest()
+	/**
+	 * Gives search suggestions based on what is being searched for
+	 */
+	public function suggest(): void
 	{
-		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->get('term'), TRUE));
+		$suggestions = $this->employee->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), 25, TRUE);
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest_search()
+	public function suggest_search(): void
 	{
-		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->post('term')));
+		$suggestions = $this->employee->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	/*
-	Loads the employee edit form
-	*/
-	public function view($employee_id = -1)
+	/**
+	 * Loads the employee edit form
+	 */
+	public function view(int $employee_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$person_info = $this->Employee->get_info($employee_id);
+		$person_info = $this->employee->get_info($employee_id);
 		foreach(get_object_vars($person_info) as $property => $value)
 		{
-			$person_info->$property = $this->xss_clean($value);
+			$person_info->$property = $value;
 		}
 		$data['person_info'] = $person_info;
 		$data['employee_id'] = $employee_id;
 
-		$modules = array();
-		foreach($this->Module->get_all_modules()->result() as $module)
+		$modules = [];
+		foreach($this->module->get_all_modules()->getResult() as $module)
 		{
-			$module->module_id = $this->xss_clean($module->module_id);
-			$module->grant = $this->xss_clean($this->Employee->has_grant($module->module_id, $person_info->person_id));
-			$module->menu_group = $this->xss_clean($this->Employee->get_menu_group($module->module_id, $person_info->person_id));
+			$module->grant = $this->employee->has_grant($module->module_id, $person_info->person_id);
+			$module->menu_group = $this->employee->get_menu_group($module->module_id, $person_info->person_id);
 
 			$modules[] = $module;
 		}
 		$data['all_modules'] = $modules;
 
-		$permissions = array();
-		foreach($this->Module->get_all_subpermissions()->result() as $permission)
+		$permissions = [];
+		foreach($this->module->get_all_subpermissions()->getResult() as $permission)	//TODO: subpermissions does not follow naming standards.
 		{
-			$permission->module_id = $this->xss_clean($permission->module_id);
-			$permission->permission_id = str_replace(' ', '_', $this->xss_clean($permission->permission_id));
-			$permission->grant = $this->xss_clean($this->Employee->has_grant($permission->permission_id, $person_info->person_id));
+			$permission->permission_id = str_replace(' ', '_', $permission->permission_id);
+			$permission->grant = $this->employee->has_grant($permission->permission_id, $person_info->person_id);
 
 			$permissions[] = $permission;
 		}
 		$data['all_subpermissions'] = $permissions;
 
-		$this->load->view('employees/form', $data);
+		echo view('employees/form', $data);
 	}
 
-	/*
-	Inserts/updates an employee
-	*/
-	public function save($employee_id = -1)
+	/**
+	 * Inserts/updates an employee
+	 */
+	public function save(int $employee_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$first_name = $this->xss_clean($this->input->post('first_name'));
-		$last_name = $this->xss_clean($this->input->post('last_name'));
-		$email = $this->xss_clean(strtolower($this->input->post('email')));
+		$first_name = $this->request->getPost('first_name', FILTER_SANITIZE_STRING);	//TODO: duplicated code
+		$last_name = $this->request->getPost('last_name', FILTER_SANITIZE_STRING);
+		$email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
 		// format first and last name properly
 		$first_name = $this->nameize($first_name);
 		$last_name = $this->nameize($last_name);
 
-		$person_data = array(
+		$person_data = [
 			'first_name' => $first_name,
 			'last_name' => $last_name,
-			'gender' => $this->input->post('gender'),
+			'gender' => $this->request->getPost('gender', FILTER_SANITIZE_NUMBER_INT),
 			'email' => $email,
-			'phone_number' => $this->input->post('phone_number'),
-			'address_1' => $this->input->post('address_1'),
-			'address_2' => $this->input->post('address_2'),
-			'city' => $this->input->post('city'),
-			'state' => $this->input->post('state'),
-			'zip' => $this->input->post('zip'),
-			'country' => $this->input->post('country'),
-			'comments' => $this->input->post('comments'),
-		);
+			'phone_number' => $this->request->getPost('phone_number', FILTER_SANITIZE_STRING),
+			'address_1' => $this->request->getPost('address_1', FILTER_SANITIZE_STRING),
+			'address_2' => $this->request->getPost('address_2', FILTER_SANITIZE_STRING),
+			'city' => $this->request->getPost('city', FILTER_SANITIZE_STRING),
+			'state' => $this->request->getPost('state', FILTER_SANITIZE_STRING),
+			'zip' => $this->request->getPost('zip', FILTER_SANITIZE_STRING),
+			'country' => $this->request->getPost('country', FILTER_SANITIZE_STRING),
+			'comments' => $this->request->getPost('comments', FILTER_SANITIZE_STRING)
+		];
 
-		$grants_array = array();
-		foreach($this->Module->get_all_permissions()->result() as $permission)
+		$grants_array = [];
+		foreach($this->module->get_all_permissions()->getResult() as $permission)
 		{
-			$grants = array();
-			$grant = $this->input->post('grant_'.$permission->permission_id) != NULL ? $this->input->post('grant_'.$permission->permission_id) : '';
+			$grants = [];
+			$grant = $this->request->getPost('grant_'.$permission->permission_id) != NULL ? $this->request->getPost('grant_' . $permission->permission_id, FILTER_SANITIZE_STRING) : '';
+
 			if($grant == $permission->permission_id)
 			{
 				$grants['permission_id'] = $permission->permission_id;
-				$grants['menu_group'] = $this->input->post('menu_group_'.$permission->permission_id) != NULL ? $this->input->post('menu_group_'.$permission->permission_id) : '--';
+				$grants['menu_group'] = $this->request->getPost('menu_group_'.$permission->permission_id) != NULL ? $this->request->getPost('menu_group_' . $permission->permission_id, FILTER_SANITIZE_STRING) : '--';
 				$grants_array[] = $grants;
 			}
 		}
 
 		//Password has been changed OR first time password set
-		if($this->input->post('password') != '' && ENVIRONMENT != 'testing')
+		if($this->request->getPost('password') != '' && ENVIRONMENT != 'testing')
 		{
-			$exploded = explode(":", $this->input->post('language'));
-			$employee_data = array(
-				'username' 	=> $this->input->post('username'),
-				'password' 	=> password_hash($this->input->post('password'), PASSWORD_DEFAULT),
+			$exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_STRING));
+			$employee_data = [
+				'username' 	=> $this->request->getPost('username', FILTER_SANITIZE_STRING),
+				'password' 	=> password_hash($this->request->getPost('password'), PASSWORD_DEFAULT),
 				'hash_version' 	=> 2,
 				'language_code' => $exploded[0],
 				'language' 	=> $exploded[1]
-			);
+			];
 		}
 		else //Password not changed
 		{
-			$exploded = explode(":", $this->input->post('language'));
-			$employee_data = array(
-				'username' 	=> $this->input->post('username'),
+			$exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_STRING));
+			$employee_data = [
+				'username' 	=> $this->request->getPost('username', FILTER_SANITIZE_STRING),
 				'language_code'	=> $exploded[0],
 				'language' 	=> $exploded[1]
-			);
+			];
 		}
 
-		if($this->Employee->save_employee($person_data, $employee_data, $grants_array, $employee_id))
+		if($this->employee->save_employee($person_data, $employee_data, $grants_array, $employee_id))
 		{
 			// New employee
 			if($employee_id == -1)
 			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('employees_successful_adding') . ' ' . $first_name . ' ' . $last_name,
-								'id' => $this->xss_clean($employee_data['person_id'])));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Employees.successful_adding') . ' ' . $first_name . ' ' . $last_name,
+					'id' => $employee_data['person_id']
+				]);
 			}
 			else // Existing employee
 			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('employees_successful_updating') . ' ' . $first_name . ' ' . $last_name,
-								'id' => $employee_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Employees.successful_updating') . ' ' . $first_name . ' ' . $last_name,
+					'id' => $employee_id
+				]);
 			}
 		}
 		else // Failure
 		{
-			echo json_encode(array('success' => FALSE,
-							'message' => $this->lang->line('employees_error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
-							'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Employees.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
+				'id' => -1
+			]);
 		}
 	}
 
-	/*
-	This deletes employees from the employees table
-	*/
-	public function delete()
+	/**
+	 * This deletes employees from the employees table
+	 */
+	public function delete(): void
 	{
-		$employees_to_delete = $this->xss_clean($this->input->post('ids'));
+		$employees_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Employee->delete_list($employees_to_delete))
+		if($this->employee->delete_list($employees_to_delete))	//TODO: this is passing a string, but delete_list expects an array
 		{
-			echo json_encode(array('success' => TRUE,'message' => $this->lang->line('employees_successful_deleted') . ' ' .
-							count($employees_to_delete) . ' ' . $this->lang->line('employees_one_or_multiple')));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Employees.successful_deleted') . ' ' . count($employees_to_delete) . ' ' . lang('Employees.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Employees.cannot_be_deleted')]);
 		}
 	}
 
-	public function check_username($employee_id)
+	/**
+	 * @param $employee_id
+	 * @return void
+	 */
+	public function check_username($employee_id): void
 	{
-		$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
+		$exists = $this->employee->username_exists($employee_id, $this->request->getGet('username', FILTER_SANITIZE_STRING));
 		echo !$exists ? 'true' : 'false';
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Expenses.php b/app/Controllers/Expenses.php
index f419bf622..7bcc8fb4b 100644
--- a/app/Controllers/Expenses.php
+++ b/app/Controllers/Expenses.php
@@ -1,87 +1,100 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Expense;
+use app\Models\Expense_category;
+
+/**
+ * @property expense expense
+ * @property expense_category expense_category
+ */
 class Expenses extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('expenses');
+
+		$this->expense = model('Expense');
+		$this->expense_category = model('Expense_category');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_expenses_manage_table_headers());
+		$data['table_headers'] = get_expenses_manage_table_headers();
 
 		// filters that will be loaded in the multiselect dropdown
-		$data['filters'] = array('only_cash' => $this->lang->line('expenses_cash_filter'),
-			'only_due' => $this->lang->line('expenses_due_filter'),
-			'only_check' => $this->lang->line('expenses_check_filter'),
-			'only_credit' => $this->lang->line('expenses_credit_filter'),
-			'only_debit' => $this->lang->line('expenses_debit_filter'),
-			'is_deleted' => $this->lang->line('expenses_is_deleted'));
+		$data['filters'] = [
+			'only_cash' => lang('Expenses.cash_filter'),
+			'only_due' => lang('Expenses.due_filter'),
+			'only_check' => lang('Expenses.check_filter'),
+			'only_credit' => lang('Expenses.credit_filter'),
+			'only_debit' => lang('Expenses.debit_filter'),
+			'is_deleted' => lang('Expenses.is_deleted')
+		];
 
-		$this->load->view('expenses/manage', $data);
+		echo view('expenses/manage', $data);
 	}
 
-	public function search()
+	public function search(): void
 	{
-		$payments = 0;
-		$search   = $this->input->get('search');
-		$limit    = $this->input->get('limit');
-		$offset   = $this->input->get('offset');
-		$sort     = $this->input->get('sort');
-		$order    = $this->input->get('order');
-		$filters  = array(
-					 'start_date' => $this->input->get('start_date'),
-					 'end_date' => $this->input->get('end_date'),
-					 'only_cash' => FALSE,
-					 'only_due' => FALSE,
-					 'only_check' => FALSE,
-					 'only_credit' => FALSE,
-					 'only_debit' => FALSE,
-					 'is_deleted' => FALSE);
+		$search   = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit    = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset   = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort     = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order    = $this->request->getGet('order', FILTER_SANITIZE_STRING);
+		$filters  = [
+			'start_date' => $this->request->getGet('start_date', FILTER_SANITIZE_STRING),
+			'end_date' => $this->request->getGet('end_date', FILTER_SANITIZE_STRING),
+			'only_cash' => FALSE,
+			'only_due' => FALSE,
+			'only_check' => FALSE,
+			'only_credit' => FALSE,
+			'only_debit' => FALSE,
+			'is_deleted' => FALSE
+		];
 
 		// check if any filter is set in the multiselect dropdown
-		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$filledup = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_STRING), TRUE);	//TODO: variable naming does not match standard
 		$filters = array_merge($filters, $filledup);
-		$expenses = $this->Expense->search($search, $filters, $limit, $offset, $sort, $order);
-		$total_rows = $this->Expense->get_found_rows($search, $filters);
-		$payments = $this->Expense->get_payments_summary($search, $filters);
+		$expenses = $this->expense->search($search, $filters, $limit, $offset, $sort, $order);
+		$total_rows = $this->expense->get_found_rows($search, $filters);
+		$payments = $this->expense->get_payments_summary($search, $filters);
 		$payment_summary = get_expenses_manage_payments_summary($payments, $expenses);
-		$data_rows = array();
-		foreach($expenses->result() as $expense)
+		$data_rows = [];
+
+		foreach($expenses->getResult() as $expense)
 		{
-			$data_rows[] = $this->xss_clean(get_expenses_data_row($expense));
+			$data_rows[] = get_expenses_data_row($expense);
 		}
 
 		if($total_rows > 0)
 		{
-			$data_rows[] = $this->xss_clean(get_expenses_data_last_row($expenses));
+			$data_rows[] = get_expenses_data_last_row($expenses);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary]);
 	}
 
-	public function view($expense_id = -1)
+	public function view(int $expense_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$data = array();
+		$data = [];	//TODO: Duplicated code
 
-		$data['employees'] = array();
-		foreach($this->Employee->get_all()->result() as $employee)
+		$data['employees'] = [];
+		foreach($this->employee->get_all()->getResult() as $employee)
 		{
 			foreach(get_object_vars($employee) as $property => $value)
 			{
-				$employee->$property = $this->xss_clean($value);
+				$employee->$property = $value;
 			}
 
 			$data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
 		}
 
-		$data['expenses_info'] = $this->Expense->get_info($expense_id);
+		$data['expenses_info'] = $this->expense->get_info($expense_id);
 
-		$expense_categories = array();
-		foreach($this->Expense_category->get_all(0, 0, TRUE)->result_array() as $row)
+		$expense_categories = [];
+		foreach($this->expense_category->get_all(0, 0, TRUE)->getResultArray() as $row)
 		{
 			$expense_categories[$row['expense_category_id']] = $row['category_name'];
 		}
@@ -92,92 +105,89 @@ class Expenses extends Secure_Controller
 		if(empty($expense_id))
 		{
 			$data['expenses_info']->date = date('Y-m-d H:i:s');
-			$data['expenses_info']->employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+			$data['expenses_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 		}
 
-		$data['payments'] = array();
-		foreach($this->Expense->get_expense_payment($expense_id)->result() as $payment)
+		$data['payments'] = [];
+		foreach($this->expense->get_expense_payment($expense_id)->getResult() as $payment)
 		{
 			foreach(get_object_vars($payment) as $property => $value)
 			{
-				$payment->$property = $this->xss_clean($value);
+				$payment->$property = $value;
 			}
 
 			$data['payments'][] = $payment;
 		}
 
 		// don't allow gift card to be a payment option in a sale transaction edit because it's a complex change
-		$data['payment_options'] = $this->xss_clean($this->Expense->get_payment_options(FALSE));
+		$data['payment_options'] = $this->expense->get_payment_options();
 
-		$this->load->view("expenses/form", $data);
+		echo view("expenses/form", $data);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id)
 	{
-		$expense_info = $this->Expense->get_info($row_id);
-		$data_row = $this->xss_clean(get_expenses_data_row($expense_info));
+		$expense_info = $this->expense->get_info($row_id);
+		$data_row = get_expenses_data_row($expense_info);
 
 		echo json_encode($data_row);
 	}
 
-	public function save($expense_id = -1)
+	public function save(int $expense_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$newdate = $this->input->post('date');
+		$newdate = $this->request->getPost('date', FILTER_SANITIZE_STRING);
 
-		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
+		$date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $newdate);
 
-		$expense_data = array(
+		$expense_data = [
 			'date' => $date_formatter->format('Y-m-d H:i:s'),
-			'supplier_id' => $this->input->post('supplier_id') == '' ? NULL : $this->input->post('supplier_id'),
-			'supplier_tax_code' => $this->input->post('supplier_tax_code'),
-			'amount' => parse_decimals($this->input->post('amount')),
-			'tax_amount' => parse_decimals($this->input->post('tax_amount')),
-			'payment_type' => $this->input->post('payment_type'),
-			'expense_category_id' => $this->input->post('expense_category_id'),
-			'description' => $this->input->post('description'),
-			'employee_id' => $this->input->post('employee_id'),
-			'deleted' => $this->input->post('deleted') != NULL
-		);
+			'supplier_id' => $this->request->getPost('supplier_id') == '' ? NULL : $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT),
+			'supplier_tax_code' => $this->request->getPost('supplier_tax_code', FILTER_SANITIZE_STRING),
+			'amount' => parse_decimals($this->request->getPost('amount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'tax_amount' => parse_decimals($this->request->getPost('tax_amount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'payment_type' => $this->request->getPost('payment_type', FILTER_SANITIZE_STRING),
+			'expense_category_id' => $this->request->getPost('expense_category_id', FILTER_SANITIZE_NUMBER_INT),
+			'description' => $this->request->getPost('description', FILTER_SANITIZE_STRING),
+			'employee_id' => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
+			'deleted' => $this->request->getPost('deleted') != NULL
+		];
 
-		if($this->Expense->save($expense_data, $expense_id))
+		if($this->expense->save_value($expense_data, $expense_id))
 		{
-			$expense_data = $this->xss_clean($expense_data);
-
-			//New expense_id
+			//New Expense
 			if($expense_id == -1)
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_successful_adding'), 'id' => $expense_data['expense_id']));
+				echo json_encode (['success' => TRUE, 'message' => lang('Expenses.successful_adding'), 'id' => $expense_data['expense_id']]);
 			}
 			else // Existing Expense
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_successful_updating'), 'id' => $expense_id));
+				echo json_encode (['success' => TRUE, 'message' => lang('Expenses.successful_updating'), 'id' => $expense_id]);
 			}
 		}
 		else//failure
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_error_adding_updating'), 'id' => -1));
+			echo json_encode (['success' => FALSE, 'message' => lang('Expenses.error_adding_updating'), 'id' => -1]);	//TODO: Need to replace -1 with a constant
 		}
 	}
 
-	public function ajax_check_amount()
+	public function ajax_check_amount(): void
 	{
-		$value = $this->input->post();
+		$value = $this->request->getPost(NULL, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		$parsed_value = parse_decimals(array_pop($value));
-		echo json_encode(array('success' => $parsed_value !== FALSE));
+		echo json_encode (['success' => $parsed_value !== FALSE]);
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$expenses_to_delete = $this->input->post('ids');
+		$expenses_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Expense->delete_list($expenses_to_delete))
+		if($this->expense->delete_list($expenses_to_delete))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_successful_deleted') . ' ' . count($expenses_to_delete) . ' ' . $this->lang->line('expenses_one_or_multiple'), 'ids' => $expenses_to_delete));
+			echo json_encode (['success' => TRUE, 'message' => lang('Expenses.successful_deleted') . ' ' . count($expenses_to_delete) . ' ' . lang('Expenses.one_or_multiple'), 'ids' => $expenses_to_delete]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_cannot_be_deleted'), 'ids' => $expenses_to_delete));
+			echo json_encode (['success' => FALSE, 'message' => lang('Expenses.cannot_be_deleted'), 'ids' => $expenses_to_delete]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Expenses_categories.php b/app/Controllers/Expenses_categories.php
index e7af65260..c2131f2c3 100644
--- a/app/Controllers/Expenses_categories.php
+++ b/app/Controllers/Expenses_categories.php
@@ -1,97 +1,116 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
-class Expenses_categories extends Secure_Controller
+use app\Models\Expense_category;
+
+/**
+ * @property expense_category expense_category
+ */
+class Expenses_categories extends Secure_Controller	//TODO: Is this class ever used?
 {
 	public function __construct()
 	{
 		parent::__construct('expenses_categories');
+
+		$this->expense_category = model('Expense_category');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		 $data['table_headers'] = $this->xss_clean(get_expense_category_manage_table_headers());
+		 $data['table_headers'] = get_expense_category_manage_table_headers();
 
-		 $this->load->view('expenses_categories/manage', $data);
+		 echo view('expenses_categories/manage', $data);
 	}
 
 	/*
 	Returns expense_category_manage table data rows. This will be called with AJAX.
 	*/
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$expense_categories = $this->Expense_category->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Expense_category->get_found_rows($search);
+		$expense_categories = $this->expense_category->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->expense_category->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($expense_categories->result() as $expense_category)
+		$data_rows = [];
+		foreach($expense_categories->getResult() as $expense_category)
 		{
-			$data_rows[] = $this->xss_clean(get_expense_category_data_row($expense_category));
+			$data_rows[] = get_expense_category_data_row($expense_category);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$data_row = $this->xss_clean(get_expense_category_data_row($this->Expense_category->get_info($row_id)));
+		$data_row = get_expense_category_data_row($this->expense_category->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	public function view($expense_category_id = -1)
+	public function view(int $expense_category_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$data['category_info'] = $this->Expense_category->get_info($expense_category_id);
+		$data['category_info'] = $this->expense_category->get_info($expense_category_id);
 
-		$this->load->view("expenses_categories/form", $data);
+		echo view("expenses_categories/form", $data);
 	}
 
-	public function save($expense_category_id = -1)
+	public function save(int $expense_category_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$expense_category_data = array(
-			'category_name' => $this->input->post('category_name'),
-			'category_description' => $this->input->post('category_description')
-		);
+		$expense_category_data = [
+			'category_name' => $this->request->getPost('category_name', FILTER_SANITIZE_STRING),
+			'category_description' => $this->request->getPost('category_description', FILTER_SANITIZE_STRING)
+		];
 
-		if($this->Expense_category->save($expense_category_data, $expense_category_id))
+		if($this->expense_category->save_value($expense_category_data, $expense_category_id))	//TODO: Reflection exception
 		{
-			$expense_category_data = $this->xss_clean($expense_category_data);
-
-			// New expense_category_id
-			if($expense_category_id == -1)
+			// New expense_category
+			if($expense_category_id == -1)	//TODO: Replace -1 with a constant.
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_categories_successful_adding'), 'id' => $expense_category_data['expense_category_id']));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Expenses_categories.successful_adding'),
+					'id' => $expense_category_data['expense_category_id']
+				]);
 			}
 			else // Existing Expense Category
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_categories_successful_updating'), 'id' => $expense_category_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Expenses_categories.successful_updating'),
+					'id' => $expense_category_id
+				]);
 			}
 		}
 		else//failure
-		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_categories_error_adding_updating') . ' ' . $expense_category_data['category_name'], 'id' => -1));
+		{//TODO: need to replace -1 for a constant
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Expenses_categories.error_adding_updating') . ' ' . $expense_category_data['category_name'],
+				'id' => -1
+			]);
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$expense_category_to_delete = $this->input->post('ids');
+		$expense_category_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Expense_category->delete_list($expense_category_to_delete))
+		if($this->expense_category->delete_list($expense_category_to_delete))	//TODO: Convert to ternary notation.
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('expenses_categories_successful_deleted') . ' ' . count($expense_category_to_delete) . ' ' . $this->lang->line('expenses_categories_one_or_multiple')));
+			echo json_encode([
+				'success' => TRUE,
+				'message' => lang('Expenses_categories.successful_deleted') . ' ' . count($expense_category_to_delete) . ' ' . lang('Expenses_categories.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_categories_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Expenses_categories.cannot_be_deleted')]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Giftcards.php b/app/Controllers/Giftcards.php
index a988361b8..f350dcbd7 100644
--- a/app/Controllers/Giftcards.php
+++ b/app/Controllers/Giftcards.php
@@ -1,152 +1,168 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once("Secure_Controller.php");
-
-class Giftcards extends Secure_Controller
-{
-	public function __construct()
-	{
-		parent::__construct('giftcards');
-	}
-
-	public function index()
-	{
-		$data['table_headers'] = $this->xss_clean(get_giftcards_manage_table_headers());
-
-		$this->load->view('giftcards/manage', $data);
-	}
-
-	/*
-	Returns Giftcards table data rows. This will be called with AJAX.
-	*/
-	public function search()
-	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
-
-		$giftcards = $this->Giftcard->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Giftcard->get_found_rows($search);
-
-		$data_rows = array();
-		foreach($giftcards->result() as $giftcard)
-		{
-			$data_rows[] = $this->xss_clean(get_giftcard_data_row($giftcard));
-		}
-
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
-	}
-
-	/*
-	Gives search suggestions based on what is being searched for
-	*/
-
-	public function suggest()
-	{
-		$suggestions = $this->xss_clean($this->Giftcard->get_search_suggestions($this->input->get('term'), TRUE));
-
-		echo json_encode($suggestions);
-	}
-
-	public function suggest_search()
-	{
-		$suggestions = $this->xss_clean($this->Giftcard->get_search_suggestions($this->input->post('term')));
-
-		echo json_encode($suggestions);
-	}
-
-	public function get_row($row_id)
-	{
-		$data_row = $this->xss_clean(get_giftcard_data_row($this->Giftcard->get_info($row_id)));
-
-		echo json_encode($data_row);
-	}
-
-	public function view($giftcard_id = -1)
-	{
-		$giftcard_info = $this->Giftcard->get_info($giftcard_id);
-
-		$data['selected_person_name'] = ($giftcard_id > 0 && isset($giftcard_info->person_id)) ? $giftcard_info->first_name . ' ' . $giftcard_info->last_name : '';
-		$data['selected_person_id'] = $giftcard_info->person_id;
-		if($this->config->item('giftcard_number') == "random")
-		{
-			$data['giftcard_number'] = $giftcard_id > 0 ? $giftcard_info->giftcard_number : '';
-		}
-		else
-		{
-			$max_giftnumber = isset($this->Giftcard->get_max_number()->giftcard_number) ? $this->Giftcard->get_max_number()->giftcard_number : 0;
-			$data['giftcard_number'] = $giftcard_id > 0 ? $giftcard_info->giftcard_number : $max_giftnumber + 1;
-		}
-		$data['giftcard_id'] = $giftcard_id;
-		$data['giftcard_value'] = $giftcard_info->value;
-
-		$data = $this->xss_clean($data);
-
-		$this->load->view("giftcards/form", $data);
-	}
-
-	public function save($giftcard_id = -1)
-	{
-		$giftcard_number = $this->input->post('giftcard_number');
-
-		if($giftcard_id == -1 && trim($giftcard_number) == '')
-		{
-			$giftcard_number = $this->Giftcard->generate_unique_giftcard_name($this->input->post('giftcard_amount'));
-		}
-
-		$giftcard_data = array(
-			'record_time' => date('Y-m-d H:i:s'),
-			'giftcard_number' => $giftcard_number,
-			'value' => parse_decimals($this->input->post('giftcard_amount')),
-			'person_id' => $this->input->post('person_id') == '' ? NULL : $this->input->post('person_id')
-		);
-
-		if($this->Giftcard->save($giftcard_data, $giftcard_id))
-		{
-			$giftcard_data = $this->xss_clean($giftcard_data);
-
-			//New giftcard
-			if($giftcard_id == -1)
-			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('giftcards_successful_adding') . ' ' .
-								$giftcard_data['giftcard_number'], 'id' => $giftcard_data['giftcard_id']));
-			}
-			else //Existing giftcard
-			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('giftcards_successful_updating') . ' ' .
-								$giftcard_data['giftcard_number'], 'id' => $giftcard_id));
-			}
-		}
-		else //failure
-		{
-			$giftcard_data = $this->xss_clean($giftcard_data);
-			
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('giftcards_error_adding_updating') . ' ' .
-							$giftcard_data['giftcard_number'], 'id' => -1));
-		}
-	}
-
-	public function ajax_check_number_giftcard()
-	{
-		$parsed_value = parse_decimals($this->input->post('giftcard_amount'));
-		echo json_encode(array('success' => $parsed_value !== FALSE, 'giftcard_amount' => to_currency_no_money($parsed_value)));
-	}
-
-	public function delete()
-	{
-		$giftcards_to_delete = $this->xss_clean($this->input->post('ids'));
-
-		if($this->Giftcard->delete_list($giftcards_to_delete))
-		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('giftcards_successful_deleted') . ' ' .
-							count($giftcards_to_delete).' '.$this->lang->line('giftcards_one_or_multiple')));
-		}
-		else
-		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('giftcards_cannot_be_deleted')));
-		}
-	}
-}
-?>
+<?php
+
+namespace App\Controllers;
+
+use app\Models\Giftcard;
+
+/**
+ * @property giftcard giftcard
+ */
+class Giftcards extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('giftcards');
+
+		$this->giftcard = model('Giftcard');
+	}
+
+	public function index(): void
+	{
+		$data['table_headers'] = get_giftcards_manage_table_headers();
+
+		echo view('giftcards/manage', $data);
+	}
+
+	/*
+	Returns Giftcards table data rows. This will be called with AJAX.
+	*/
+	public function search(): void
+	{
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
+
+		$giftcards = $this->giftcard->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->giftcard->get_found_rows($search);
+
+		$data_rows = [];
+		foreach($giftcards->getResult() as $giftcard)
+		{
+			$data_rows[] = get_giftcard_data_row($giftcard);
+		}
+
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
+	}
+
+	/*
+	Gives search suggestions based on what is being searched for
+	*/
+
+	public function suggest(): void
+	{
+		$suggestions = $this->giftcard->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), TRUE);
+
+		echo json_encode($suggestions);
+	}
+
+	public function suggest_search(): void
+	{
+		$suggestions = $this->giftcard->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));
+
+		echo json_encode($suggestions);
+	}
+
+	public function get_row(int $row_id): void
+	{
+		$data_row = get_giftcard_data_row($this->giftcard->get_info($row_id));
+
+		echo json_encode($data_row);
+	}
+
+	public function view(int $giftcard_id = -1): void	//TODO: Need to replace -1 with a constant
+	{
+		$giftcard_info = $this->giftcard->get_info($giftcard_id);
+
+		$data['selected_person_name'] = ($giftcard_id > 0 && isset($giftcard_info->person_id)) ? $giftcard_info->first_name . ' ' . $giftcard_info->last_name : '';
+		$data['selected_person_id'] = $giftcard_info->person_id;
+		if(config('OSPOS')->giftcard_number == 'random')
+		{
+			$data['giftcard_number'] = $giftcard_id > 0 ? $giftcard_info->giftcard_number : '';
+		}
+		else
+		{
+			$max_giftnumber = isset($this->giftcard->get_max_number()->giftcard_number) ? $this->Giftcard->get_max_number()->giftcard_number : 0;	//TODO: variable does not follow naming standard.
+			$data['giftcard_number'] = $giftcard_id > 0 ? $giftcard_info->giftcard_number : $max_giftnumber + 1;
+		}
+		$data['giftcard_id'] = $giftcard_id;
+		$data['giftcard_value'] = $giftcard_info->value;
+
+		echo view("giftcards/form", $data);
+	}
+
+	public function save(int $giftcard_id = -1): void	//TODO: Replace -1 with a constant
+	{
+		$giftcard_number = $this->request->getPost('giftcard_number', FILTER_SANITIZE_STRING);
+
+		if($giftcard_id == -1 && trim($giftcard_number) == '')
+		{
+			$giftcard_number = $this->giftcard->generate_unique_giftcard_name($this->request->getPost('giftcard_amount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		}
+
+		$giftcard_data = [
+			'record_time' => date('Y-m-d H:i:s'),
+			'giftcard_number' => $giftcard_number,
+			'value' => parse_decimals($this->request->getPost('giftcard_amount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'person_id' => $this->request->getPost('person_id') == '' ? NULL : $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT)
+		];
+
+		if($this->giftcard->save_value($giftcard_data, $giftcard_id))
+		{
+			//New giftcard
+			if($giftcard_id == -1)	//TODO: Constant needed
+			{
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Giftcards.successful_adding') . ' ' . $giftcard_data['giftcard_number'],
+					'id' => $giftcard_data['giftcard_id']
+				]);
+			}
+			else //Existing giftcard
+			{
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Giftcards.successful_updating') . ' ' . $giftcard_data['giftcard_number'],
+					'id' => $giftcard_id
+				]);
+			}
+		}
+		else //failure
+		{
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Giftcards.error_adding_updating') . ' ' . $giftcard_data['giftcard_number'],
+				'id' => -1
+			]);
+		}
+	}
+
+	/**
+	 * Function called in the view to check the giftcard.
+	 *
+	 * @return void
+	 */
+	public function ajax_check_number_giftcard(): void
+	{
+		$parsed_value = parse_decimals($this->request->getPost('giftcard_amount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		echo json_encode (['success' => $parsed_value !== FALSE, 'giftcard_amount' => to_currency_no_money($parsed_value)]);
+	}
+
+	public function delete(): void
+	{
+		$giftcards_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
+
+		if($this->giftcard->delete_list($giftcards_to_delete))
+		{
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Giftcards.successful_deleted') . ' ' . count($giftcards_to_delete).' '.lang('Giftcards.one_or_multiple')
+			]);
+		}
+		else
+		{
+			echo json_encode (['success' => FALSE, 'message' => lang('Giftcards.cannot_be_deleted')]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index 353e45156..2efdbeceb 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -1,72 +1,87 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
-class Home extends Secure_Controller 
+class Home extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct(NULL, NULL, 'home');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$this->load->view('home/home');
+		echo view('home/home');
 	}
 
-	public function logout()
+	public function logout(): void
 	{
-		$this->Employee->logout();
+		$this->employee->logout();
 	}
 
 	/*
 	Load "change employee password" form
 	*/
-	public function change_password($employee_id = -1)
+	public function change_password(int $employee_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$person_info = $this->Employee->get_info($employee_id);
+		$person_info = $this->employee->get_info($employee_id);
 		foreach(get_object_vars($person_info) as $property => $value)
 		{
-			$person_info->$property = $this->xss_clean($value);
+			$person_info->$property = $value;
 		}
 		$data['person_info'] = $person_info;
 
-		$this->load->view('home/form_change_password', $data);
+		echo view('home/form_change_password', $data);
 	}
 
 	/*
 	Change employee password
 	*/
-	public function save($employee_id = -1)
+	public function save(int $employee_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		if($this->input->post('current_password') != '' && $employee_id != -1)
+		if($this->request->getPost('current_password') != '' && $employee_id != -1)
 		{
-			if($this->Employee->check_password($this->input->post('username'), $this->input->post('current_password')))
+			if($this->employee->check_password($this->request->getPost('username', FILTER_SANITIZE_STRING), $this->request->getPost('current_password')))
 			{
-				$employee_data = array(
-					'username' => $this->input->post('username'),
-					'password' => password_hash($this->input->post('password'), PASSWORD_DEFAULT),
+				$employee_data = [
+					'username' => $this->request->getPost('username', FILTER_SANITIZE_STRING),
+					'password' => password_hash($this->request->getPost('password'), PASSWORD_DEFAULT),
 					'hash_version' => 2
-				);
+				];
 
-				if($this->Employee->change_password($employee_data, $employee_id))
+				if($this->employee->change_password($employee_data, $employee_id))
 				{
-					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('employees_successful_change_password'), 'id' => $employee_id));
+					echo json_encode ([
+						'success' => TRUE,
+						'message' => lang('Employees.successful_change_password'),
+						'id' => $employee_id
+					]);
 				}
 				else//failure
-				{
-					echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_unsuccessful_change_password'), 'id' => -1));
+				{//TODO: Replace -1 with constant
+					echo json_encode ([
+						'success' => FALSE,
+						'message' => lang('Employees.unsuccessful_change_password'),
+						'id' => -1
+					]);
 				}
 			}
 			else
-			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_current_password_invalid'), 'id' => -1));
+			{//TODO: Replace -1 with constant
+				echo json_encode ([
+					'success' => FALSE,
+					'message' => lang('Employees.current_password_invalid'),
+					'id' => -1
+				]);
 			}
 		}
 		else
-		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_current_password_invalid'), 'id' => -1));
+		{//TODO: Replace -1 with constant
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Employees.current_password_invalid'),
+				'id' => -1
+			]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Item_kits.php b/app/Controllers/Item_kits.php
index 3349a14f7..f82a50416 100644
--- a/app/Controllers/Item_kits.php
+++ b/app/Controllers/Item_kits.php
@@ -1,31 +1,51 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Libraries\Barcode_lib;
+
+use app\Models\Item;
+use app\Models\Item_kit;
+use app\Models\Item_kit_items;
+
+/**
+ *
+ *
+ * @property barcode_lib barcode_lib
+ *
+ * @property item item
+ * @property item_kit item_kit
+ * @property item_kit_items item_kit_items
+ *
+ */
 class Item_kits extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('item_kits');
+
+		$this->item = model('Item');
+		$this->item_kit = model('Item_kit');
+		$this->item_kit_items = model('Item_kit_items');
 	}
 	
-	/*
-	Add the total cost and retail price to a passed items kit retrieving the data from each singular item part of the kit
-	*/
-	private function _add_totals_to_item_kit($item_kit)
+	/**
+	 * Add the total cost and retail price to a passed item_kit retrieving the data from each singular item part of the kit
+	 */
+	private function _add_totals_to_item_kit(object $item_kit): object    //TODO: Hungarian notation
 	{
-		$kit_item_info = $this->Item->get_info(isset($item_kit->kit_item_id) ? $item_kit->kit_item_id : $item_kit->item_id);
+		$kit_item_info = $this->item->get_info($item_kit->kit_item_id ?? $item_kit->item_id);
 
 		$item_kit->total_cost_price = 0;
-		$item_kit->total_unit_price = (float)$kit_item_info->unit_price;
+		$item_kit->total_unit_price = $kit_item_info->unit_price;
 		$total_quantity = 0;
 
-		foreach($this->Item_kit_items->get_info($item_kit->item_kit_id) as $item_kit_item)
+		foreach($this->item_kit_items->get_info($item_kit->item_kit_id) as $item_kit_item)
 		{
-			$item_info = $this->Item->get_info($item_kit_item['item_id']);
+			$item_info = $this->item->get_info($item_kit_item['item_id']);
 			foreach(get_object_vars($item_info) as $property => $value)
 			{
-				$item_info->$property = $this->xss_clean($value);
+				$item_info->$property = $value;
 			}
 
 			$item_kit->total_cost_price += $item_info->cost_price * $item_kit_item['quantity'];
@@ -37,85 +57,87 @@ class Item_kits extends Secure_Controller
 			}
 		}
 
-		$discount_fraction = bcdiv($item_kit->kit_discount, 100);
+		$discount_fraction = bcdiv($item_kit->kit_discount, '100');
 
 		$item_kit->total_unit_price = $item_kit->total_unit_price - round(($item_kit->kit_discount_type == PERCENT)?bcmul($item_kit->total_unit_price, $discount_fraction): $item_kit->kit_discount, totals_decimals(), PHP_ROUND_HALF_UP);
 
 		return $item_kit;
 	}
 	
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_item_kits_manage_table_headers());
+		$data['table_headers'] = get_item_kits_manage_table_headers();
 
-		$this->load->view('item_kits/manage', $data);
+		echo view('item_kits/manage', $data);
 	}
 
-	/*
-	Returns Item kits table data rows. This will be called with AJAX.
-	*/
-	public function search()
+	/**
+	 * Returns Item_kit table data rows. This will be called with AJAX.
+	 */
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$item_kits = $this->Item_kit->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Item_kit->get_found_rows($search);
+		$item_kits = $this->item_kit->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->item_kit->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($item_kits->result() as $item_kit)
+		$data_rows = [];
+		foreach($item_kits->getResult() as $item_kit)
 		{
-			// calculate the total cost and retail price of the Kit so it can be printed out in the manage table
+			// calculate the total cost and retail price of the Kit, so it can be printed out in the manage table
 			$item_kit = $this->_add_totals_to_item_kit($item_kit);
-			$data_rows[] = $this->xss_clean(get_item_kit_data_row($item_kit));
+			$data_rows[] = get_item_kit_data_row($item_kit);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function suggest_search()
+	public function suggest_search(): void
 	{
-		$suggestions = $this->xss_clean($this->Item_kit->get_search_suggestions($this->input->post('term')));
+		$suggestions = $this->item_kit->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		// calculate the total cost and retail price of the Kit so it can be added to the table refresh
-		$item_kit = $this->_add_totals_to_item_kit($this->Item_kit->get_info($row_id));
+		// calculate the total cost and retail price of the Kit, so it can be added to the table refresh
+		$item_kit = $this->_add_totals_to_item_kit($this->item_kit->get_info($row_id));
 
 		echo json_encode(get_item_kit_data_row($item_kit));
 	}
 	
-	public function view($item_kit_id = -1)
+	public function view(int $item_kit_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$info = $this->Item_kit->get_info($item_kit_id);
+		$info = $this->item_kit->get_info($item_kit_id);
 
-		if($item_kit_id == -1)
+		if($item_kit_id == -1)	//TODO: Replace -1 with a constant
 		{
 			$info->price_option = '0';
 			$info->print_option = PRINT_ALL;
 			$info->kit_item_id = 0;
 			$info->item_number = '';
 		}
+
 		foreach(get_object_vars($info) as $property => $value)
 		{
-			$info->$property = $this->xss_clean($value);
+			$info->$property = $value;
 		}
 
 		$data['item_kit_info']  = $info;
 
-		$items = array();
-		foreach($this->Item_kit_items->get_info($item_kit_id) as $item_kit_item)
+		$items = [];
+
+		foreach($this->item_kit_items->get_info($item_kit_id) as $item_kit_item)
 		{
-			$item['kit_sequence'] = $this->xss_clean($item_kit_item['kit_sequence']);
-			$item['name'] = $this->xss_clean($this->Item->get_info($item_kit_item['item_id'])->name);
-			$item['item_id'] = $this->xss_clean($item_kit_item['item_id']);
-			$item['quantity'] = $this->xss_clean($item_kit_item['quantity']);
+			$item['kit_sequence'] = $item_kit_item['kit_sequence'];
+			$item['name'] = $this->item->get_info($item_kit_item['item_id'])->name;
+			$item['item_id'] = $item_kit_item['item_id'];
+			$item['quantity'] = $item_kit_item['quantity'];
 
 			$items[] = $item;
 		}
@@ -125,109 +147,120 @@ class Item_kits extends Secure_Controller
 		$data['selected_kit_item_id'] = $info->kit_item_id;
 		$data['selected_kit_item'] = ($item_kit_id > 0 && isset($info->kit_item_id)) ? $info->item_name : '';
 
-		$this->load->view("item_kits/form", $data);
+		echo view("item_kits/form", $data);
 	}
 	
-	public function save($item_kit_id = -1)
+	public function save(int $item_kit_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$item_kit_data = array(
-			'name' => $this->input->post('name'),
-			'item_kit_number' => $this->input->post('item_kit_number'),
-			'item_id' => $this->input->post('kit_item_id'),
-			'kit_discount' => $this->input->post('kit_discount'),
-			'kit_discount_type' => $this->input->post('kit_discount_type') == NULL ? PERCENT : $this->input->post('kit_discount_type'),
-			'price_option' => $this->input->post('price_option'),
-			'print_option' => $this->input->post('print_option'),
-			'description' => $this->input->post('description')
-		);
+		$item_kit_data = [
+			'name' => $this->request->getPost('name', FILTER_SANITIZE_STRING),
+			'item_kit_number' => $this->request->getPost('item_kit_number', FILTER_SANITIZE_STRING),
+			'item_id' => $this->request->getPost('kit_item_id', FILTER_SANITIZE_NUMBER_INT),
+			'kit_discount' => $this->request->getPost('kit_discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+			'kit_discount_type' => $this->request->getPost('kit_discount_type') == NULL ? PERCENT : $this->request->getPost('kit_discount_type', FILTER_SANITIZE_NUMBER_INT),
+			'price_option' => $this->request->getPost('price_option', FILTER_SANITIZE_NUMBER_INT),
+			'print_option' => $this->request->getPost('print_option', FILTER_SANITIZE_NUMBER_INT),
+			'description' => $this->request->getPost('description', FILTER_SANITIZE_STRING)
+		];
 		
-		if($this->Item_kit->save($item_kit_data, $item_kit_id))
+		if($this->item_kit->save_value($item_kit_data, $item_kit_id))
 		{
 			$new_item = FALSE;
 			//New item kit
-			if($item_kit_id == -1)
+			if($item_kit_id == -1)	//TODO: Replace -1 with a constant
 			{
 				$item_kit_id = $item_kit_data['item_kit_id'];
 				$new_item = TRUE;
 			}
 
-			if($this->input->post('item_kit_qty') != NULL)
+			if($this->request->getPost('item_kit_qty', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) != NULL)
 			{
-				$item_kit_items = array();
-				foreach($this->input->post('item_kit_qty') as $item_id => $quantity)
+				$item_kit_items = [];
+				foreach($this->request->getPost('item_kit_qty', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) as $item_id => $quantity)
 				{
-					$seq = $this->input->post('item_kit_seq[' . $item_id . ']');
-					$item_kit_items[] = array(
+					$seq = $this->request->getPost("item_kit_seq[$item_id]", FILTER_SANITIZE_NUMBER_INT);
+					$item_kit_items[] = [
 						'item_id' => $item_id,
 						'quantity' => $quantity,
 						'kit_sequence' => $seq
-					);
+					];
 				}
 
 			}
 
-			$success = $this->Item_kit_items->save($item_kit_items, $item_kit_id);
-
-			$item_kit_data = $this->xss_clean($item_kit_data);
+			$success = $this->item_kit_items->save_value($item_kit_items, $item_kit_id);
 
 			if($new_item)
 			{
-				echo json_encode(array('success' => $success,
-					'message' => $this->lang->line('item_kits_successful_adding').' '.$item_kit_data['name'], 'id' => $item_kit_id));
+				echo json_encode ([
+					'success' => $success,
+					'message' => lang('Item_kits.successful_adding').' '.$item_kit_data['name'],
+					'id' => $item_kit_id
+				]);
 
 			}
 			else
 			{
-				echo json_encode(array('success' => $success,
-					'message' => $this->lang->line('item_kits_successful_updating').' '.$item_kit_data['name'], 'id' => $item_kit_id));
+				echo json_encode ([
+					'success' => $success,
+					'message' => lang('Item_kits.successful_updating').' '.$item_kit_data['name'],
+					'id' => $item_kit_id
+				]);
 			}
 		}
 		else//failure
 		{
-			$item_kit_data = $this->xss_clean($item_kit_data);
-
-			echo json_encode(array('success' => FALSE, 
-								'message' => $this->lang->line('item_kits_error_adding_updating').' '.$item_kit_data['name'], 'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Item_kits.error_adding_updating') . ' ' . $item_kit_data['name'],
+				'id' => -1	//TODO: Replace -1 with a constant
+			]);
 		}
 	}
 	
-	public function delete()
+	public function delete(): void
 	{
-		$item_kits_to_delete = $this->xss_clean($this->input->post('ids'));
+		$item_kits_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_STRING);
 
-		if($this->Item_kit->delete_list($item_kits_to_delete))
+		if($this->item_kit->delete_list($item_kits_to_delete))
 		{
-			echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('item_kits_successful_deleted').' '.count($item_kits_to_delete).' '.$this->lang->line('item_kits_one_or_multiple')));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Item_kits.successful_deleted') . ' ' . count($item_kits_to_delete) . ' ' . lang('Item_kits.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE,
-								'message' => $this->lang->line('item_kits_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Item_kits.cannot_be_deleted')]);
 		}
 	}
 
-	public function check_item_number()
+	public function check_item_number(): void
 	{
-		$exists = $this->Item_kit->item_number_exists($this->input->post('item_kit_number'), $this->input->post('item_kit_id'));
+		$exists = $this->item_kit->item_number_exists($this->request->getPost('item_kit_number', FILTER_SANITIZE_STRING), $this->request->getPost('item_kit_id', FILTER_SANITIZE_NUMBER_INT));
 		echo !$exists ? 'true' : 'false';
 	}
 	
-	public function generate_barcodes($item_kit_ids)
+	public function generate_barcodes(string $item_kit_ids): void
 	{
-		$this->load->library('barcode_lib');
-		$result = array();
+		$this->barcode_lib = new Barcode_lib();
+		$result = [];
 
 		$item_kit_ids = explode(':', $item_kit_ids);
 		foreach($item_kit_ids as $item_kid_id)
 		{		
-			// calculate the total cost and retail price of the Kit so it can be added to the barcode text at the bottom
-			$item_kit = $this->_add_totals_to_item_kit($this->Item_kit->get_info($item_kid_id));
+			// calculate the total cost and retail price of the Kit, so it can be added to the barcode text at the bottom
+			$item_kit = $this->_add_totals_to_item_kit($this->item_kit->get_info($item_kid_id));
 			
 			$item_kid_id = 'KIT '. urldecode($item_kid_id);
 
-			$result[] = array('name' => $item_kit->name, 'item_id' => $item_kid_id, 'item_number' => $item_kid_id,
-							'cost_price' => $item_kit->total_cost_price, 'unit_price' => $item_kit->total_unit_price);
+			$result[] = [
+				'name' => $item_kit->name,
+				'item_id' => $item_kid_id,
+				'item_number' => $item_kid_id,
+				'cost_price' => $item_kit->total_cost_price,
+				'unit_price' => $item_kit->total_unit_price
+			];
 		}
 
 		$data['items'] = $result;
@@ -241,7 +274,6 @@ class Item_kits extends Secure_Controller
 		$data['barcode_config'] = $barcode_config;
 
 		// display barcodes
-		$this->load->view("barcodes/barcode_sheet", $data);
+		echo view("barcodes/barcode_sheet", $data);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Items.php b/app/Controllers/Items.php
index fc216d1e6..7a1c4ab13 100644
--- a/app/Controllers/Items.php
+++ b/app/Controllers/Items.php
@@ -1,55 +1,103 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Controllers;
+
+use app\Libraries\Barcode_lib;
+use app\Libraries\Item_lib;
+
+use app\Models\Attribute;
+use app\Models\Inventory;
+use app\Models\Item;
+use app\Models\Item_kit;
+use app\Models\Item_quantity;
+use app\Models\Item_taxes;
+use app\Models\Stock_location;
+use app\Models\Supplier;
+use app\Models\Tax_category;
+
+use Config\Services;
+use CodeIgniter\Files\File;
+use CodeIgniter\Images\Image;
+use ReflectionException;
 
 require_once('Secure_Controller.php');
 
+/**
+ * @property image image
+ * @property barcode_lib barcode_lib
+ * @property item_lib item_lib
+ * @property attribute attribute
+ * @property inventory inventory
+ * @property item item
+ * @property item_kit item_kit
+ * @property item_quantity item_quantity
+ * @property item_taxes item_taxes
+ * @property stock_location stock_location
+ * @property supplier supplier
+ * @property tax_category tax_category
+ */
 class Items extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('items');
 
-		$this->load->library('item_lib');
+		$this->image = Services::image();
+
+		$this->barcode_lib = new Barcode_lib();
+		$this->item_lib = new Item_lib();
+
+		$this->attribute = model('Attribute');
+		$this->inventory = model('Inventory');
+		$this->item = model('Item');
+		$this->item_kit = model('Item_kit');
+		$this->item_quantity = model('Item_quantity');
+		$this->item_taxes = model('Item_taxes');
+		$this->stock_location = model('Stock_location');
+		$this->supplier = model('Supplier');
+		$this->tax_category = model('Tax_category');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$this->session->set_userdata('allow_temp_items', 0);
+		$this->session->set('allow_temp_items', 0);
 
-		$data['table_headers'] = $this->xss_clean(get_items_manage_table_headers());
-		$data['stock_location'] = $this->xss_clean($this->item_lib->get_item_location());
-		$data['stock_locations'] = $this->xss_clean($this->Stock_location->get_allowed_locations());
+		$data['table_headers'] = get_items_manage_table_headers();
+		$data['stock_location'] = $this->item_lib->get_item_location();
+		$data['stock_locations'] = $this->stock_location->get_allowed_locations();
 
 		//Filters that will be loaded in the multiselect dropdown
-		$data['filters'] = array(
-			'empty_upc' => $this->lang->line('items_empty_upc_items'),
-			'low_inventory' => $this->lang->line('items_low_inventory_items'),
-			'is_serialized' => $this->lang->line('items_serialized_items'),
-			'no_description' => $this->lang->line('items_no_description_items'),
-			'search_custom' => $this->lang->line('items_search_attributes'),
-			'is_deleted' => $this->lang->line('items_is_deleted'),
-			'temporary' => $this->lang->line('items_temp'));
+		$data['filters'] = [
+			'empty_upc' => lang('Items.empty_upc_items'),
+			'low_inventory' => lang('Items.low_inventory_items'),
+			'is_serialized' => lang('Items.serialized_items'),
+			'no_description' => lang('Items.no_description_items'),
+			'search_custom' => lang('Items.search_attributes'),
+			'is_deleted' => lang('Items.is_deleted'),
+			'temporary' => lang('Items.temp')
+		];
 
-		$this->load->view('items/manage', $data);
+		echo view('items/manage', $data);
 	}
 
 	/*
 	 * Returns Items table data rows. This will be called with AJAX.
 	 */
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort = $this->input->get('sort');
-		$order = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$this->item_lib->set_item_location($this->input->get('stock_location'));
+		$this->item_lib->set_item_location($this->request->getGet('stock_location', FILTER_SANITIZE_NUMBER_INT));
 
-		$definition_names = $this->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+		$definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
 
-		$filters = array(
-			'start_date' => $this->input->get('start_date'),
-			'end_date' => $this->input->get('end_date'),
+		$filters = [
+			'start_date' => $this->request->getGet('start_date', FILTER_SANITIZE_STRING),
+			'end_date' => $this->request->getGet('end_date', FILTER_SANITIZE_STRING),
 			'stock_location_id' => $this->item_lib->get_item_location(),
 			'empty_upc' => FALSE,
 			'low_inventory' => FALSE,
@@ -58,18 +106,19 @@ class Items extends Secure_Controller
 			'search_custom' => FALSE,
 			'is_deleted' => FALSE,
 			'temporary' => FALSE,
-			'definition_ids' => array_keys($definition_names));
+			'definition_ids' => array_keys($definition_names)
+		];
 
 		//Check if any filter is set in the multiselect dropdown
-		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$filledup = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_STRING), TRUE);	//TODO: filled up does not meet naming standards
 		$filters = array_merge($filters, $filledup);
-		$items = $this->Item->search($search, $filters, $limit, $offset, $sort, $order);
-		$total_rows = $this->Item->get_found_rows($search, $filters);
+		$items = $this->item->search($search, $filters, $limit, $offset, $sort, $order);
+		$total_rows = $this->item->get_found_rows($search, $filters);
 		$data_rows = [];
 
-		foreach($items->result() as $item)
+		foreach($items->getResult() as $item)
 		{
-			$data_rows[] = $this->xss_clean(get_item_data_row($item));
+			$data_rows[] = get_item_data_row($item);
 
 			if($item->pic_filename !== NULL)
 			{
@@ -77,13 +126,17 @@ class Items extends Secure_Controller
 			}
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function pic_thumb($pic_filename)
+	/**
+	 * Processes thumbnail of image.  Called via the tabular_helper
+	 * @param $pic_filename
+	 * @return void
+	 */
+	public function pic_thumb($pic_filename): void	//TODO: https://github.com/opensourcepos/opensourcepos/issues/3453
 	{
-		$this->load->helper('file');
-		$this->load->library('image_lib');
+		helper('file');
 
 		$file_extension = pathinfo($pic_filename, PATHINFO_EXTENSION);
 		$images = glob('./uploads/item_pics/' . $pic_filename);
@@ -93,7 +146,7 @@ class Items extends Secure_Controller
 		if(sizeof($images) > 0)
 		{
 			$image_path = $images[0];
-			$thumb_path = $base_path . $this->image_lib->thumb_marker . '.' . $file_extension;
+			$thumb_path = $base_path . $this->image->thumb_marker . '.' . $file_extension;
 
 			if(sizeof($images) < 2 && !file_exists($thumb_path))
 			{
@@ -104,87 +157,88 @@ class Items extends Secure_Controller
 				$config['width'] = 52;
 				$config['height'] = 32;
 
-				$this->image_lib->initialize($config);
-				$this->image_lib->resize();
+				$this->image->initialize($config);
+				$this->image->resize();
 
-				$thumb_path = $this->image_lib->full_dst_path;
+				$thumb_path = $this->image->full_dst_path;
 			}
-			$this->output->set_content_type(get_mime_by_extension($thumb_path));
-			$this->output->set_output(file_get_contents($thumb_path));
+
+			$this->response->setContentType(mime_content_type($thumb_path));
+			$this->response->setBody(file_get_contents($thumb_path));
 		}
 	}
 
 	/*
 	 Gives search suggestions based on what is being searched for
 	 */
-	public function suggest_search()
+	public function suggest_search(): void
 	{
-		$options = array(
-			'search_custom' => $this->input->post('search_custom'),
-			'is_deleted' => $this->input->post('is_deleted') !== NULL);
-		$suggestions = $this->xss_clean($this->Item->get_search_suggestions($this->input->post_get('term'),	$options, FALSE));
+		$options = [
+			'search_custom' => $this->request->getPost('search_custom'),
+			'is_deleted' => $this->request->getPost('is_deleted') !== NULL
+		];
+
+		$suggestions = $this->item->get_search_suggestions($this->request->getPostGet('term', FILTER_SANITIZE_STRING), $options, FALSE);
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest()
+	public function suggest(): void
 	{
-		$suggestions = $this->xss_clean($this->Item->get_search_suggestions($this->input->post_get('term'),
-			array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE));
+		$suggestions = $this->item->get_search_suggestions($this->request->getPostGet('term', FILTER_SANITIZE_STRING), ['search_custom' => FALSE, 'is_deleted' => FALSE], TRUE);
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest_low_sell()
+	public function suggest_low_sell(): void
 	{
-		$suggestions = $this->xss_clean($this->Item->get_low_sell_suggestions($this->input->post_get('name')));
+		$suggestions = $this->item->get_low_sell_suggestions($this->request->getPostGet('name', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest_kits()
+	public function suggest_kits(): void
 	{
-		$suggestions = $this->xss_clean($this->Item->get_kit_search_suggestions($this->input->post_get('term'),
-			array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE));
+		$suggestions = $this->item->get_kit_search_suggestions($this->request->getPostGet('term', FILTER_SANITIZE_STRING), ['search_custom' => FALSE, 'is_deleted' => FALSE], TRUE);
 
 		echo json_encode($suggestions);
 	}
 
-	/*
-	 Gives search suggestions based on what is being searched for
+	/**
+	 * Gives search suggestions based on what is being searched for. Called from the view.
 	 */
-	public function suggest_category()
+	public function suggest_category(): void
 	{
-		$suggestions = $this->xss_clean($this->Item->get_category_suggestions($this->input->get('term')));
+		$suggestions = $this->item->get_category_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	/*
-	 Gives search suggestions based on what is being searched for
+	/**
+	 * Gives search suggestions based on what is being searched for.  Called from the view.
 	 */
-	public function suggest_location()
+	public function suggest_location(): void
 	{
-		$suggestions = $this->xss_clean($this->Item->get_location_suggestions($this->input->get('term')));
+		$suggestions = $this->item->get_location_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	public function get_row($item_ids)
+	public function get_row(string $item_ids): void	//TODO: It's possible an array would be better.
 	{
-		$item_infos = $this->Item->get_multiple_info(explode(':', $item_ids), $this->item_lib->get_item_location());
+		$item_infos = $this->item->get_multiple_info(explode(':', $item_ids), $this->item_lib->get_item_location());
 
 		$result = [];
 
-		foreach($item_infos->result() as $item_info)
+		foreach($item_infos->getResult() as $item_info)
 		{
-			$result[$item_info->item_id] = $this->xss_clean(get_item_data_row($item_info));
+			$result[$item_info->item_id] = get_item_data_row($item_info);
 		}
 
 		echo json_encode($result);
 	}
 
-	public function view($item_id = NEW_ITEM)
+	public function view(int $item_id = NEW_ITEM): void	//TODO: Super long function.  Perhaps we need to refactor out some methods.
 	{
 		if($item_id === NEW_ITEM)
 		{
@@ -192,24 +246,24 @@ class Items extends Secure_Controller
 		}
 
 		//allow_temp_items is set in the index function of items.php or sales.php
-		$data['allow_temp_item'] = $this->session->userdata('allow_temp_items');
-		$data['item_tax_info'] = $this->xss_clean($this->Item_taxes->get_info($item_id));
+		$data['allow_temp_item'] = $this->session->get('allow_temp_items');
+		$data['item_tax_info'] = $this->item_taxes->get_info($item_id);
 		$data['default_tax_1_rate'] = '';
 		$data['default_tax_2_rate'] = '';
-		$data['item_kit_disabled'] = !$this->Employee->has_grant('item_kits', $this->Employee->get_logged_in_employee_info()->person_id);
-		$data['definition_values'] = $this->Attribute->get_attributes_by_item($item_id);
-		$data['definition_names'] = $this->Attribute->get_definition_names();
+		$data['item_kit_disabled'] = !$this->employee->has_grant('item_kits', $this->employee->get_logged_in_employee_info()->person_id);
+		$data['definition_values'] = $this->attribute->get_attributes_by_item($item_id);
+		$data['definition_names'] = $this->attribute->get_definition_names();
 
 		foreach($data['definition_values'] as $definition_id => $definition)
 		{
 			unset($data['definition_names'][$definition_id]);
 		}
 
-		$item_info = $this->Item->get_info($item_id);
+		$item_info = $this->item->get_info($item_id);
 
 		foreach(get_object_vars($item_info) as $property => $value)
 		{
-			$item_info->$property = $this->xss_clean($value);
+			$item_info->$property = $value;
 		}
 
 		if($data['allow_temp_item'] === 1)
@@ -230,15 +284,15 @@ class Items extends Secure_Controller
 			}
 		}
 
-		$use_destination_based_tax = (boolean)$this->config->item('use_destination_based_tax');
-		$data['include_hsn'] = $this->config->item('include_hsn') === '1';
-		$data['category_dropdown'] = $this->config->item('category_dropdown');
+		$use_destination_based_tax = (boolean)config('OSPOS')->use_destination_based_tax;
+		$data['include_hsn'] = config('OSPOS')->include_hsn === '1';
+		$data['category_dropdown'] = config('OSPOS')->category_dropdown;
 
 		if($data['category_dropdown'] === '1')
 		{
-			$categories 		= array('' => $this->lang->line('items_none'));
-			$category_options 	= $this->Attribute->get_definition_values(CATEGORY_DEFINITION_ID);
-			$category_options	= array_combine($category_options,$category_options);	//Overwrite indexes with values for saving in items table instead of attributes
+			$categories = ['' => lang('Items.none')];
+			$category_options = $this->attribute->get_definition_values(CATEGORY_DEFINITION_ID);
+			$category_options = array_combine($category_options,$category_options);	//Overwrite indexes with values for saving in items table instead of attributes
 			$data['categories'] = array_merge($categories,$category_options);
 
 			$data['selected_category'] = $item_info->category;
@@ -246,8 +300,8 @@ class Items extends Secure_Controller
 
 		if($item_id === NEW_ITEM)
 		{
-			$data['default_tax_1_rate'] = $this->config->item('default_tax_1_rate');
-			$data['default_tax_2_rate'] = $this->config->item('default_tax_2_rate');
+			$data['default_tax_1_rate'] = config('OSPOS')->default_tax_1_rate;
+			$data['default_tax_2_rate'] = config('OSPOS')->default_tax_2_rate;
 
 			$item_info->receiving_quantity = 1;
 			$item_info->reorder_level = 1;
@@ -256,12 +310,11 @@ class Items extends Secure_Controller
 			$item_info->stock_type = HAS_STOCK;
 			$item_info->tax_category_id = NULL;
 			$item_info->qty_per_pack = 1;
-			$item_info->pack_name = $this->lang->line('items_default_pack_name');
-			$data['hsn_code'] = '';
+			$item_info->pack_name = lang('Items.default_pack_name');
 
 			if($use_destination_based_tax)
 			{
-				$item_info->tax_category_id = $this->config->item('default_tax_category');
+				$item_info->tax_category_id = config('OSPOS')->default_tax_category;
 			}
 		}
 
@@ -269,21 +322,22 @@ class Items extends Secure_Controller
 			$data['item_kit_disabled']
 			&& $item_info->item_type == ITEM_KIT
 			&& !$data['allow_temp_item']
-			&& !($this->config->item('derive_sale_quantity') === '1'));
+			&& !(config('OSPOS')->derive_sale_quantity === '1')
+		);
 
 		$data['item_info'] = $item_info;
 
-		$suppliers = array('' => $this->lang->line('items_none'));
+		$suppliers = ['' => lang('Items.none')];
 
-		foreach($this->Supplier->get_all()->result_array() as $row)
+		foreach($this->supplier->get_all()->getResultArray() as $row)
 		{
-			$suppliers[$this->xss_clean($row['person_id'])] = $this->xss_clean($row['company_name']);
+			$suppliers[$row['person_id']] = $row['company_name'];
 		}
 
 		$data['suppliers'] = $suppliers;
 		$data['selected_supplier'] = $item_info->supplier_id;
 
-		if($data['include_hsn'])
+		if($data['include_hsn'])	//TODO: Transform this to ternary notation
 		{
 			$data['hsn_code'] = $item_info->hsn_code;
 		}
@@ -297,16 +351,16 @@ class Items extends Secure_Controller
 			$data['use_destination_based_tax'] = TRUE;
 			$tax_categories = [];
 
-			foreach($this->Tax_category->get_all()->result_array() as $row)
+			foreach($this->tax_category->get_all()->getResultArray() as $row)
 			{
-				$tax_categories[$this->xss_clean($row['tax_category_id'])] = $this->xss_clean($row['tax_category']);
+				$tax_categories[$row['tax_category_id']] = $row['tax_category'];
 			}
 
 			$tax_category = '';
 
 			if ($item_info->tax_category_id !== NULL)
 			{
-				$tax_category_info=$this->Tax_category->get_info($item_info->tax_category_id);
+				$tax_category_info=$this->tax_category->get_info($item_info->tax_category_id);
 				$tax_category= $tax_category_info->tax_category;
 			}
 
@@ -334,15 +388,13 @@ class Items extends Secure_Controller
 		}
 
 		$data['image_path']	= sizeof($images) > 0 ? base_url($images[0]) : '';
-		$stock_locations	= $this->Stock_location->get_undeleted_all()->result_array();
+		$stock_locations	= $this->stock_location->get_undeleted_all()->getResultArray();
 
 		foreach($stock_locations as $location)
 		{
-			$location = $this->xss_clean($location);
-
-			$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
+			$quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity;
 			$quantity = ($item_id === NEW_ITEM) ? 0 : $quantity;
-			$location_array[$location['location_id']] = array('location_name' => $location['location_name'], 'quantity' => $quantity);
+			$location_array[$location['location_id']] = ['location_name' => $location['location_name'], 'quantity' => $quantity];
 			$data['stock_locations'] = $location_array;
 		}
 
@@ -350,105 +402,99 @@ class Items extends Secure_Controller
 
 		if($item_id !== NEW_ITEM && $item_info->item_id !== $item_info->low_sell_item_id)
 		{
-			$low_sell_item_info = $this->Item->get_info($item_info->low_sell_item_id);
-			$data['selected_low_sell_item'] = implode(NAME_SEPARATOR, array($low_sell_item_info->name, $low_sell_item_info->pack_name));
+			$low_sell_item_info = $this->item->get_info($item_info->low_sell_item_id);
+			$data['selected_low_sell_item'] = implode(NAME_SEPARATOR, [$low_sell_item_info->name, $low_sell_item_info->pack_name]);
 		}
 		else
 		{
 			$data['selected_low_sell_item'] = '';
 		}
 
-		$this->load->view('items/form', $data);
+		echo view('items/form', $data);
 	}
 
-	public function inventory($item_id = NEW_ITEM)
+	public function inventory(int $item_id = NEW_ITEM): void
 	{
-		$item_info = $this->Item->get_info($item_id);
+		$item_info = $this->item->get_info($item_id);	//TODO: Duplicate code
 
 		foreach(get_object_vars($item_info) as $property => $value)
 		{
-			$item_info->$property = $this->xss_clean($value);
+			$item_info->$property = $value;
 		}
 
 		$data['item_info'] = $item_info;
 		$data['stock_locations'] = [];
-		$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
+		$stock_locations = $this->stock_location->get_undeleted_all()->getResultArray();
 
 		foreach($stock_locations as $location)
 		{
-			$location = $this->xss_clean($location);
-			$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
+			$quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity;
 
 			$data['stock_locations'][$location['location_id']] = $location['location_name'];
 			$data['item_quantities'][$location['location_id']] = $quantity;
 		}
 
-		$this->load->view('items/form_inventory', $data);
+		echo view('items/form_inventory', $data);
 	}
 
-	public function count_details($item_id = NEW_ITEM)
+	public function count_details(int $item_id = NEW_ITEM): void
 	{
-		$item_info = $this->Item->get_info($item_id);
+		$item_info = $this->item->get_info($item_id);	//TODO: Duplicate code
 
 		foreach(get_object_vars($item_info) as $property => $value)
 		{
-			$item_info->$property = $this->xss_clean($value);
+			$item_info->$property = $value;
 		}
 
 		$data['item_info'] = $item_info;
 		$data['stock_locations'] = [];
-		$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
+		$stock_locations = $this->stock_location->get_undeleted_all()->getResultArray();
 
 		foreach($stock_locations as $location)
 		{
-			$location = $this->xss_clean($location);
-			$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
+			$quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity;
 
 			$data['stock_locations'][$location['location_id']] = $location['location_name'];
 			$data['item_quantities'][$location['location_id']] = $quantity;
 		}
 
-		$this->load->view('items/form_count_details', $data);
+		echo view('items/form_count_details', $data);
 	}
 
-	public function generate_barcodes($item_ids)
+	public function generate_barcodes(string $item_ids): void	//TODO: Passing these through as a string instead of an array limits the contents of the item_ids
 	{
-		$this->load->library('barcode_lib');
-
 		$item_ids = explode(':', $item_ids);
-		$result = $this->Item->get_multiple_info($item_ids, $this->item_lib->get_item_location())->result_array();
+		$result = $this->item->get_multiple_info($item_ids, $this->item_lib->get_item_location())->getResultArray();
 		$config = $this->barcode_lib->get_barcode_config();
 
 		$data['barcode_config'] = $config;
 
 		foreach($result as &$item)
 		{
-			$item = $this->xss_clean($item);
-
-			if(empty($item['item_number']) && $this->config->item('barcode_generate_if_empty'))
+			if(empty($item['item_number']) && config('OSPOS')->barcode_generate_if_empty)
 			{
 				$barcode_instance = Barcode_lib::barcode_instance($item, $config);
 				$item['item_number'] = $barcode_instance->getData();
-				$save_item = array('item_number' => $item['item_number']);
+				$save_item = ['item_number' => $item['item_number']];
 
-				$this->Item->save($save_item, $item['item_id']);
+				$this->item->save_value($save_item, $item['item_id']);
 			}
 		}
 		$data['items'] = $result;
 
-		$this->load->view('barcodes/barcode_sheet', $data);
+		echo view('barcodes/barcode_sheet', $data);
 	}
 
-	public function attributes($item_id = NEW_ITEM)
+	public function attributes(int $item_id = NEW_ITEM): void
 	{
 		$data['item_id'] = $item_id;
-		$definition_ids = json_decode($this->input->post('definition_ids'), TRUE);
-		$data['definition_values'] = $this->Attribute->get_attributes_by_item($item_id) + $this->Attribute->get_values_by_definitions($definition_ids);
-		$data['definition_names'] = $this->Attribute->get_definition_names();
+		$definition_ids = json_decode($this->request->getPost('definition_ids', FILTER_SANITIZE_STRING), TRUE);
+		$data['definition_values'] = $this->attribute->get_attributes_by_item($item_id) + $this->attribute->get_values_by_definitions($definition_ids);
+		$data['definition_names'] = $this->attribute->get_definition_names();
 
 		foreach($data['definition_values'] as $definition_id => $definition_value)
 		{
-			$attribute_value = $this->Attribute->get_attribute_value($item_id, $definition_id);
+			$attribute_value = $this->attribute->get_attribute_value($item_id, $definition_id);
 			$attribute_id = (empty($attribute_value) || empty($attribute_value->attribute_id)) ? NULL : $attribute_value->attribute_id;
 			$values = &$data['definition_values'][$definition_id];
 			$values['attribute_id'] = $attribute_id;
@@ -457,8 +503,8 @@ class Items extends Secure_Controller
 
 			if ($definition_value['definition_type'] === DROPDOWN)
 			{
-				$values['values'] = $this->Attribute->get_definition_values($definition_id);
-				$link_value = $this->Attribute->get_link_value($item_id, $definition_id);
+				$values['values'] = $this->attribute->get_definition_values($definition_id);
+				$link_value = $this->attribute->get_link_value($item_id, $definition_id);
 				$values['selected_value'] = (empty($link_value)) ? '' : $link_value->attribute_id;
 			}
 
@@ -470,68 +516,72 @@ class Items extends Secure_Controller
 			unset($data['definition_names'][$definition_id]);
 		}
 
-		$this->load->view('attributes/item', $data);
+		echo view('attributes/item', $data);
 	}
 
-	public function bulk_edit()
+	public function bulk_edit(): void	//TODO: This function may not be called in the code. Need to confirm
 	{
-		$suppliers = array('' => $this->lang->line('items_none'));
+		$suppliers = ['' => lang('Items.none')];
 
-		foreach($this->Supplier->get_all()->result_array() as $row)
+		foreach($this->supplier->get_all()->getResultArray() as $row)
 		{
-			$row = $this->xss_clean($row);
 			$suppliers[$row['person_id']] = $row['company_name'];
 		}
 
 		$data['suppliers'] = $suppliers;
-		$data['allow_alt_description_choices'] = array(
-			'' => $this->lang->line('items_do_nothing'),
-			1  => $this->lang->line('items_change_all_to_allow_alt_desc'),
-			0  => $this->lang->line('items_change_all_to_not_allow_allow_desc'));
+		$data['allow_alt_description_choices'] = [
+			'' => lang('Items.do_nothing'),
+			1  => lang('Items.change_all_to_allow_alt_desc'),
+			0  => lang('Items.change_all_to_not_allow_allow_desc')
+		];
 
-		$data['serialization_choices'] = array(
-			'' => $this->lang->line('items_do_nothing'),
-			1  => $this->lang->line('items_change_all_to_serialized'),
-			0  => $this->lang->line('items_change_all_to_unserialized'));
+		$data['serialization_choices'] = [
+			'' => lang('Items.do_nothing'),
+			1  => lang('Items.change_all_to_serialized'),
+			0  => lang('Items.change_all_to_unserialized')
+		];
 
-		$this->load->view('items/form_bulk', $data);
+		echo view('items/form_bulk', $data);
 	}
 
-	public function save($item_id = NEW_ITEM)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save(int $item_id = NEW_ITEM): void
 	{
-		$upload_success = $this->handle_image_upload();
-		$upload_data = $this->upload->data();
-		$receiving_quantity = parse_quantity($this->input->post('receiving_quantity'));
-		$item_type = $this->input->post('item_type') === NULL ? ITEM : $this->input->post('item_type');
+		$upload_success = $this->upload_image();
+		$upload_file = $this->request->hasFile('image') ? $this->request->getFile('image') : null;	//TODO: https://codeigniter4.github.io/userguide/incoming/incomingrequest.html#uploaded-files
+		$receiving_quantity = parse_quantity($this->request->getPost('receiving_quantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$item_type = $this->request->getPost('item_type') === NULL ? ITEM : $this->request->getPost('item_type', FILTER_SANITIZE_NUMBER_INT);
 
-		if($receiving_quantity === 0 && $item_type !== ITEM_TEMP)
+		if($receiving_quantity === 0.0 && $item_type !== ITEM_TEMP)
 		{
 			$receiving_quantity = 1;
 		}
 
-		$default_pack_name = $this->lang->line('items_default_pack_name');
+		$default_pack_name = lang('Items.default_pack_name');
 
 		//Save item data
-		$item_data = array(
-			'name' => $this->input->post('name'),
-			'description' => $this->input->post('description'),
-			'category' => $this->input->post('category'),
+		$item_data = [
+			'name' => $this->request->getPost('name', FILTER_SANITIZE_STRING),
+			'description' => $this->request->getPost('description', FILTER_SANITIZE_STRING),
+			'category' => $this->request->getPost('category', FILTER_SANITIZE_STRING),
 			'item_type' => $item_type,
-			'stock_type' => $this->input->post('stock_type') === NULL ? HAS_STOCK : intval($this->input->post('stock_type')),
-			'supplier_id' => empty($this->input->post('supplier_id')) ? NULL : intval($this->input->post('supplier_id')),
-			'item_number' => empty($this->input->post('item_number')) ? NULL : $this->input->post('item_number'),
-			'cost_price' => parse_decimals($this->input->post('cost_price')),
-			'unit_price' => parse_decimals($this->input->post('unit_price')),
-			'reorder_level' => parse_quantity($this->input->post('reorder_level')),
+			'stock_type' => $this->request->getPost('stock_type') === NULL ? HAS_STOCK : intval($this->request->getPost('stock_type', FILTER_SANITIZE_NUMBER_INT)),
+			'supplier_id' => empty($this->request->getPost('supplier_id')) ? NULL : intval($this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT)),
+			'item_number' => empty($this->request->getPost('item_number')) ? NULL : $this->request->getPost('item_number', FILTER_SANITIZE_NUMBER_INT),
+			'cost_price' => parse_decimals($this->request->getPost('cost_price', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'unit_price' => parse_decimals($this->request->getPost('unit_price', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
+			'reorder_level' => parse_quantity($this->request->getPost('reorder_level', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)),
 			'receiving_quantity' => $receiving_quantity,
-			'allow_alt_description' => $this->input->post('allow_alt_description') !== NULL,
-			'is_serialized' => $this->input->post('is_serialized') !== NULL,
-			'qty_per_pack' => $this->input->post('qty_per_pack') === NULL ? 1 : $this->input->post('qty_per_pack'),
-			'pack_name' => $this->input->post('pack_name') === NULL ? $default_pack_name : $this->input->post('pack_name'),
-			'low_sell_item_id' => $this->input->post('low_sell_item_id') === NULL ? $item_id : $this->input->post('low_sell_item_id'),
-			'deleted' => $this->input->post('is_deleted') !== NULL,
-			'hsn_code' => $this->input->post('hsn_code') === NULL ? '' : $this->input->post('hsn_code')
-		);
+			'allow_alt_description' => $this->request->getPost('allow_alt_description') !== NULL,
+			'is_serialized' => $this->request->getPost('is_serialized') !== NULL,
+			'qty_per_pack' => $this->request->getPost('qty_per_pack') === NULL ? 1 : $this->request->getPost('qty_per_pack', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+			'pack_name' => $this->request->getPost('pack_name') === NULL ? $default_pack_name : $this->request->getPost('pack_name', FILTER_SANITIZE_STRING),
+			'low_sell_item_id' => $this->request->getPost('low_sell_item_id') === NULL ? $item_id : $this->request->getPost('low_sell_item_id', FILTER_SANITIZE_NUMBER_INT),
+			'deleted' => $this->request->getPost('is_deleted') !== NULL,
+			'hsn_code' => $this->request->getPost('hsn_code') === NULL ? '' : $this->request->getPost('hsn_code', FILTER_SANITIZE_STRING)
+		];
 
 		if($item_data['item_type'] == ITEM_TEMP)
 		{
@@ -540,7 +590,7 @@ class Items extends Secure_Controller
 			$item_data['reorder_level'] = 0;
 		}
 
-		$tax_category_id = $this->input->post('tax_category_id');
+		$tax_category_id = $this->request->getPost('tax_category_id', FILTER_SANITIZE_NUMBER_INT);
 
 		if(!isset($tax_category_id))
 		{
@@ -548,20 +598,18 @@ class Items extends Secure_Controller
 		}
 		else
 		{
-			$item_data['tax_category_id'] = empty($this->input->post('tax_category_id')) ? NULL : $this->input->post('tax_category_id');
+			$item_data['tax_category_id'] = empty($this->request->getPost('tax_category_id')) ? NULL : $this->request->getPost('tax_category_id', FILTER_SANITIZE_NUMBER_INT);
 		}
 
-		if(!empty($upload_data['orig_name']))
+		$original_name = $upload_file->getFilename();
+		if(!empty($original_name))
 		{
-			if($this->xss_clean($upload_data['orig_name'], TRUE) === TRUE)
-			{
-				$item_data['pic_filename'] = $upload_data['orig_name'];
-			}
+			$item_data['pic_filename'] = $original_name;
 		}
 
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 
-		if($this->Item->save($item_data, $item_id))
+		if($this->item->save_value($item_data, $item_id))
 		{
 			$success = TRUE;
 			$new_item = FALSE;
@@ -572,13 +620,13 @@ class Items extends Secure_Controller
 				$new_item = TRUE;
 			}
 
-			$use_destination_based_tax = (boolean)$this->config->item('use_destination_based_tax');
+			$use_destination_based_tax = (bool)config('OSPOS')->use_destination_based_tax;
 
 			if(!$use_destination_based_tax)
 			{
 				$items_taxes_data = [];
-				$tax_names = $this->input->post('tax_names');
-				$tax_percents = $this->input->post('tax_percents');
+				$tax_names = $this->request->getPost('tax_names', FILTER_SANITIZE_STRING);
+				$tax_percents = $this->request->getPost('tax_percents', FILTER_SANITIZE_NUMBER_FLOAT);
 
 				$tax_name_index = 0;
 
@@ -588,102 +636,144 @@ class Items extends Secure_Controller
 
 					if(is_numeric($tax_percentage))
 					{
-						$items_taxes_data[] = array('name' => $tax_names[$tax_name_index], 'percent' => $tax_percentage);
+						$items_taxes_data[] = ['name' => $tax_names[$tax_name_index], 'percent' => $tax_percentage];
 					}
 
 					$tax_name_index++;
 				}
-				$success &= $this->Item_taxes->save($items_taxes_data, $item_id);
+				$success &= $this->item_taxes->save_value($items_taxes_data, $item_id);
 			}
 
 			//Save item quantity
-			$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
+			$stock_locations = $this->stock_location->get_undeleted_all()->getResultArray();
 			foreach($stock_locations as $location)
 			{
-				$updated_quantity = parse_quantity($this->input->post('quantity_' . $location['location_id']));
+				$updated_quantity = parse_quantity($this->request->getPost('quantity_' . $location['location_id'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
 
 				if($item_data['item_type'] == ITEM_TEMP)
 				{
 					$updated_quantity = 0;
 				}
 
-				$location_detail = array(
+				$location_detail = [
 						'item_id' => $item_id,
 						'location_id' => $location['location_id'],
-						'quantity' => $updated_quantity);
+						'quantity' => $updated_quantity
+				];
 
-				$item_quantity = $this->Item_quantity->get_item_quantity($item_id, $location['location_id']);
+				$item_quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id']);
 
 				if($item_quantity->quantity != $updated_quantity || $new_item)
 				{
-					$success &= $this->Item_quantity->save($location_detail, $item_id, $location['location_id']);
+					$success &= $this->item_quantity->save_value($location_detail, $item_id, $location['location_id']);
 
-					$inv_data = array(
+					$inv_data = [
 						'trans_date' => date('Y-m-d H:i:s'),
 						'trans_items' => $item_id,
 						'trans_user' => $employee_id,
 						'trans_location' => $location['location_id'],
-						'trans_comment' => $this->lang->line('items_manually_editing_of_quantity'),
+						'trans_comment' => lang('Items.manually_editing_of_quantity'),
 						'trans_inventory' => $updated_quantity - $item_quantity->quantity
-					);
+					];
 
-					$success &= $this->Inventory->insert($inv_data);
+					$success &= $this->inventory->insert($inv_data);
 				}
 			}
 
 			// Save item attributes
-			$attribute_links = $this->input->post('attribute_links') !== NULL ? $this->input->post('attribute_links') : [];
-			$attribute_ids = $this->input->post('attribute_ids');
+			$attribute_links = $this->request->getPost('attribute_links') !== NULL ? $this->request->getPost('attribute_links', FILTER_SANITIZE_NUMBER_INT) : [];
+			$attribute_ids = $this->request->getPost('attribute_ids', FILTER_SANITIZE_NUMBER_INT);
 
-			$this->Attribute->delete_link($item_id);
+			$this->attribute->delete_link($item_id);
 
 			foreach($attribute_links as $definition_id => $attribute_id)
 			{
-				$definition_type = $this->Attribute->get_info($definition_id)->definition_type;
+				$definition_type = $this->attribute->get_info($definition_id)->definition_type;
 
 				if($definition_type !== DROPDOWN)
 				{
-					$attribute_id = $this->Attribute->save_value($attribute_id, $definition_id, $item_id, $attribute_ids[$definition_id], $definition_type);
+					$attribute_id = $this->attribute->save_value($attribute_id, $definition_id, $item_id, $attribute_ids[$definition_id], $definition_type);
 				}
 
-				$this->Attribute->save_link($item_id, $definition_id, $attribute_id);
+				$this->attribute->save_link($item_id, $definition_id, $attribute_id);
 			}
 
 			if($success && $upload_success)
 			{
-				$message = $this->xss_clean($this->lang->line('items_successful_' . ($new_item ? 'adding' : 'updating')) . ' ' . $item_data['name']);
+				$message = lang('Items.successful_' . ($new_item ? 'adding' : 'updating')) . ' ' . $item_data['name'];
 
-				echo json_encode(array('success' => TRUE, 'message' => $message, 'id' => $item_id));
+				echo json_encode (['success' => TRUE, 'message' => $message, 'id' => $item_id]);
 			}
 			else
 			{
-				$message = $this->xss_clean($upload_success ? $this->lang->line('items_error_adding_updating') . ' ' . $item_data['name'] : strip_tags($this->upload->display_errors()));
+				$message = $upload_success ? lang('Items.error_adding_updating') . ' ' . $item_data['name'] : strip_tags($this->upload->display_errors());	//TODO: Need to figure out what the analog to this->upload->display_errors() is.
 
-				echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => $item_id));
+				echo json_encode (['success' => FALSE, 'message' => $message, 'id' => $item_id]);
 			}
 		}
 		else
 		{
-			$message = $this->xss_clean($this->lang->line('items_error_adding_updating') . ' ' . $item_data['name']);
+			$message = lang('Items.error_adding_updating') . ' ' . $item_data['name'];
 
-			echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => NEW_ITEM));
+			echo json_encode (['success' => FALSE, 'message' => $message, 'id' => NEW_ITEM]);
 		}
 	}
 
-	public function check_item_number()
+	/**
+	 * Let files be uploaded with their original name
+	 * @return array
+	 */
+	private function upload_image(): array
 	{
-		$exists = $this->Item->item_number_exists($this->input->post('item_number'), $this->input->post('item_id'));
+		//Load upload library
+		helper(['form']);
+		$validation_rule = [
+			'items_image' => [
+				'label' => 'Item Image',
+				'rules' => [
+					'uploaded[items_image]',
+					'is_image[items_image]',
+					'max_size[items_image,' . config('OSPOS')->image_max_size.']',
+					'max_dims[items_image,' . config('OSPOS')->image_max_width . ',' . config('OSPOS')->image_max_height . ']',
+					'ext_in[items_image,' . config('OSPOS')->image_allowed_types . ']'
+				]
+			]
+		];
+
+		if (!$this->validate($validation_rule))
+		{
+			return (['error' => $this->validator->getError('items_image')]);
+		}
+		else
+		{
+			$file = $this->request->getFile('company_logo');
+			$file->move(WRITEPATH . 'uploads/item_pics');
+
+			$file_info = [
+				'orig_name' => $file->getClientName(),
+				'raw_name' => $file->getName(),
+				'file_ext' => $file->guessExtension()
+			];
+
+			return ($file_info);
+		}
+	}
+
+
+	public function check_item_number(): void
+	{
+		$exists = $this->item->item_number_exists($this->request->getPost('item_number', FILTER_SANITIZE_STRING), $this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT));
 		echo !$exists ? 'true' : 'false';
 	}
 
-	/*
-	 If adding a new item check to see if an item kit with the same name as the item already exists.
+	/**
+	 * If adding a new item check to see if an item kit with the same name as the item already exists.
 	 */
-	public function check_kit_exists()
+	public function check_kit_exists(): void	//TODO: This function appears to be never called in the code.  Need to confirm.
 	{
-		if($this->input->post('item_number') === NEW_ITEM)
+		if($this->request->getPost('item_number', FILTER_SANITIZE_STRING) === NEW_ITEM)
 		{
-			$exists = $this->Item_kit->item_kit_exists_for_name($this->input->post('name'));
+			$exists = $this->item_kit->item_kit_exists_for_name($this->request->getPost('name', FILTER_SANITIZE_STRING));	//TODO: item_kit_exists_for_name doesn't exist in Item_kit.  I looked at the blame and it appears to have never existed.
 		}
 		else
 		{
@@ -692,73 +782,58 @@ class Items extends Secure_Controller
 		echo !$exists ? 'true' : 'false';
 	}
 
-	/*
-	 * Let files be uploaded with their original name
+	public function remove_logo($item_id): void
+	{
+		$item_data = ['pic_filename' => NULL];
+		$result = $this->item->save_value($item_data, $item_id);
+
+		echo json_encode (['success' => $result]);
+	}
+
+	/**
+	 * @throws ReflectionException
 	 */
-	private function handle_image_upload()
+	public function save_inventory($item_id = NEW_ITEM): void
 	{
-	//Load upload library
-		$config = array('upload_path' => './uploads/item_pics/',
-			'allowed_types' => $this->config->item('image_allowed_types'),
-			'max_size' => $this->config->item('image_max_size'),
-			'max_width' => $this->config->item('image_max_width'),
-			'max_height' => $this->config->item('image_max_height'));
-
-		$this->load->library('upload', $config);
-		$this->upload->do_upload('item_image');
-
-		return strlen($this->upload->display_errors()) === 0 || !strcmp($this->upload->display_errors(), '<p>' . $this->lang->line('upload_no_file_selected') . '</p>');
-	}
-
-	public function remove_logo($item_id)
-	{
-		$item_data = array('pic_filename' => NULL);
-		$result = $this->Item->save($item_data, $item_id);
-
-		echo json_encode(array('success' => $result));
-	}
-
-	public function save_inventory($item_id = NEW_ITEM)
-	{
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$cur_item_info = $this->Item->get_info($item_id);
-		$location_id = $this->input->post('stock_location');
-		$inv_data = array(
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$cur_item_info = $this->item->get_info($item_id);
+		$location_id = $this->request->getPost('stock_location', FILTER_SANITIZE_NUMBER_INT);
+		$inv_data = [
 			'trans_date' => date('Y-m-d H:i:s'),
 			'trans_items' => $item_id,
 			'trans_user' => $employee_id,
 			'trans_location' => $location_id,
-			'trans_comment' => $this->input->post('trans_comment'),
-			'trans_inventory' => parse_quantity($this->input->post('newquantity'))
-		);
+			'trans_comment' => $this->request->getPost('trans_comment', FILTER_SANITIZE_STRING),
+			'trans_inventory' => parse_quantity($this->request->getPost('newquantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
+		];
 
-		$this->Inventory->insert($inv_data);
+		$this->inventory->insert($inv_data);
 
 	//Update stock quantity
-		$item_quantity = $this->Item_quantity->get_item_quantity($item_id, $location_id);
-		$item_quantity_data = array(
+		$item_quantity = $this->item_quantity->get_item_quantity($item_id, $location_id);
+		$item_quantity_data = [
 			'item_id' => $item_id,
 			'location_id' => $location_id,
-			'quantity' => $item_quantity->quantity + parse_quantity($this->input->post('newquantity'))
-		);
+			'quantity' => $item_quantity->quantity + parse_quantity($this->request->getPost('newquantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
+		];
 
-		if($this->Item_quantity->save($item_quantity_data, $item_id, $location_id))
+		if($this->item_quantity->save_value($item_quantity_data, $item_id, $location_id))
 		{
-			$message = $this->xss_clean($this->lang->line('items_successful_updating') . " $cur_item_info->name");
+			$message = lang('Items.successful_updating') . " $cur_item_info->name";
 
-			echo json_encode(array('success' => TRUE, 'message' => $message, 'id' => $item_id));
+			echo json_encode (['success' => TRUE, 'message' => $message, 'id' => $item_id]);
 		}
 		else
 		{
-			$message = $this->xss_clean($this->lang->line('items_error_adding_updating') . " $cur_item_info->name");
+			$message = lang('Items.error_adding_updating') . " $cur_item_info->name";
 
-			echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => NEW_ITEM));
+			echo json_encode (['success' => FALSE, 'message' => $message, 'id' => NEW_ITEM]);
 		}
 	}
 
-	public function bulk_update()
+	public function bulk_update(): void
 	{
-		$items_to_update = $this->input->post('item_ids');
+		$items_to_update = $this->request->getPost('item_ids', FILTER_SANITIZE_NUMBER_INT);
 		$item_data = [];
 
 		foreach($_POST as $key => $value)
@@ -768,18 +843,18 @@ class Items extends Secure_Controller
 			{
 				$item_data[$key] = $value;
 			}
-			elseif($value !== '' && !(in_array($key, array('item_ids', 'tax_names', 'tax_percents'))))
+			elseif($value !== '' && !(in_array($key, ['item_ids', 'tax_names', 'tax_percents'])))
 			{
 				$item_data[$key] = $value;
 			}
 		}
 
 		//Item data could be empty if tax information is being updated
-		if(empty($item_data) || $this->Item->update_multiple($item_data, $items_to_update))
+		if(empty($item_data) || $this->item->update_multiple($item_data, $items_to_update))
 		{
 			$items_taxes_data = [];
-			$tax_names = $this->input->post('tax_names');
-			$tax_percents = $this->input->post('tax_percents');
+			$tax_names = $this->request->getPost('tax_names', FILTER_SANITIZE_STRING);
+			$tax_percents = $this->request->getPost('tax_percents', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 			$tax_updated = FALSE;
 
 			foreach($tax_percents as $tax_percent)
@@ -787,61 +862,65 @@ class Items extends Secure_Controller
 				if(!empty($tax_names[$tax_percent]) && is_numeric($tax_percents[$tax_percent]))
 				{
 					$tax_updated = TRUE;
-					$items_taxes_data[] = array('name' => $tax_names[$tax_percent], 'percent' => $tax_percents[$tax_percent]);
+					$items_taxes_data[] = ['name' => $tax_names[$tax_percent], 'percent' => $tax_percents[$tax_percent]];
 				}
 			}
 
 			if($tax_updated)
 			{
-				$this->Item_taxes->save_multiple($items_taxes_data, $items_to_update);
+				$this->item_taxes->save_multiple($items_taxes_data, $items_to_update);
 			}
 
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('items_successful_bulk_edit'), 'id' => $this->xss_clean($items_to_update)));
+			echo json_encode (['success' => TRUE, 'message' => lang('Items.successful_bulk_edit'), 'id' => $items_to_update]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_error_updating_multiple')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Items.error_updating_multiple')]);
 		}
 	}
 
-	public function delete()
+	/**
+	 * @throws ReflectionException
+	 */
+	public function delete(): void
 	{
-		$items_to_delete = $this->input->post('ids');
+		$items_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-		if($this->Item->delete_list($items_to_delete))
+		if($this->item->delete_list($items_to_delete))
 		{
-			$message = $this->lang->line('items_successful_deleted') . ' ' . count($items_to_delete) . ' ' . $this->lang->line('items_one_or_multiple');
-			echo json_encode(array('success' => TRUE, 'message' => $message));
+			$message = lang('Items.successful_deleted') . ' ' . count($items_to_delete) . ' ' . lang('Items.one_or_multiple');
+			echo json_encode (['success' => TRUE, 'message' => $message]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Items.cannot_be_deleted')]);
 		}
 	}
 
-	public function generate_csv_file()
+	public function generate_csv_file(): void
 	{
 		$name = 'import_items.csv';
-		$allowed_locations = $this->Stock_location->get_allowed_locations();
-		$allowed_attributes = $this->Attribute->get_definition_names(FALSE);
+		$allowed_locations = $this->stock_location->get_allowed_locations();
+		$allowed_attributes = $this->attribute->get_definition_names(FALSE);
 		$data = generate_import_items_csv($allowed_locations, $allowed_attributes);
 
 		force_download($name, $data, TRUE);
 	}
 
-	public function csv_import()
+	public function csv_import(): void
 	{
-		$this->load->view('items/form_csv_import', NULL);
+		echo view('items/form_csv_import', NULL);
 	}
 
 	/**
 	 * Imports items from CSV formatted file.
+	 * @throws ReflectionException
 	 */
-	public function import_csv_file()
+	public function import_csv_file(): void
 	{
 		if($_FILES['file_path']['error'] !== UPLOAD_ERR_OK)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_csv_import_failed')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Items.csv_import_failed')]);
 		}
 		else
 		{
@@ -851,30 +930,32 @@ class Items extends Secure_Controller
 
 				$failCodes = [];
 				$csv_rows = get_csv_file($_FILES['file_path']['tmp_name']);
-				$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-				$allowed_stock_locations = $this->Stock_location->get_allowed_locations();
-				$attribute_definition_names	= $this->Attribute->get_definition_names();
+				$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+				$allowed_stock_locations = $this->stock_location->get_allowed_locations();
+				$attribute_definition_names	= $this->attribute->get_definition_names();
 
 				unset($attribute_definition_names[-1]);	//Removes the common_none_selected_text from the array
 
+				$attribute_data = [];
+
 				foreach($attribute_definition_names as $definition_name)
 				{
-					$attribute_data[$definition_name] = $this->Attribute->get_definition_by_name($definition_name)[0];
+					$attribute_data[$definition_name] = $this->attribute->get_definition_by_name($definition_name)[0];
 
 					if($attribute_data[$definition_name]['definition_type'] === DROPDOWN)
 					{
-						$attribute_data[$definition_name]['dropdown_values'] = $this->Attribute->get_definition_values($attribute_data[$definition_name]['definition_id']);
+						$attribute_data[$definition_name]['dropdown_values'] = $this->attribute->get_definition_values($attribute_data[$definition_name]['definition_id']);
 					}
 				}
 
-				$this->db->trans_begin();
+				$this->db->transBegin();
 
 				foreach($csv_rows as $key => $row)
 				{
 					$is_failed_row = FALSE;
 					$item_id = $row['Id'];
 					$is_update = !empty($item_id);
-					$item_data = array(
+					$item_data = [
 						'item_id' => $item_id,
 						'name' => $row['Item Name'],
 						'description' => $row['Description'],
@@ -884,11 +965,12 @@ class Items extends Secure_Controller
 						'reorder_level' => $row['Reorder Level'],
 						'deleted' => FALSE,
 						'hsn_code' => $row['HSN'],
-						'pic_filename' => $row['Image']);
+						'pic_filename' => $row['Image']
+					];
 
-					if(!empty($row['Supplier ID']))
+					if(!empty($row['supplier_id']))
 					{
-						$item_data['supplier_id'] = $this->Supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : NULL;
+						$item_data['supplier_id'] = $this->supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : NULL;
 					}
 
 					if($is_update)
@@ -905,7 +987,7 @@ class Items extends Secure_Controller
 					if(!empty($row['Barcode']))
 					{
 						$item_data['item_number'] = $row['Barcode'];
-						$is_failed_row = $this->Item->item_number_exists($item_data['item_number']);
+						$is_failed_row = $this->item->item_number_exists($item_data['item_number']);
 					}
 
 					if(!$is_failed_row)
@@ -916,15 +998,15 @@ class Items extends Secure_Controller
 					//Remove FALSE, NULL, '' and empty strings but keep 0
 					$item_data = array_filter($item_data, 'strlen');
 
-					if(!$is_failed_row && $this->Item->save($item_data, $item_id))
+					if(!$is_failed_row && $this->item->save_value($item_data, $item_id))
 					{
 						$this->save_tax_data($row, $item_data);
 						$this->save_inventory_quantities($row, $item_data, $allowed_stock_locations, $employee_id);
-						$is_failed_row = $this->save_attribute_data($row, $item_data, $attribute_data);
+						$is_failed_row = $this->save_attribute_data($row, $item_data, $attribute_data);	//TODO: $is_failed_row never gets used after this.
 
 						if($is_update)
 						{
-							$item_data = array_merge($item_data, get_object_vars($this->Item->get_info_by_id_or_number($item_id)));
+							$item_data = array_merge($item_data, get_object_vars($this->item->get_info_by_id_or_number($item_id)));
 						}
 					}
 					else
@@ -941,20 +1023,20 @@ class Items extends Secure_Controller
 
 				if(count($failCodes) > 0)
 				{
-					$message = $this->lang->line('items_csv_import_partially_failed', count($failCodes), implode(', ', $failCodes));
-					$this->db->trans_rollback();
-					echo json_encode(array('success' => FALSE, 'message' => $message));
+					$message = lang('Items.csv_import_partially_failed', [count($failCodes), implode(', ', $failCodes)]);
+					$this->db->transRollback();
+					echo json_encode (['success' => FALSE, 'message' => $message]);
 				}
 				else
 				{
-					$this->db->trans_commit();
+					$this->db->transCommit();
 
-					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('items_csv_import_success')));
+					echo json_encode (['success' => TRUE, 'message' => lang('Items.csv_import_success')]);
 				}
 			}
 			else
 			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_csv_import_nodata_wrongformat')));
+				echo json_encode (['success' => FALSE, 'message' => lang('Items.csv_import_nodata_wrongformat')]);
 			}
 		}
 	}
@@ -962,21 +1044,24 @@ class Items extends Secure_Controller
 	/**
 	 * Checks the entire line of data in an import file for errors
 	 *
-	 * @param	array	$line
-	 * @param 	array	$item_data
-	 *
-	 * @return	bool	Returns FALSE if all data checks out and TRUE when there is an error in the data
+	 * @param array $row
+	 * @param array $item_data
+	 * @param array $allowed_locations
+	 * @param array $definition_names
+	 * @param array $attribute_data
+	 * @return    bool    Returns FALSE if all data checks out and TRUE when there is an error in the data
 	 */
-	private function data_error_check($row, $item_data, $allowed_locations, $definition_names, $attribute_data)
+	private function data_error_check(array $row, array $item_data, array $allowed_locations, array $definition_names, array $attribute_data): bool	//TODO: Long function and large number of parameters in the declaration... perhaps refactoring is needed.
 	{
 		$item_id = $row['Id'];
-		$is_update = $item_id ? TRUE : FALSE;
+		$is_update = (bool)$item_id;
 
 		//Check for empty required fields
-		$check_for_empty = array(
+		$check_for_empty = [
 			'name' => $item_data['name'],
 			'category' => $item_data['category'],
-			'unit_price' => $item_data['unit_price']);
+			'unit_price' => $item_data['unit_price']
+		];
 
 		foreach($check_for_empty as $key => $val)
 		{
@@ -993,7 +1078,7 @@ class Items extends Secure_Controller
 		}
 		else
 		{
-			if(!$this->Item->exists($item_id))
+			if(!$this->item->exists($item_id))
 			{
 				log_message('Error',"non-existent item_id: '$item_id' when either existing item_id or no item_id is required.");
 				return TRUE;
@@ -1001,13 +1086,14 @@ class Items extends Secure_Controller
 		}
 
 		//Build array of fields to check for numerics
-		$check_for_numeric_values = array(
+		$check_for_numeric_values = [
 			'cost_price' => $item_data['cost_price'],
 			'unit_price' => $item_data['unit_price'],
 			'reorder_level' => $item_data['reorder_level'],
 			'supplier_id' => $item_data['supplier_id'],
 			'Tax 1 Percent' => $row['Tax 1 Percent'],
-			'Tax 2 Percent' => $row['Tax 2 Percent']);
+			'Tax 2 Percent' => $row['Tax 2 Percent']
+		];
 
 		foreach($allowed_locations as $location_name)
 		{
@@ -1068,11 +1154,11 @@ class Items extends Secure_Controller
 	/**
 	 * Saves attribute data found in the CSV import.
 	 *
-	 * @param line
-	 * @param failCodes
-	 * @param attribute_data
+	 * @param array row
+	 * @param array item_data
+	 * @param array definitions
 	 */
-	private function save_attribute_data($row, $item_data, $definitions)
+	private function save_attribute_data(array $row, array $item_data, array $definitions): bool
 	{
 		foreach($definitions as $definition)
 		{
@@ -1104,59 +1190,61 @@ class Items extends Secure_Controller
 				}
 			}
 		}
+		return FALSE;
 	}
 
 	/**
 	 * Saves the attribute_value and attribute_link if necessary
 	 */
-	private function store_attribute_value($value, $attribute_data, $item_id)
+	private function store_attribute_value(string $value, array $attribute_data, int $item_id)
 	{
-		$attribute_id = $this->Attribute->value_exists($value, $attribute_data['definition_type']);
+		$attribute_id = $this->attribute->value_exists($value, $attribute_data['definition_type']);
 
-		$this->Attribute->delete_link($item_id, $attribute_data['definition_id']);
+		$this->attribute->delete_link($item_id, $attribute_data['definition_id']);
 
 		if($attribute_id === FALSE)
 		{
-			$attribute_id = $this->Attribute->save_value($value, $attribute_data['definition_id'], $item_id, FALSE, $attribute_data['definition_type']);
+			$attribute_id = $this->attribute->save_value($value, $attribute_data['definition_id'], $item_id, FALSE, $attribute_data['definition_type']);
 		}
-		else if($this->Attribute->save_link($item_id, $attribute_data['definition_id'], $attribute_id) === FALSE)
+		else if($this->attribute->save_link($item_id, $attribute_data['definition_id'], $attribute_id) === FALSE)
 		{
 			return FALSE;
 		}
+
 		return $attribute_id;
 	}
 
 	/**
 	 * Saves inventory quantities for the row in the appropriate stock locations.
 	 *
-	 * @param	array	line
-	 * @param			item_data
+	 * @param array    row
+	 * @param array    item_data
+	 * @throws ReflectionException
 	 */
-	private function save_inventory_quantities($row, $item_data, $allowed_locations, $employee_id)
+	private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): void
 	{
 		//Quantities & Inventory Section
-		$comment = $this->lang->line('items_inventory_CSV_import_quantity');
-		$is_update = $row['Id'] ? TRUE : FALSE;
+		$comment = lang('Items.inventory_CSV_import_quantity');
+		$is_update = (bool)$row['Id'];
 
 		foreach($allowed_locations as $location_id => $location_name)
 		{
-			$item_quantity_data = array(
-				'item_id' => $item_data['item_id'],
-				'location_id' => $location_id);
+			$item_quantity_data = ['item_id' => $item_data['item_id'], 'location_id' => $location_id];
 
-			$csv_data = array(
+			$csv_data = [
 				'trans_items' => $item_data['item_id'],
 				'trans_user' => $employee_id,
 				'trans_comment' => $comment,
-				'trans_location' => $location_id);
+				'trans_location' => $location_id
+			];
 
 			if(!empty($row["location_$location_name"]) || $row["location_$location_name"] === '0')
 			{
 				$item_quantity_data['quantity'] = $row["location_$location_name"];
-				$this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $location_id);
+				$this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
 				$csv_data['trans_inventory'] = $row["location_$location_name"];
-				$this->Inventory->insert($csv_data);
+				$this->inventory->insert($csv_data);	//TODO: Reflection Exception
 			}
 			elseif($is_update)
 			{
@@ -1165,10 +1253,10 @@ class Items extends Secure_Controller
 			else
 			{
 				$item_quantity_data['quantity'] = 0;
-				$this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $location_id);
+				$this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
 				$csv_data['trans_inventory'] = 0;
-				$this->Inventory->insert($csv_data);
+				$this->inventory->insert($csv_data);	//TODO: Reflection Exception
 			}
 		}
 	}
@@ -1176,34 +1264,34 @@ class Items extends Secure_Controller
 	/**
 	 * Saves the tax data found in the line of the CSV items import file
 	 *
-	 * @param	array	line
+	 * @param	array	row
 	 */
-	private function save_tax_data($row, $item_data)
+	private function save_tax_data(array $row, array $item_data): void
 	{
 		$items_taxes_data = [];
 
 		if(is_numeric($row['Tax 1 Percent']) && $row['Tax 1 Name'] !== '')
 		{
-			$items_taxes_data[] = array('name' => $row['Tax 1 Name'], 'percent' => $row['Tax 1 Percent']);
+			$items_taxes_data[] = ['name' => $row['Tax 1 Name'], 'percent' => $row['Tax 1 Percent']];
 		}
 
 		if(is_numeric($row['Tax 2 Percent']) && $row['Tax 2 Name'] !== '')
 		{
-			$items_taxes_data[] = array('name' => $row['Tax 2 Name'], 'percent' => $row['Tax 2 Percent']);
+			$items_taxes_data[] = ['name' => $row['Tax 2 Name'], 'percent' => $row['Tax 2 Percent']];
 		}
 
 		if(isset($items_taxes_data))
 		{
-			$this->Item_taxes->save($items_taxes_data, $item_data['item_id']);
+			$this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
 		}
 	}
 
 	/**
 	 * Guess whether file extension is not in the table field, if it isn't, then it's an old-format (formerly pic_id) field, so we guess the right filename and update the table
 	 *
-	 * @param $item int item to update
+	 * @param $item object item to update
 	 */
-	private function update_pic_filename($item)
+	private function update_pic_filename(object $item): void
 	{
 		$filename = pathinfo($item->pic_filename, PATHINFO_FILENAME);
 
@@ -1217,11 +1305,10 @@ class Items extends Secure_Controller
 				if(sizeof($images) > 0)
 				{
 					$new_pic_filename = pathinfo($images[0], PATHINFO_BASENAME);
-					$item_data = array('pic_filename' => $new_pic_filename);
-					$this->Item->save($item_data, $item->item_id);
+					$item_data = ['pic_filename' => $new_pic_filename];
+					$this->item->save_value($item_data, $item->item_id);
 				}
 			}
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index a1d4e5990..86f8b1ab2 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -1,24 +1,35 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Login extends CI_Controller
+namespace App\Controllers;
+
+use App\Models\Employee;
+
+/**
+ * @property employee employee
+ */
+class Login extends BaseController
 {
-	public function index()
+	public function index(): void
 	{
-		$this->load->library('migration');
+		$this->employee = model('Employee');
 
-		if($this->Employee->is_logged_in())
+		if($this->employee->is_logged_in())
 		{
 			redirect('home');
 		}
 		else
 		{
-			$this->form_validation->set_error_delimiters('<div class="error">', '</div>');
+			$this->validator->setRule('username', 'lang:login_username', 'required|login_check');
 
-			$this->form_validation->set_rules('username', 'lang:login_username', 'required|callback_login_check');
 
-			if($this->form_validation->run() == FALSE)
+			if(config('OSPOS')->gcaptcha_enable)
 			{
-				$this->load->view('login');
+				$this->validator->setRule('g-recaptcha-response', 'lang:login_gcaptcha', 'required|gcaptcha_check');
+			}
+
+			if(!$this->validate([]))
+			{
+				echo view('login', ['validation' => $this->validator]);
 			}
 			else
 			{
@@ -26,100 +37,4 @@ class Login extends CI_Controller
 			}
 		}
 	}
-
-	public function login_check($username)
-	{
-		if(!$this->installation_check())
-		{
-			$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_installation'));
-
-			return FALSE;
-		}
-
-		if(!$this->migration->is_latest())
-		{
-			set_time_limit(3600);
-			// trigger any required upgrade before starting the application
-			$this->migration->latest();
-		}
-
-		$password = $this->input->post('password');
-
-		if(!$this->Employee->login($username, $password))
-		{
-			$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_username_and_password'));
-
-			return FALSE;
-		}
-
-		if($this->config->item('gcaptcha_enable'))
-		{
-			$g_recaptcha_response = $this->input->post('g-recaptcha-response');
-
-			if(!$this->gcaptcha_check($g_recaptcha_response))
-			{
-				$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_gcaptcha'));
-
-				return FALSE;
-			}
-		}
-
-		return TRUE;
-	}
-
-	private function gcaptcha_check($response)
-	{
-		if(!empty($response))
-		{
-			$check = array(
-				'secret'   => $this->config->item('gcaptcha_secret_key'),
-				'response' => $response,
-				'remoteip' => $this->input->ip_address()
-			);
-
-			$ch = curl_init();
-
-			curl_setopt($ch, CURLOPT_URL, "https://www.google.com/recaptcha/api/siteverify");
-			curl_setopt($ch, CURLOPT_POST, TRUE);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($check));
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-
-			$result = curl_exec($ch);
-
-			curl_close($ch);
-
-			$status = json_decode($result, TRUE);
-
-			if(!empty($status['success']))
-			{
-				return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-
-	private function installation_check()
-	{
-		// get PHP extensions and check that the required ones are installed
-		$extensions = implode(', ', get_loaded_extensions());
-		$keys = array('bcmath', 'intl', 'gd', 'openssl', 'mbstring', 'curl');
-		$pattern = '/';
-		foreach($keys as $key) 
-		{
-			$pattern .= '(?=.*\b' . preg_quote($key, '/') . '\b)';
-		}
-		$pattern .= '/i';
-		$result = preg_match($pattern, $extensions);
-
-		if(!$result)
-		{
-			error_log('Check your php.ini');
-			error_log('PHP installed extensions: ' . $extensions);
-			error_log('PHP required extensions: ' . implode(', ', $keys));
-		}
-
-		return $result;
-	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Messages.php b/app/Controllers/Messages.php
index 4b168624b..f22f12793 100644
--- a/app/Controllers/Messages.php
+++ b/app/Controllers/Messages.php
@@ -1,65 +1,92 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Libraries\Sms_lib;
+
+use app\Models\Person;
+
+/**
+ *
+ *
+ * @property sms_lib sms_lib
+ *
+ * @property person person
+ *
+ */
 class Messages extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('messages');
 		
-		$this->load->library('sms_lib');
+		$this->sms_lib = new Sms_lib();
+
+		$this->person = model('Person');
 	}
 	
-	public function index()
+	public function index(): void
 	{
-		$this->load->view('messages/sms');
+		echo view('messages/sms');
 	}
 
-	public function view($person_id = -1)
+	public function view(int $person_id = -1): void	//TODO: Replace -1 with a constant
 	{ 
-		$info = $this->Person->get_info($person_id);
+		$info = $this->person->get_info($person_id);
 		foreach(get_object_vars($info) as $property => $value)
 		{
-			$info->$property = $this->xss_clean($value);
+			$info->$property = $value;
 		}
 		$data['person_info'] = $info;
 
-		$this->load->view('messages/form_sms', $data);
+		echo view('messages/form_sms', $data);
 	}
 
-	public function send()
-	{	
-		$phone   = $this->input->post('phone');
-		$message = $this->input->post('message');
+	public function send(): void
+	{
+		$phone   = $this->request->getPost('phone', FILTER_SANITIZE_STRING);
+		$message = $this->request->getPost('message', FILTER_SANITIZE_STRING);
 
 		$response = $this->sms_lib->sendSMS($phone, $message);
 
 		if($response)
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $this->xss_clean($phone)));
+			echo json_encode (['success' => TRUE, 'message' => lang('Messages.successfully_sent') . ' ' . $phone]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $this->xss_clean($phone)));
+			echo json_encode (['success' => FALSE, 'message' => lang('Messages.unsuccessfully_sent') . ' ' . $phone]);
 		}
 	}
-	
-	public function send_form($person_id = -1)
+
+	/**
+	 * Sends an SMS message to a user. Called in the view.
+	 *
+	 * @param int $person_id
+	 * @return void
+	 */
+	public function send_form(int $person_id = -1): void	//TODO: Replace -1 with a constant
 	{	
-		$phone   = $this->input->post('phone');
-		$message = $this->input->post('message');
+		$phone   = $this->request->getPost('phone', FILTER_SANITIZE_STRING);
+		$message = $this->request->getPost('message', FILTER_SANITIZE_STRING);
 
 		$response = $this->sms_lib->sendSMS($phone, $message);
 
 		if($response)
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('messages_successfully_sent') . ' ' . $this->xss_clean($phone), 'person_id' => $this->xss_clean($person_id)));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Messages.successfully_sent') . ' ' . $phone,
+				'person_id' => $person_id	//TODO: Replace -1 with a constant
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('messages_unsuccessfully_sent') . ' ' . $this->xss_clean($phone), 'person_id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Messages.unsuccessfully_sent') . ' ' . $phone,
+				'person_id' => -1	//TODO: Replace -1 with a constant
+			]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/No_access.php b/app/Controllers/No_access.php
index 9a2a306bb..4170d39da 100644
--- a/app/Controllers/No_access.php
+++ b/app/Controllers/No_access.php
@@ -1,15 +1,26 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class No_Access extends CI_Controller 
+namespace App\Controllers;
+
+use app\Models\Module;
+
+/**
+ * Part of the grants mechanism to restrict access to modules that the user doesn't have permission for.
+ * Instantiated in the views.
+ *
+ * @property module module
+ */
+class No_Access extends BaseController
 {
-	public function index($module_id = '', $permission_id = '')
+	public function __construct()
 	{
-		$data['module_name']   = $this->Module->get_module_name($module_id);
-		$data['permission_id'] = $permission_id;
-		
-		$data = $this->security->xss_clean($data);
-		
-		$this->load->view('no_access', $data);
+		$this->module = model('Module');
 	}
-}
-?>
+	public function index(string $module_id = '', string $permission_id = ''): void
+	{
+		$data['module_name']   = $this->module->get_module_name($module_id);
+		$data['permission_id'] = $permission_id;
+
+		echo view('no_access', $data);
+	}
+}
\ No newline at end of file
diff --git a/app/Controllers/Office.php b/app/Controllers/Office.php
index ad9aa1d8e..58a3bfbe9 100644
--- a/app/Controllers/Office.php
+++ b/app/Controllers/Office.php
@@ -1,7 +1,12 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Employee;
+
+/**
+ * @property employee employee
+ */
 class Office extends Secure_Controller
 {
 	function __construct()
@@ -9,14 +14,15 @@ class Office extends Secure_Controller
 		parent::__construct('office', NULL, 'office');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$this->load->view('home/office');
+		echo view('home/office');
 	}
 
-	public function logout()
+	public function logout(): void
 	{
-		$this->Employee->logout();
+		$this->employee = model('Employee');
+
+		$this->employee->logout();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Persons.php b/app/Controllers/Persons.php
index 6f6a76f84..e8c9e490b 100644
--- a/app/Controllers/Persons.php
+++ b/app/Controllers/Persons.php
@@ -1,55 +1,60 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Person;
+
+/**
+ * @property person person
+ */
 abstract class Persons extends Secure_Controller
 {
-	public function __construct($module_id = NULL)
+	public function __construct(string $module_id = NULL)
 	{
 		parent::__construct($module_id);
+
+		$this->person = model('Person');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['table_headers'] = $this->xss_clean(get_people_manage_table_headers());
+		$data['table_headers'] = get_people_manage_table_headers();
 
-		$this->load->view('people/manage', $data);
+		echo view('people/manage', $data);
 	}
 
-	/*
-	 Gives search suggestions based on what is being searched for
-	*/
-	public function suggest()
+	/**
+	 * Gives search suggestions based on what is being searched for
+	 */
+	public function suggest(): void
 	{
-		$suggestions = $this->xss_clean($this->Person->get_search_suggestions($this->input->post('term')));
+		$suggestions = $this->person->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-	/*
-	Gets one row for a person manage table. This is called using AJAX to update one row.
-	*/
-	public function get_row($row_id)
+	/**
+	 * Gets one row for a person manage table. This is called using AJAX to update one row.
+	 */
+	public function get_row(int $row_id): void
 	{
-		$data_row = $this->xss_clean(get_person_data_row($this->Person->get_info($row_id)));
+		$data_row = get_person_data_row($this->person->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	/*
-	Capitalize segments of a name, and put the rest into lower case.
-	You can pass the characters you want to use as delimiters as exceptions.
-	The function supports UTF-8 string.
-
-	Example:
-		i.e. <?php echo nameize("john o'grady-smith"); ?>
-
-		returns John O'Grady-Smith
-	*/
-
-	protected function nameize($string)
+	/**
+	 * Capitalize segments of a name, and put the rest into lower case.
+	 * You can pass the characters you want to use as delimiters as exceptions.
+	 * The function supports UTF-8 strings
+	 *
+	 * Example:
+	 * i.e. <?php echo nameize("john o'grady-smith"); ?>
+	 *
+	 * returns John O'Grady-Smith
+	 */
+	protected function nameize(string $string): string    //TODO: The parameter should not be named $string.  Should also think about renaming the function.  The term is Proper Noun Capitalization, so perhaps something more reflective of that.
 	{
 		return str_name_case($string);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Receivings.php b/app/Controllers/Receivings.php
index b0224ad63..c5fb4ed30 100644
--- a/app/Controllers/Receivings.php
+++ b/app/Controllers/Receivings.php
@@ -1,409 +1,488 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once("Secure_Controller.php");
-
-class Receivings extends Secure_Controller
-{
-	public function __construct()
-	{
-		parent::__construct('receivings');
-
-		$this->load->library('receiving_lib');
-		$this->load->library('token_lib');
-		$this->load->library('barcode_lib');
-	}
-
-	public function index()
-	{
-		$this->_reload();
-	}
-
-	public function item_search()
-	{
-		$suggestions = $this->Item->get_search_suggestions($this->input->get('term'), array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE);
-		$suggestions = array_merge($suggestions, $this->Item_kit->get_search_suggestions($this->input->get('term')));
-
-		$suggestions = $this->xss_clean($suggestions);
-
-		echo json_encode($suggestions);
-	}
-
-	public function stock_item_search()
-	{
-		$suggestions = $this->Item->get_stock_search_suggestions($this->input->get('term'), array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE);
-		$suggestions = array_merge($suggestions, $this->Item_kit->get_search_suggestions($this->input->get('term')));
-
-		$suggestions = $this->xss_clean($suggestions);
-
-		echo json_encode($suggestions);
-	}
-
-	public function select_supplier()
-	{
-		$supplier_id = $this->input->post('supplier');
-		if($this->Supplier->exists($supplier_id))
-		{
-			$this->receiving_lib->set_supplier($supplier_id);
-		}
-
-		$this->_reload();
-	}
-
-	public function change_mode()
-	{
-		$stock_destination = $this->input->post('stock_destination');
-		$stock_source = $this->input->post('stock_source');
-
-		if((!$stock_source || $stock_source == $this->receiving_lib->get_stock_source()) &&
-			(!$stock_destination || $stock_destination == $this->receiving_lib->get_stock_destination()))
-		{
-			$this->receiving_lib->clear_reference();
-			$mode = $this->input->post('mode');
-			$this->receiving_lib->set_mode($mode);
-		}
-		elseif($this->Stock_location->is_allowed_location($stock_source, 'receivings'))
-		{
-			$this->receiving_lib->set_stock_source($stock_source);
-			$this->receiving_lib->set_stock_destination($stock_destination);
-		}
-
-		$this->_reload();
-	}
-	
-	public function set_comment()
-	{
-		$this->receiving_lib->set_comment($this->input->post('comment'));
-	}
-
-	public function set_print_after_sale()
-	{
-		$this->receiving_lib->set_print_after_sale($this->input->post('recv_print_after_sale'));
-	}
-	
-	public function set_reference()
-	{
-		$this->receiving_lib->set_reference($this->input->post('recv_reference'));
-	}
-	
-	public function add()
-	{
-		$data = array();
-
-		$mode = $this->receiving_lib->get_mode();
-		$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
-		$this->token_lib->parse_barcode($quantity, $price, $item_id_or_number_or_item_kit_or_receipt);
-		$quantity = ($mode == 'receive' || $mode == 'requisition') ? $quantity : -$quantity;
-		$item_location = $this->receiving_lib->get_stock_source();
-		$discount = $this->config->item('default_receivings_discount');
-		$discount_type = $this->config->item('default_receivings_discount_type');
-
-		if($mode == 'return' && $this->Receiving->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt))
-		{
-			$this->receiving_lib->return_entire_receiving($item_id_or_number_or_item_kit_or_receipt);
-		}
-		elseif($this->Item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
-		{
-			$this->receiving_lib->add_item_kit($item_id_or_number_or_item_kit_or_receipt, $item_location, $discount, $discount_type);
-		}
-		elseif(!$this->receiving_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount,  $discount_type))
-		{
-			$data['error'] = $this->lang->line('receivings_unable_to_add_item');
-		}
-
-		$this->_reload($data);
-	}
-
-	public function edit_item($item_id)
-	{
-		$data = array();
-
-		$this->form_validation->set_rules('price', 'lang:items_price', 'required|callback_numeric');
-		$this->form_validation->set_rules('quantity', 'lang:items_quantity', 'required|callback_numeric');
-		$this->form_validation->set_rules('discount', 'lang:items_discount', 'required|callback_numeric');
-
-		$description = $this->input->post('description');
-		$serialnumber = $this->input->post('serialnumber');
-		$price = parse_decimals($this->input->post('price'));
-		$quantity = parse_quantity($this->input->post('quantity'));
-		$discount_type = $this->input->post('discount_type');
-		$discount = $discount_type ? parse_quantity($this->input->post('discount')) : parse_decimals($this->input->post('discount'));
-
-		$receiving_quantity = $this->input->post('receiving_quantity');
-
-		if($this->form_validation->run() != FALSE)
-		{
-			$this->receiving_lib->edit_item($item_id, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $receiving_quantity);
-		}
-		else
-		{
-			$data['error']=$this->lang->line('receivings_error_editing_item');
-		}
-
-		$this->_reload($data);
-	}
-	
-	public function edit($receiving_id)
-	{
-		$data = array();
-
-		$data['suppliers'] = array('' => 'No Supplier');
-		foreach($this->Supplier->get_all()->result() as $supplier)
-		{
-			$data['suppliers'][$supplier->person_id] = $this->xss_clean($supplier->first_name . ' ' . $supplier->last_name);
-		}
-	
-		$data['employees'] = array();
-		foreach($this->Employee->get_all()->result() as $employee)
-		{
-			$data['employees'][$employee->person_id] = $this->xss_clean($employee->first_name . ' '. $employee->last_name);
-		}
-	
-		$receiving_info = $this->xss_clean($this->Receiving->get_info($receiving_id)->row_array());
-		$data['selected_supplier_name'] = !empty($receiving_info['supplier_id']) ? $receiving_info['company_name'] : '';
-		$data['selected_supplier_id'] = $receiving_info['supplier_id'];
-		$data['receiving_info'] = $receiving_info;
-	
-		$this->load->view('receivings/form', $data);
-	}
-
-	public function delete_item($item_number)
-	{
-		$this->receiving_lib->delete_item($item_number);
-
-		$this->_reload();
-	}
-	
-	public function delete($receiving_id = -1, $update_inventory = TRUE) 
-	{
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$receiving_ids = $receiving_id == -1 ? $this->input->post('ids') : array($receiving_id);
-	
-		if($this->Receiving->delete_list($receiving_ids, $employee_id, $update_inventory))
-		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('receivings_successfully_deleted') . ' ' .
-							count($receiving_ids) . ' ' . $this->lang->line('receivings_one_or_multiple'), 'ids' => $receiving_ids));
-		}
-		else
-		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('receivings_cannot_be_deleted')));
-		}
-	}
-
-	public function remove_supplier()
-	{
-		$this->receiving_lib->clear_reference();
-		$this->receiving_lib->remove_supplier();
-
-		$this->_reload();
-	}
-
-	public function complete()
-	{
-		$data = array();
-		
-		$data['cart'] = $this->receiving_lib->get_cart();
-		$data['total'] = $this->receiving_lib->get_total();
-		$data['transaction_time'] = to_datetime(time());
-		$data['mode'] = $this->receiving_lib->get_mode();
-		$data['comment'] = $this->receiving_lib->get_comment();
-		$data['reference'] = $this->receiving_lib->get_reference();
-		$data['payment_type'] = $this->input->post('payment_type');
-		$data['show_stock_locations'] = $this->Stock_location->show_locations('receivings');
-		$data['stock_location'] = $this->receiving_lib->get_stock_source();
-		if($this->input->post('amount_tendered') != NULL)
-		{
-			$data['amount_tendered'] = $this->input->post('amount_tendered');
-			$data['amount_change'] = to_currency($data['amount_tendered'] - $data['total']);
-		}
-		
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$employee_info = $this->Employee->get_info($employee_id);
-		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
-
-		$supplier_info = '';
-		$supplier_id = $this->receiving_lib->get_supplier();
-		if($supplier_id != -1)
-		{
-			$supplier_info = $this->Supplier->get_info($supplier_id);
-			$data['supplier'] = $supplier_info->company_name;
-			$data['first_name'] = $supplier_info->first_name;
-			$data['last_name'] = $supplier_info->last_name;
-			$data['supplier_email'] = $supplier_info->email;
-			$data['supplier_address'] = $supplier_info->address_1;
-			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
-			{
-				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;				
-			}
-			else
-			{
-				$data['supplier_location'] = '';
-			}
-		}
-
-		//SAVE receiving to database
-		$data['receiving_id'] = 'RECV ' . $this->Receiving->save($data['cart'], $supplier_id, $employee_id, $data['comment'], $data['reference'], $data['payment_type'], $data['stock_location']);
-
-		$data = $this->xss_clean($data);
-
-		if($data['receiving_id'] == 'RECV -1')
-		{
-			$data['error_message'] = $this->lang->line('receivings_transaction_failed');
-		}
-		else
-		{
-			$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);				
-		}
-
-		$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
-
-		$this->load->view("receivings/receipt",$data);
-
-		$this->receiving_lib->clear_all();
-	}
-
-	public function requisition_complete()
-	{
-		if($this->receiving_lib->get_stock_source() != $this->receiving_lib->get_stock_destination()) 
-		{
-			foreach($this->receiving_lib->get_cart() as $item)
-			{
-				$this->receiving_lib->delete_item($item['line']);
-				$this->receiving_lib->add_item($item['item_id'], $item['quantity'], $this->receiving_lib->get_stock_destination(), $item['discount_type']);
-				$this->receiving_lib->add_item($item['item_id'], -$item['quantity'], $this->receiving_lib->get_stock_source(), $item['discount_type']);
-			}
-			
-			$this->complete();
-		}
-		else 
-		{
-			$data['error'] = $this->lang->line('receivings_error_requisition');
-
-			$this->_reload($data);	
-		}
-	}
-	
-	public function receipt($receiving_id)
-	{
-		$receiving_info = $this->Receiving->get_info($receiving_id)->row_array();
-		$this->receiving_lib->copy_entire_receiving($receiving_id);
-		$data['cart'] = $this->receiving_lib->get_cart();
-		$data['total'] = $this->receiving_lib->get_total();
-		$data['mode'] = $this->receiving_lib->get_mode();
-		$data['transaction_time'] = to_datetime(strtotime($receiving_info['receiving_time']));
-		$data['show_stock_locations'] = $this->Stock_location->show_locations('receivings');
-		$data['payment_type'] = $receiving_info['payment_type'];
-		$data['reference'] = $this->receiving_lib->get_reference();
-		$data['receiving_id'] = 'RECV ' . $receiving_id;
-		$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
-		$employee_info = $this->Employee->get_info($receiving_info['employee_id']);
-		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
-
-		$supplier_id = $this->receiving_lib->get_supplier();
-		if($supplier_id != -1)
-		{
-			$supplier_info = $this->Supplier->get_info($supplier_id);
-			$data['supplier'] = $supplier_info->company_name;
-			$data['first_name'] = $supplier_info->first_name;
-			$data['last_name'] = $supplier_info->last_name;
-			$data['supplier_email'] = $supplier_info->email;
-			$data['supplier_address'] = $supplier_info->address_1;
-			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
-			{
-				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;				
-			}
-			else
-			{
-				$data['supplier_location'] = '';
-			}
-		}
-
-		$data['print_after_sale'] = FALSE;
-
-		$data = $this->xss_clean($data);
-		
-		$this->load->view("receivings/receipt", $data);
-
-		$this->receiving_lib->clear_all();
-	}
-
-	private function _reload($data = array())
-	{
-		$data['cart'] = $this->receiving_lib->get_cart();
-		$data['modes'] = array('receive' => $this->lang->line('receivings_receiving'), 'return' => $this->lang->line('receivings_return'));
-		$data['mode'] = $this->receiving_lib->get_mode();
-		$data['stock_locations'] = $this->Stock_location->get_allowed_locations('receivings');
-		$data['show_stock_locations'] = count($data['stock_locations']) > 1;
-		if($data['show_stock_locations']) 
-		{
-			$data['modes']['requisition'] = $this->lang->line('receivings_requisition');
-			$data['stock_source'] = $this->receiving_lib->get_stock_source();
-			$data['stock_destination'] = $this->receiving_lib->get_stock_destination();
-		}
-
-		$data['total'] = $this->receiving_lib->get_total();
-		$data['items_module_allowed'] = $this->Employee->has_grant('items', $this->Employee->get_logged_in_employee_info()->person_id);
-		$data['comment'] = $this->receiving_lib->get_comment();
-		$data['reference'] = $this->receiving_lib->get_reference();
-		$data['payment_options'] = $this->Receiving->get_payment_options();
-
-		$supplier_id = $this->receiving_lib->get_supplier();
-		$supplier_info = '';
-		if($supplier_id != -1)
-		{
-			$supplier_info = $this->Supplier->get_info($supplier_id);
-			$data['supplier'] = $supplier_info->company_name;
-			$data['first_name'] = $supplier_info->first_name;
-			$data['last_name'] = $supplier_info->last_name;
-			$data['supplier_email'] = $supplier_info->email;
-			$data['supplier_address'] = $supplier_info->address_1;
-			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
-			{
-				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;				
-			}
-			else
-			{
-				$data['supplier_location'] = '';
-			}
-		}
-		
-		$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
-
-		$data = $this->xss_clean($data);
-
-		$this->load->view("receivings/receiving", $data);
-	}
-	
-	public function save($receiving_id = -1)
-	{
-		$newdate = $this->input->post('date');
-		
-		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
-		$receiving_time = $date_formatter->format('Y-m-d H:i:s');
-
-		$receiving_data = array(
-			'receiving_time' => $receiving_time,
-			'supplier_id' => $this->input->post('supplier_id') ? $this->input->post('supplier_id') : NULL,
-			'employee_id' => $this->input->post('employee_id'),
-			'comment' => $this->input->post('comment'),
-			'reference' => $this->input->post('reference') != '' ? $this->input->post('reference') : NULL
-		);
-
-		$this->Inventory->update('RECV '.$receiving_id, ['trans_date' => $receiving_time]);
-		if($this->Receiving->update($receiving_data, $receiving_id))
-		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('receivings_successfully_updated'), 'id' => $receiving_id));
-		}
-		else
-		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('receivings_unsuccessfully_updated'), 'id' => $receiving_id));
-		}
-	}
-
-	public function cancel_receiving()
-	{
-		$this->receiving_lib->clear_all();
-
-		$this->_reload();
-	}
-}
-?>
+<?php
+
+namespace App\Controllers;
+
+use app\Libraries\Receiving_lib;
+use app\Libraries\Token_lib;
+use app\Libraries\Barcode_lib;
+use app\Models\Inventory;
+use app\Models\Item;
+use app\Models\Item_kit;
+use app\Models\Receiving;
+use app\Models\Stock_location;
+use app\Models\Supplier;
+use ReflectionException;
+
+/**
+ * @property receiving_lib receiving_lib
+ * @property token_lib token_lib
+ * @property barcode_lib barcode_lib
+ * @property inventory inventory
+ * @property item item
+ * @property item_kit item_kit
+ * @property receiving receiving
+ * @property stock_location stock_location
+ * @property supplier supplier
+ */
+class Receivings extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('receivings');
+
+		$this->receiving_lib = new Receiving_lib();
+		$this->token_lib = new Token_lib();
+		$this->barcode_lib = new Barcode_lib();
+
+		$this->inventory = model('Inventory');
+		$this->item_kit = model('Item_kit');
+		$this->item = model('Item');
+		$this->receiving = model('Receiving');
+		$this->stock_location = model('Stock_location');
+		$this->supplier = model('Supplier');
+	}
+
+	public function index(): void
+	{
+		$this->_reload();
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function item_search(): void
+	{
+		$suggestions = $this->item->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), ['search_custom' => FALSE, 'is_deleted' => FALSE], TRUE);
+		$suggestions = array_merge($suggestions, $this->item_kit->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING)));
+
+		echo json_encode($suggestions);
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function stock_item_search(): void
+	{
+		$suggestions = $this->item->get_stock_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), ['search_custom' => FALSE, 'is_deleted' => FALSE], TRUE);
+		$suggestions = array_merge($suggestions, $this->item_kit->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING)));
+
+		echo json_encode($suggestions);
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function select_supplier(): void
+	{
+		$supplier_id = $this->request->getPost('supplier', FILTER_SANITIZE_NUMBER_INT);
+		if($this->supplier->exists($supplier_id))
+		{
+			$this->receiving_lib->set_supplier($supplier_id);
+		}
+
+		$this->_reload();	//TODO: Hungarian notation
+	}
+
+	public function change_mode(): void
+	{
+		$stock_destination = $this->request->getPost('stock_destination', FILTER_SANITIZE_STRING);
+		$stock_source = $this->request->getPost('stock_source', FILTER_SANITIZE_NUMBER_INT);
+
+		if((!$stock_source || $stock_source == $this->receiving_lib->get_stock_source()) &&
+			(!$stock_destination || $stock_destination == $this->receiving_lib->get_stock_destination()))
+		{
+			$this->receiving_lib->clear_reference();
+			$mode = $this->request->getPost('mode', FILTER_SANITIZE_STRING);
+			$this->receiving_lib->set_mode($mode);
+		}
+		elseif($this->stock_location->is_allowed_location($stock_source, 'receivings'))
+		{
+			$this->receiving_lib->set_stock_source($stock_source);
+			$this->receiving_lib->set_stock_destination($stock_destination);
+		}
+
+		$this->_reload();	//TODO: Hungarian notation
+	}
+	
+	public function set_comment(): void
+	{
+		$this->receiving_lib->set_comment($this->request->getPost('comment', FILTER_SANITIZE_STRING));
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function set_print_after_sale(): void
+	{
+		$this->receiving_lib->set_print_after_sale($this->request->getPost('recv_print_after_sale', FILTER_SANITIZE_NUMBER_INT));
+	}
+	
+	public function set_reference(): void
+	{
+		$this->receiving_lib->set_reference($this->request->getPost('recv_reference', FILTER_SANITIZE_STRING));
+	}
+	
+	public function add(): void
+	{
+		$data = [];
+
+		$mode = $this->receiving_lib->get_mode();
+		$item_id_or_number_or_item_kit_or_receipt = $this->request->getPost('item', FILTER_SANITIZE_STRING);
+		$this->token_lib->parse_barcode($quantity, $price, $item_id_or_number_or_item_kit_or_receipt);
+		$quantity = ($mode == 'receive' || $mode == 'requisition') ? $quantity : -$quantity;
+		$item_location = $this->receiving_lib->get_stock_source();
+		$discount = config('OSPOS')->default_receivings_discount;
+		$discount_type = config('OSPOS')->default_receivings_discount_type;
+
+		if($mode == 'return' && $this->receiving->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt))
+		{
+			$this->receiving_lib->return_entire_receiving($item_id_or_number_or_item_kit_or_receipt);
+		}
+		elseif($this->item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
+		{
+			$this->receiving_lib->add_item_kit($item_id_or_number_or_item_kit_or_receipt, $item_location, $discount, $discount_type);
+		}
+		elseif(!$this->receiving_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount,  $discount_type))
+		{
+			$data['error'] = lang('Receivings.unable_to_add_item');
+		}
+
+		$this->_reload($data);	//TODO: Hungarian notation
+	}
+
+	/**
+	 * Called in the view.
+	 *
+	 * @param $item_id
+	 * @return void
+	 */
+	public function edit_item($item_id): void
+	{
+		$data = [];
+
+		$this->validator->setRule('price', 'lang:items_price', 'required|numeric');
+		$this->validator->setRule('quantity', 'lang:items_quantity', 'required|numeric');
+		$this->validator->setRule('discount', 'lang:items_discount', 'required|numeric');
+
+		$description = $this->request->getPost('description', FILTER_SANITIZE_STRING);	//TODO: Duplicated code
+		$serialnumber = $this->request->getPost('serialnumber', FILTER_SANITIZE_STRING);
+		$price = parse_decimals($this->request->getPost('price', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$quantity = parse_quantity($this->request->getPost('quantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$discount_type = $this->request->getPost('discount_type', FILTER_SANITIZE_NUMBER_INT);
+		$discount = $discount_type
+			? parse_quantity($this->request->getPost('discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION))
+			: parse_decimals($this->request->getPost('discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+
+		$receiving_quantity = $this->request->getPost('receiving_quantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+
+		if(!$this->validate([]))
+		{
+			$this->receiving_lib->edit_item($item_id, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $receiving_quantity);
+		}
+		else
+		{
+			$data['error']=lang('Receivings.error_editing_item');
+		}
+
+		$this->_reload($data);	//TODO: Hungarian notation
+	}
+	
+	public function edit($receiving_id): void
+	{
+		$data = [];
+
+		$data['suppliers'] = ['' => 'No Supplier'];
+		foreach($this->supplier->get_all()->getResult() as $supplier)
+		{
+			$data['suppliers'][$supplier->person_id] = $supplier->first_name . ' ' . $supplier->last_name;
+		}
+	
+		$data['employees'] = [];
+		foreach($this->employee->get_all()->getResult() as $employee)
+		{
+			$data['employees'][$employee->person_id] = $employee->first_name . ' '. $employee->last_name;
+		}
+	
+		$receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
+		$data['selected_supplier_name'] = !empty($receiving_info['supplier_id']) ? $receiving_info['company_name'] : '';
+		$data['selected_supplier_id'] = $receiving_info['supplier_id'];
+		$data['receiving_info'] = $receiving_info;
+	
+		echo view('receivings/form', $data);
+	}
+
+	/**
+	 * Called in the view.
+	 *
+	 * @param $item_number
+	 * @return void
+	 */
+	public function delete_item($item_number): void
+	{
+		$this->receiving_lib->delete_item($item_number);
+
+		$this->_reload();	//TODO: Hungarian notation
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function delete(int $receiving_id = -1, bool $update_inventory = TRUE) : void
+	{
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$receiving_ids = $receiving_id == -1 ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$receiving_id];	//TODO: Replace -1 with constant
+	
+		if($this->receiving->delete_list($receiving_ids, $employee_id, $update_inventory))	//TODO: Likely need to surround this block of code in a try-catch to catch the ReflectionException
+		{
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Receivings.successfully_deleted') . ' ' . count($receiving_ids) . ' ' . lang('Receivings.one_or_multiple'),
+				'ids' => $receiving_ids]);
+		}
+		else
+		{
+			echo json_encode (['success' => FALSE, 'message' => lang('Receivings.cannot_be_deleted')]);
+		}
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function remove_supplier(): void
+	{
+		$this->receiving_lib->clear_reference();
+		$this->receiving_lib->remove_supplier();
+
+		$this->_reload();	//TODO: Hungarian notation
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function complete(): void
+	{
+		$data = [];
+		
+		$data['cart'] = $this->receiving_lib->get_cart();
+		$data['total'] = $this->receiving_lib->get_total();
+		$data['transaction_time'] = to_datetime(time());
+		$data['mode'] = $this->receiving_lib->get_mode();
+		$data['comment'] = $this->receiving_lib->get_comment();
+		$data['reference'] = $this->receiving_lib->get_reference();
+		$data['payment_type'] = $this->request->getPost('payment_type', FILTER_SANITIZE_STRING);
+		$data['show_stock_locations'] = $this->stock_location->show_locations('receivings');
+		$data['stock_location'] = $this->receiving_lib->get_stock_source();
+		if($this->request->getPost('amount_tendered') != NULL)
+		{
+			$data['amount_tendered'] = $this->request->getPost('amount_tendered', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$data['amount_change'] = to_currency($data['amount_tendered'] - $data['total']);
+		}
+		
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$employee_info = $this->employee->get_info($employee_id);
+		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
+
+		$supplier_id = $this->receiving_lib->get_supplier();
+		if($supplier_id != -1)
+		{
+			$supplier_info = $this->supplier->get_info($supplier_id);
+			$data['supplier'] = $supplier_info->company_name;	//TODO: duplicated code
+			$data['first_name'] = $supplier_info->first_name;
+			$data['last_name'] = $supplier_info->last_name;
+			$data['supplier_email'] = $supplier_info->email;
+			$data['supplier_address'] = $supplier_info->address_1;
+			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
+			{
+				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;
+			}
+			else
+			{
+				$data['supplier_location'] = '';
+			}
+		}
+
+		//SAVE receiving to database
+		$data['receiving_id'] = 'RECV ' . $this->receiving->save_value($data['cart'], $supplier_id, $employee_id, $data['comment'], $data['reference'], $data['payment_type'], $data['stock_location']);
+
+		if($data['receiving_id'] == 'RECV -1')
+		{
+			$data['error_message'] = lang('Receivings.transaction_failed');
+		}
+		else
+		{
+			$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
+		}
+
+		$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
+
+		echo view("receivings/receipt",$data);
+
+		$this->receiving_lib->clear_all();
+	}
+
+	/**
+	 * Called in the view.
+	 *
+	 * @throws ReflectionException
+	 */
+	public function requisition_complete(): void
+	{
+		if($this->receiving_lib->get_stock_source() != $this->receiving_lib->get_stock_destination()) 
+		{
+			foreach($this->receiving_lib->get_cart() as $item)
+			{
+				$this->receiving_lib->delete_item($item['line']);
+				$this->receiving_lib->add_item($item['item_id'], $item['quantity'], $this->receiving_lib->get_stock_destination(), $item['discount_type']);
+				$this->receiving_lib->add_item($item['item_id'], -$item['quantity'], $this->receiving_lib->get_stock_source(), $item['discount_type']);
+			}
+			
+			$this->complete();
+		}
+		else 
+		{
+			$data['error'] = lang('Receivings.error_requisition');
+
+			$this->_reload($data);	//TODO: Hungarian notation
+		}
+	}
+	
+	public function receipt($receiving_id): void
+	{
+		$receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
+		$this->receiving_lib->copy_entire_receiving($receiving_id);
+		$data['cart'] = $this->receiving_lib->get_cart();
+		$data['total'] = $this->receiving_lib->get_total();
+		$data['mode'] = $this->receiving_lib->get_mode();
+		$data['transaction_time'] = to_datetime(strtotime($receiving_info['receiving_time']));
+		$data['show_stock_locations'] = $this->stock_location->show_locations('receivings');
+		$data['payment_type'] = $receiving_info['payment_type'];
+		$data['reference'] = $this->receiving_lib->get_reference();
+		$data['receiving_id'] = 'RECV ' . $receiving_id;
+		$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
+		$employee_info = $this->employee->get_info($receiving_info['employee_id']);
+		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
+
+		$supplier_id = $this->receiving_lib->get_supplier();	//TODO: Duplicated code
+		if($supplier_id != -1)
+		{
+			$supplier_info = $this->supplier->get_info($supplier_id);
+			$data['supplier'] = $supplier_info->company_name;
+			$data['first_name'] = $supplier_info->first_name;
+			$data['last_name'] = $supplier_info->last_name;
+			$data['supplier_email'] = $supplier_info->email;
+			$data['supplier_address'] = $supplier_info->address_1;
+			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
+			{
+				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;
+			}
+			else
+			{
+				$data['supplier_location'] = '';
+			}
+		}
+
+		$data['print_after_sale'] = FALSE;
+
+		echo view("receivings/receipt", $data);
+
+		$this->receiving_lib->clear_all();
+	}
+
+	private function _reload($data = []): void	//TODO: Hungarian notation
+	{
+		$data['cart'] = $this->receiving_lib->get_cart();
+		$data['modes'] = ['receive' => lang('Receivings.receiving'), 'return' => lang('Receivings.return')];
+		$data['mode'] = $this->receiving_lib->get_mode();
+		$data['stock_locations'] = $this->stock_location->get_allowed_locations('receivings');
+		$data['show_stock_locations'] = count($data['stock_locations']) > 1;
+		if($data['show_stock_locations']) 
+		{
+			$data['modes']['requisition'] = lang('Receivings.requisition');
+			$data['stock_source'] = $this->receiving_lib->get_stock_source();
+			$data['stock_destination'] = $this->receiving_lib->get_stock_destination();
+		}
+
+		$data['total'] = $this->receiving_lib->get_total();
+		$data['items_module_allowed'] = $this->employee->has_grant('items', $this->employee->get_logged_in_employee_info()->person_id);
+		$data['comment'] = $this->receiving_lib->get_comment();
+		$data['reference'] = $this->receiving_lib->get_reference();
+		$data['payment_options'] = $this->receiving->get_payment_options();
+
+		$supplier_id = $this->receiving_lib->get_supplier();
+
+		if($supplier_id != -1)	//TODO: Duplicated Code... replace -1 with a constant
+		{
+			$supplier_info = $this->supplier->get_info($supplier_id);
+			$data['supplier'] = $supplier_info->company_name;
+			$data['first_name'] = $supplier_info->first_name;
+			$data['last_name'] = $supplier_info->last_name;
+			$data['supplier_email'] = $supplier_info->email;
+			$data['supplier_address'] = $supplier_info->address_1;
+			if(!empty($supplier_info->zip) or !empty($supplier_info->city))
+			{
+				$data['supplier_location'] = $supplier_info->zip . ' ' . $supplier_info->city;
+			}
+			else
+			{
+				$data['supplier_location'] = '';
+			}
+		}
+		
+		$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
+
+		echo view("receivings/receiving", $data);
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save(int $receiving_id = -1): void	//TODO: Replace -1 with a constant
+	{
+		$newdate = $this->request->getPost('date', FILTER_SANITIZE_STRING);	//TODO: newdate does not follow naming conventions
+		
+		$date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $newdate);
+		$receiving_time = $date_formatter->format('Y-m-d H:i:s');
+
+		$receiving_data = [
+			'receiving_time' => $receiving_time,
+			'supplier_id' => $this->request->getPost('supplier_id') ? $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT) : NULL,
+			'employee_id' => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
+			'comment' => $this->request->getPost('comment', FILTER_SANITIZE_STRING),
+			'reference' => $this->request->getPost('reference') != '' ? $this->request->getPost('reference', FILTER_SANITIZE_STRING) : NULL
+		];
+
+		$this->inventory->update('RECV '.$receiving_id, ['trans_date' => $receiving_time]);
+		if($this->receiving->update($receiving_id, $receiving_data))
+		{
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Receivings.successfully_updated'),
+				'id' => $receiving_id
+			]);
+		}
+		else
+		{
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Receivings.unsuccessfully_updated'),
+				'id' => $receiving_id
+			]);
+		}
+	}
+
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function cancel_receiving(): void
+	{
+		$this->receiving_lib->clear_all();
+
+		$this->_reload();	//TODO: Hungarian Notation
+	}
+}
\ No newline at end of file
diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php
index e90481706..e7edc4dc6 100644
--- a/app/Controllers/Reports.php
+++ b/app/Controllers/Reports.php
@@ -1,14 +1,66 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once('Secure_Controller.php');
+namespace App\Controllers;
 
+use app\Models\Attribute;
+use app\Models\Customer;
+use app\Models\Stock_location;
+use app\Models\Supplier;
+use app\Models\Reports\Detailed_receivings;
+use app\Models\Reports\Detailed_sales;
+use app\Models\Reports\Inventory_low;
+use app\Models\Reports\Inventory_summary;
+use app\Models\Reports\Specific_customer;
+use app\Models\Reports\Specific_discount;
+use app\Models\Reports\Specific_employee;
+use app\Models\Reports\Specific_supplier;
+use app\Models\Reports\Summary_categories;
+use app\Models\Reports\Summary_customers;
+use app\Models\Reports\Summary_discounts;
+use app\Models\Reports\Summary_employees;
+use app\Models\Reports\Summary_expenses_categories;
+use app\Models\Reports\Summary_items;
+use app\Models\Reports\Summary_payments;
+use app\Models\Reports\Summary_sales;
+use app\Models\Reports\Summary_sales_taxes;
+use app\Models\Reports\Summary_suppliers;
+use app\Models\Reports\Summary_taxes;
+use CodeIgniter\HTTP\Uri;
+
+/**
+ * @property attribute attribute
+ * @property customer customer
+ * @property stock_location stock_location
+ * @property supplier supplier
+ * @property detailed_receivings detailed_receivings
+ * @property detailed_sales detailed_sales
+ * @property inventory_low inventory_low
+ * @property inventory_summary inventory_summary
+ * @property specific_customer specific_customer
+ * @property specific_discount specific_discount
+ * @property specific_employee specific_employee
+ * @property specific_supplier specific_supplier
+ * @property summary_categories summary_categories
+ * @property summary_customers summary_customers
+ * @property summary_discounts summary_discounts
+ * @property summary_employees summary_employees
+ * @property summary_expenses_categories summary_expenses_categories
+ * @property summary_items summary_items
+ * @property summary_payments summary_payments
+ * @property summary_sales summary_sales
+ * @property summary_sales_taxes summary_sales_taxes
+ * @property summary_suppliers summary_suppliers
+ * @property summary_taxes summary_taxes
+ * @property URI uri
+ */
 class Reports extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('reports');
 
-		$method_name = $this->uri->segment(2);
+		$this->uri->setURI(uri_string());
+		$method_name = $this->uri->getSegment(2);
 		$exploder = explode('_', $method_name);
 
 		if(sizeof($exploder) > 1)
@@ -18,38 +70,50 @@ class Reports extends Secure_Controller
 			$submodule_id = $matches[1] . ((count($matches) > 2) ? $matches[2] : 's');
 
 			// check access to report submodule
-			if(!$this->Employee->has_grant('reports_' . $submodule_id, $this->Employee->get_logged_in_employee_info()->person_id))
+			if(!$this->employee->has_grant('reports_' . $submodule_id, $this->employee->get_logged_in_employee_info()->person_id))
 			{
 				redirect('no_access/reports/reports_' . $submodule_id);
 			}
 		}
 
-		$this->load->helper('report');
+		helper('report');
 	}
 
 	//Initial Report listing screen
-	public function index()
+	public function index(): void
 	{
-		$data['grants'] = $this->xss_clean($this->Employee->get_employee_grants($this->session->userdata('person_id')));
+		$data['grants'] = $this->employee->get_employee_grants($this->session->get('person_id'));
 
-		$this->load->view('reports/listing', $data);
+		echo view('reports/listing', $data);
 	}
 
-	//Summary sales report
-	public function summary_sales($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	/**
+	 * Summary Sales Report.  Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void	//TODO: Perhaps these need to be passed as an array?  Too many parameters in the signature.
+	{//TODO: Duplicated code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_sales');
-		$model = $this->Summary_sales;
+		$this->summary_sales = model('reports/Summary_sales');
+		$model = $this->summary_sales;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
@@ -58,35 +122,47 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_sales_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.sales_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Categories report
-	public function summary_categories($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	/**
+	 * Summary Categories report. Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_categories');
-		$model = $this->Summary_categories;
+		$this->summary_categories = model('reports/Summary_categories');
+		$model = $this->summary_categories;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'category' => $row['category'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
@@ -94,68 +170,87 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_categories_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.categories_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Expenses by Categories report
-	public function summary_expenses_categories($start_date, $end_date, $sale_type)
+	/**
+	 * Summary Expenses by Categories report.  Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @return void
+	 */
+	public function summary_expenses_categories(string $start_date, string $end_date, string $sale_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type);
+		$inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type];	//TODO: Duplicated Code
 
-		$this->load->model('reports/Summary_expenses_categories');
-		$model = $this->Summary_expenses_categories;
+		$this->summary_expenses_categories = model('reports/Summary_expenses_categories');
+		$model = $this->summary_expenses_categories;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'category_name' => $row['category_name'],
 				'count' => $row['count'],
 				'total_amount' => to_currency($row['total_amount']),
 				'total_tax_amount' => to_currency($row['total_tax_amount'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_expenses_categories_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.expenses_categories_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Customers report
-	public function summary_customers($start_date, $end_date, $sale_type, $location_id = 'all')
+	/**
+	 * Summary Customers report. Called in the view
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [	//TODO: Duplicated Code
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_customers');
-		$model = $this->Summary_customers;
+		$this->summary_customers = model('reports/Summary_customers');
+		$model = $this->summary_customers;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$tabular_data = [];
 
-		$tabular_data = array();
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'customer_name' => $row['customer'],
 				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
@@ -164,35 +259,47 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_customers_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.customers_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Suppliers report
-	public function summary_suppliers($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	/**
+	 * Summary Suppliers report. Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_suppliers');
-		$model = $this->Summary_suppliers;
+		$this->summary_suppliers = model('reports/Summary_suppliers');
+		$model = $this->summary_suppliers;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'supplier_name' => $row['supplier'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
@@ -200,38 +307,50 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_suppliers_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.suppliers_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Items report
-	public function summary_items($start_date, $end_date, $sale_type, $location_id = 'all')
+	/**
+	 * Summary Items report. Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_items');
-		$model = $this->Summary_items;
+		$this->summary_items = model('reports/Summary_items');
+		$model = $this->summary_items;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$tabular_data = [];
 
-		$tabular_data = array();
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'item_name' => $row['name'],
 				'category' => $row['category'],
-				'cost_price' => $row['cost_price'],
 				'unit_price' => $row['unit_price'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),
@@ -239,35 +358,48 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_items_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.items_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Employees report
-	public function summary_employees($start_date, $end_date, $sale_type, $location_id = 'all')
+	/**
+	 * Summary Employees report. Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_employees');
-		$model = $this->Summary_employees;
+		$this->summary_employees = model('reports/summary_employees');
+		$model = $this->summary_employees;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$tabular_data = [];
 
-		$tabular_data = array();
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'employee_name' => $row['employee'],
 				'sales' => to_quantity_decimals($row['sales']),
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
@@ -276,153 +408,179 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_employees_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.employees_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	//Summary Taxes report
-	public function summary_taxes($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	/**
+	 * Summary Taxes report. Called in the view.
+	 * @param string $start_date
+	 * @param string $end_date
+	 * @param string $sale_type
+	 * @param string $location_id
+	 * @return void
+	 */
+	public function summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicate Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_taxes');
-		$model = $this->Summary_taxes;
+		$this->summary_taxes = model('reports/Summary_taxes');
+		$model = $this->summary_taxes;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$tabular_data = [];
 
-		$tabular_data = array();
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
-				'tax_name' => $row['name'],
+			$tabular_data[] = [
 				'tax_percent' => $row['percent'],
 				'report_count' => $row['count'],
 				'subtotal' => to_currency($row['subtotal']),
 				'tax' => to_currency_tax($row['tax']),
 				'total' => to_currency($row['total'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_taxes_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.taxes_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
 	//Summary Sales Taxes report
-	public function summary_sales_taxes($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_sales_taxes');
-		$model = $this->Summary_sales_taxes;
+		$this->summary_sales_taxes = model('reports/Summary_sales_taxes');
+		$model = $this->summary_sales_taxes;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'reporting_authority' => $row['reporting_authority'],
 				'jurisdiction_name' => $row['jurisdiction_name'],
 				'tax_category' => $row['tax_category'],
 				'tax_rate' => $row['tax_rate'],
 				'tax' => to_currency_tax($row['tax'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_sales_taxes_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.sales_taxes_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	public function summary_discounts_input()
+	public function summary_discounts_input(): void
 	{
-		$data = array();
-		$stock_locations = $data = $this->xss_clean($this->Stock_location->get_allowed_locations('sales'));
-		$stock_locations['all'] = $this->lang->line('reports_all');
+		$stock_locations = $data = $this->stock_location->get_allowed_locations('sales');
+		$stock_locations['all'] = lang('Reports.all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
 		$data['mode'] = 'sale';
-		$data['discount_type_options'] = array(
-			'0' => $this->lang->line('reports_discount_percent'),
-			'1' => $this->lang->line('reports_discount_fixed'));
+		$data['discount_type_options'] = ['0' => lang('Reports.discount_percent'), '1'=> lang('Reports.discount_fixed')];
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$this->load->view('reports/date_input', $data);
+		echo view('reports/date_input', $data);
 	}
 
 	//Summary Discounts report
-	public function summary_discounts($start_date, $end_date, $sale_type, $location_id = 'all', $discount_type=0)
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id,'discount_type'=>$discount_type);
+	public function summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id,
+			'discount_type' => $discount_type
+		];
 
-		$this->load->model('reports/Summary_discounts');
-		$model = $this->Summary_discounts;
+		$this->summary_discounts = model('reports/Summary_discounts');
+		$model = $this->summary_discounts;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'total' => to_currency($row['total']),
 				'discount' => $row['discount'],
 				'count' => $row['count']
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_discounts_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.discounts_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
 	//Summary Payments report
-	public function summary_payments($start_date, $end_date)
+	public function summary_payments(string $start_date, string $end_date): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => 'complete', 'location_id' => 'all');
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => 'complete',
+			'location_id' => 'all'
+		];
 
-		$this->load->model('reports/Summary_payments');
-		$model = $this->Summary_payments;
+		$this->summary_payments = model('reports/Summary_payments');
+		$model = $this->summary_payments;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$tabular_data = [];
 
-		$tabular_data = array();
 		foreach($report_data as $row)
 		{
 			if($row['trans_group'] == '<HR>')
 			{
-				$tabular_data[] = array(
+				$tabular_data[] = [
 					'trans_group' => '--',
 					'trans_type' => '--',
 					'trans_sales' => '--',
@@ -430,16 +588,16 @@ class Reports extends Secure_Controller
 					'trans_payments' => '--',
 					'trans_refunded' => '--',
 					'trans_due' => '--'
-				);
+				];
 			}
 			else
 			{
 				if(empty($row['trans_type']))
 				{
-					$row['trans_type'] = $this->lang->line('reports_trans_nopay_sales');
+					$row['trans_type'] = lang('Reports.trans_nopay_sales');
 				}
 
-				$tabular_data[] = $this->xss_clean(array(
+				$tabular_data[] = [
 					'trans_group' => $row['trans_group'],
 					'trans_type' => $row['trans_type'],
 					'trans_sales' => $row['trans_sales'],
@@ -447,524 +605,562 @@ class Reports extends Secure_Controller
 					'trans_payments' => to_currency($row['trans_payments']),
 					'trans_refunded' => to_currency($row['trans_refunded']),
 					'trans_due' => to_currency($row['trans_due'])
-				));
+				];
 			}
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_payments_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$data = [
+			'title' => lang('Reports.payments_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
 			'summary_data' => $summary
-		);
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
 	//Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here)
-	public function date_input()
-	{
-		$data = array();
-		$stock_locations = $data = $this->xss_clean($this->Stock_location->get_allowed_locations('sales'));
-		$stock_locations['all'] = $this->lang->line('reports_all');
+	public function date_input(): void
+	{//TODO: Duplicated Code
+		$stock_locations = $data = $this->stock_location->get_allowed_locations('sales');
+		$stock_locations['all'] = lang('Reports.all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
 		$data['mode'] = 'sale';
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$this->load->view('reports/date_input', $data);
+		echo view('reports/date_input', $data);
 	}
 
 	//Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here)
-	public function date_input_only()
+	public function date_input_only(): void
 	{
-		$data = array();
-
-		$this->load->view('reports/date_input', $data);
+		$data = [];
+		echo view('reports/date_input', $data);
 	}
 
 	//Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here)
-	public function date_input_sales()
-	{
-		$data = array();
-		$stock_locations = $data = $this->xss_clean($this->Stock_location->get_allowed_locations('sales'));
-		$stock_locations['all'] =  $this->lang->line('reports_all');
+	public function date_input_sales(): void
+	{//TODO: Duplicated Code
+		$stock_locations = $data = $this->stock_location->get_allowed_locations('sales');
+		$stock_locations['all'] =  lang('Reports.all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
 		$data['mode'] = 'sale';
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$this->load->view('reports/date_input', $data);
+		echo view('reports/date_input', $data);
 	}
 
-	public function date_input_recv()
+	public function date_input_recv(): void
 	{
-		$data = array();
-		$stock_locations = $data = $this->xss_clean($this->Stock_location->get_allowed_locations('receivings'));
-		$stock_locations['all'] =  $this->lang->line('reports_all');
+		$stock_locations = $data = $this->stock_location->get_allowed_locations('receivings');
+		$stock_locations['all'] =  lang('Reports.all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
 		$data['mode'] = 'receiving';
 
-		$this->load->view('reports/date_input', $data);
+		echo view('reports/date_input', $data);
 	}
 
 	//Graphical Expenses by Categories report
-	public function graphical_summary_expenses_categories($start_date, $end_date, $sale_type)
+	public function graphical_summary_expenses_categories(string $start_date, string $end_date, string $sale_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type
+		];
 
-		$this->load->model('reports/Summary_expenses_categories');
-		$model = $this->Summary_expenses_categories;
+		$this->summary_expenses_categories = model('reports/Summary_expenses_categories');
+		$model = $this->summary_expenses_categories;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$labels = array();
-		$series = array();
+		$labels = [];
+		$series = [];
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['category_name'];
-			$series[] = array('meta' => $row['category_name'] . ' ' . round($row['total_amount'] / $summary['expenses_total_amount'] * 100, 2) . '%', 'value' => $row['total_amount']);
+			$series[] = [
+				'meta' => $row['category_name'] . ' ' . round($row['total_amount'] / $summary['expenses_total_amount'] * 100, 2) . '%',
+				'value' => $row['total_amount']
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_expenses_categories_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.expenses_categories_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary sales report
-	public function graphical_summary_sales($start_date, $end_date, $sale_type, $location_id = 'all')
+	public function graphical_summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_sales');
-		$model = $this->Summary_sales;
+		$this->summary_sales = model('reports/Summary_sales');
+		$model = $this->summary_sales;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$labels = array();
-		$series = array();
+		$labels = [];
+		$series = [];
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$date = to_date(strtotime($row['sale_date']));
 			$labels[] = $date;
-			$series[] = array('meta' => $date, 'value' => $row['total']);
+			$series[] = ['meta' => $date, 'value' => $row['total']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_sales_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.sales_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/line',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
-			'yaxis_title' => $this->lang->line('reports_revenue'),
-			'xaxis_title' => $this->lang->line('reports_date'),
+			'yaxis_title' => lang('Reports.revenue'),
+			'xaxis_title' => lang('Reports.date'),
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary items report
-	public function graphical_summary_items($start_date, $end_date, $sale_type, $location_id = 'all')
+	public function graphical_summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_items');
-		$model = $this->Summary_items;
+		$this->summary_items = model('reports/Summary_items');
+		$model = $this->summary_items;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$labels = array();
-		$series = array();
+		$labels = [];
+		$series = [];
+		
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['name'];
 			$series[] = $row['total'];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_items_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.items_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/hbar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
-			'yaxis_title' => $this->lang->line('reports_items'),
-			'xaxis_title' => $this->lang->line('reports_revenue'),
+			'yaxis_title' => lang('Reports.items'),
+			'xaxis_title' => lang('Reports.revenue'),
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary customers report
-	public function graphical_summary_categories($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function graphical_summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_categories');
-		$model = $this->Summary_categories;
+		$this->summary_categories = model('reports/Summary_categories');
+		$model = $this->summary_categories;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
 
-		$labels = array();
-		$series = array();
+		$labels = [];
+		$series = [];
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['category'];
-			$series[] = array('meta' => $row['category'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']);
+			$series[] = ['meta' => $row['category'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_categories_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.categories_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary suppliers report
-	public function graphical_summary_suppliers($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function graphical_summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_suppliers');
-		$model = $this->Summary_suppliers;
+		$this->summary_suppliers = model('reports/Summary_suppliers');
+		$model = $this->summary_suppliers;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['supplier'];
-			$series[] = array('meta' => $row['supplier'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']);
+			$series[] = ['meta' => $row['supplier'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_suppliers_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.suppliers_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary employees report
-	public function graphical_summary_employees($start_date, $end_date, $sale_type, $location_id = 'all')
+	public function graphical_summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_employees');
-		$model = $this->Summary_employees;
+		$this->summary_employees = model('reports/Summary_employees');
+		$model = $this->summary_employees;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['employee'];
-			$series[] = array('meta' => $row['employee'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']);
+			$series[] = ['meta' => $row['employee'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_employees_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.employees_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary taxes report
-	public function graphical_summary_taxes($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function graphical_summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_taxes');
-		$model = $this->Summary_taxes;
+		$this->summary_taxes = model('reports/Summary_taxes');
+		$model = $this->summary_taxes;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['percent'];
-			$series[] = array('meta' => $row['percent'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']);
+			$series[] = ['meta' => $row['percent'] . ' ' . round($row['total'] / $summary['total'] * 100, 2) . '%', 'value' => $row['total']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_taxes_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.taxes_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary sales taxes report
-	public function graphical_summary_sales_taxes($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function graphical_summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_sales_taxes');
-		$model = $this->Summary_sales_taxes;
+		$this->summary_sales_taxes = model('reports/Summary_sales_taxes');
+		$model = $this->summary_sales_taxes;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['jurisdiction_name'];
-			$series[] = array('meta' => $row['tax_rate'] . '%', 'value' => $row['tax']);
+			$series[] = ['meta' => $row['tax_rate'] . '%', 'value' => $row['tax']];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_sales_taxes_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.sales_taxes_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary customers report
-	public function graphical_summary_customers($start_date, $end_date, $sale_type, $location_id = 'all')
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+	public function graphical_summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_customers');
-		$model = $this->Summary_customers;
+		$this->summary_customers = model('reports/Summary_customers');
+		$model = $this->summary_customers;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['customer'];
 			$series[] = $row['total'];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_customers_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.customers_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/hbar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
-			'yaxis_title' => $this->lang->line('reports_customers'),
-			'xaxis_title' => $this->lang->line('reports_revenue'),
+			'yaxis_title' => lang('Reports.customers'),
+			'xaxis_title' => lang('Reports.revenue'),
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary discounts report
-	public function graphical_summary_discounts($start_date, $end_date, $sale_type, $location_id = 'all', $discount_type=0)
-	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id,'discount_type'=>$discount_type);
+	public function graphical_summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): void
+	{//TODO: Duplicated Code
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id,
+			'discount_type'=>$discount_type
+		];
 
-		$this->load->model('reports/Summary_discounts');
-		$model = $this->Summary_discounts;
+		$this->summary_discounts = model('reports/Summary_discounts');
+		$model = $this->summary_discounts;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
 			$labels[] = $row['discount'];
 			$series[] = $row['count'];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_discounts_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.discounts_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/bar',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
-			'yaxis_title' => $this->lang->line('reports_count'),
-			'xaxis_title' => $this->lang->line('reports_discount'),
+			'yaxis_title' => lang('Reports.count'),
+			'xaxis_title' => lang('Reports.discount'),
 			'show_currency' => FALSE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
 	//Graphical summary payments report
-	public function graphical_summary_payments($start_date, $end_date, $sale_type, $location_id = 'all')
+	public function graphical_summary_payments(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id
+		];
 
-		$this->load->model('reports/Summary_payments');
-		$model = $this->Summary_payments;
+		$this->summary_payments = model('reports/Summary_payments');
+		$model = $this->summary_payments;
 
 		$report_data = $model->getData($inputs);
-		$summary = $this->xss_clean($model->getSummaryData($inputs));
+		$summary = $model->getSummaryData($inputs);
+
+		$labels = [];
+		$series = [];
 
-		$labels = array();
-		$series = array();
 		foreach($report_data as $row)
 		{
-			$row = $this->xss_clean($row);
-
-			if($row['trans_group'] == $this->lang->line('reports_trans_payments') && !empty($row['trans_amount']))
+			if($row['trans_group'] == lang('Reports.trans_payments') && !empty($row['trans_amount']))
 			{
 				$labels[] = $row['trans_type'];
-				$series[] = array('meta' => $row['trans_type'] . ' ' . round($row['trans_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['trans_amount']);
+				$series[] = ['meta' => $row['trans_type'] . ' ' . round($row['trans_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['trans_amount']];
 			}
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_payments_summary_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.payments_summary_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'chart_type' => 'reports/graphs/pie',
 			'labels_1' => $labels,
 			'series_data_1' => $series,
 			'summary_data_1' => $summary,
 			'show_currency' => TRUE
-		);
+		];
 
-		$this->load->view('reports/graphical', $data);
+		echo view('reports/graphical', $data);
 	}
 
-	public function specific_customer_input()
+	public function specific_customer_input(): void
 	{
-		$data = array();
-		$data['specific_input_name'] = $this->lang->line('reports_customer');
-		$customers = array();
-		foreach($this->Customer->get_all()->result() as $customer)
+		$data = [];
+		$data['specific_input_name'] = lang('Reports.customer');
+		$customers = [];
+		foreach($this->customer->get_all()->getResult() as $customer)
 		{
 			if(isset($customer->company_name))
 			{
-				$customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] ');
+				$customers[$customer->person_id] = $customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] ';
 			}
 			else
 			{
-				$customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name);
+				$customers[$customer->person_id] = $customer->first_name . ' ' . $customer->last_name;
 			}
 		}
 		$data['specific_input_data'] = $customers;
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
 		$data['payment_type'] = $this->get_payment_type();
-
-		$this->load->view('reports/specific_customer_input', $data);
+		echo view('reports/specific_customer_input', $data);
 	}
 
-	public function get_payment_type()
+	public function get_payment_type(): array
 	{
-		$payment_type = array(
-			'all' => $this->lang->line('common_none_selected_text'),
-			'cash' => $this->lang->line('sales_cash'),
-			'due' => $this->lang->line('sales_due'),
-			'check' => $this->lang->line('sales_check'),
-			'credit' => $this->lang->line('sales_credit'),
-			'debit' => $this->lang->line('sales_debit'),
-			'invoices' => $this->lang->line('sales_invoice')
-		);
+		return [
+			'all' => lang('Common.none_selected_text'),
+			'cash' => lang('Sales.cash'),
+			'due' => lang('Sales.due'),
+			'check' => lang('Sales.check'),
+			'credit' => lang('Sales.credit'),
+			'debit' => lang('Sales.debit'),
+			'invoices' => lang('Sales.invoice')
+		];
 
-		return $payment_type;
 	}
 
-	public function specific_customer($start_date, $end_date, $customer_id, $sale_type, $payment_type)
+	public function specific_customer(string $start_date, string $end_date, string $customer_id, string $sale_type, string $payment_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'customer_id' => $customer_id, 'sale_type' => $sale_type, 'payment_type' => $payment_type);
+		$inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'customer_id' => $customer_id, 'sale_type' => $sale_type, 'payment_type' => $payment_type];
 
-		$this->load->model('reports/Specific_customer');
-		$model = $this->Specific_customer;
+		$this->specific_customer = model('reports/Specific_customer');
+		$model = $this->specific_customer;
 
 		$model->create($inputs);
 
-		$headers = $this->xss_clean($model->getDataColumns());
+		$headers = $model->getDataColumns();
 		$report_data = $model->getData($inputs);
 
-		$summary_data = array();
-		$details_data = array();
-		$details_data_rewards = array();
+		$summary_data = [];
+		$details_data = [];
+		$details_data_rewards = [];
 
 		foreach($report_data['summary'] as $key => $row)
 		{
 			if($row['sale_status'] == CANCELED)
 			{
 				$button_key = 'data-btn-restore';
-				$button_label = $this->lang->line('common_restore');
+				$button_label = lang('Common.restore');
 			}
 			else
 			{
 				$button_key = 'data-btn-delete';
-				$button_label = $this->lang->line('common_delete');
+				$button_label = lang('Common.delete');
 			}
 
-			$summary_data[] = $this->xss_clean(array(
+			$summary_data[] = [
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'subtotal' => to_currency($row['subtotal']),
@@ -974,13 +1170,20 @@ class Reports extends Secure_Controller
 				'profit' => to_currency($row['profit']),
 				'payment_type' => $row['payment_type'],
 				'comment' => $row['comment'],
-				'edit' => anchor('sales/edit/'. $row['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
-					array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update')))
-			));
+				'edit' => anchor(
+					'sales/edit/'. $row['sale_id'],
+					'<span class="glyphicon glyphicon-edit"></span>',
+					[
+						'class' => 'modal-dlg print_hide',
+						$button_key => $button_label,
+						'data-btn-submit' => lang('Common.submit'),
+						'title' => lang('Sales.update')
+					])
+			];
 
-			foreach($report_data['details'][$key] as $drow)
+			foreach($report_data['details'][$key] as $drow)	//TODO: Duplicated Code
 			{
-				$details_data[$row['sale_id']][] = $this->xss_clean(array(
+				$details_data[$row['sale_id']][] = [
 					$drow['name'],
 					$drow['category'],
 					$drow['item_number'],
@@ -992,91 +1195,87 @@ class Reports extends Secure_Controller
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
 					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
-				));
+				];
 			}
 
 			if(isset($report_data['rewards'][$key]))
 			{
 				foreach($report_data['rewards'][$key] as $drow)
 				{
-					$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
+					$details_data_rewards[$row['sale_id']][] = [$drow['used'], $drow['earned']];
 				}
 			}
 		}
 
-		$customer_info = $this->Customer->get_info($customer_id);
-		if(!empty($customer_info->company_name))
-		{
-			$customer_name ='[ '.$customer_info->company_name.' ]';
-		}
-		else
-		{
-			$customer_name = $customer_info->company_name;
-		}
+		$customer_info = $this->customer->get_info($customer_id);
+		$customer_name = !empty($customer_info->company_name)	//TODO: This variable is not used anywhere in the code. Should it be or can it be deleted?
+			? "[ $customer_info->company_name ]"
+			: $customer_info->company_name;
 
-		$data = array(
-			'title' => $this->xss_clean($customer_info->first_name . ' ' . $customer_info->last_name . ' ' . $this->lang->line('reports_report')),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		//TODO: Duplicated Code
+		$data = [
+			'title' => $customer_info->first_name . ' ' . $customer_info->last_name . ' ' . lang('Reports.report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'headers' => $headers,
 			'editable' => 'sales',
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
 			'details_data_rewards' => $details_data_rewards,
-			'overall_summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'overall_summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular_details', $data);
+		echo view('reports/tabular_details', $data);
 	}
 
-	public function specific_employee_input()
+	public function specific_employee_input(): void
 	{
-		$data = array();
-		$data['specific_input_name'] = $this->lang->line('reports_employee');
+		$data = [];
+		$data['specific_input_name'] = lang('Reports.employee');
 
-		$employees = array();
-		foreach($this->Employee->get_all()->result() as $employee)
+		$employees = [];
+		foreach($this->employee->get_all()->getResult() as $employee)
 		{
-			$employees[$employee->person_id] = $this->xss_clean($employee->first_name . ' ' . $employee->last_name);
+			$employees[$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
 		}
 		$data['specific_input_data'] = $employees;
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$this->load->view('reports/specific_input', $data);
+		echo view('reports/specific_input', $data);
 	}
 
-	public function specific_employee($start_date, $end_date, $employee_id, $sale_type)
+	public function specific_employee(string $start_date, string $end_date, string $employee_id, string $sale_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'employee_id' => $employee_id, 'sale_type' => $sale_type);
+		$inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'employee_id' => $employee_id, 'sale_type' => $sale_type];
 
-		$this->load->model('reports/Specific_employee');
-		$model = $this->Specific_employee;
+		$this->specific_employee = model('reports/Specific_employee');
+		$model = $this->specific_employee;
 
 		$model->create($inputs);
 
-		$headers = $this->xss_clean($model->getDataColumns());
+		$headers = $model->getDataColumns();
 		$report_data = $model->getData($inputs);
 
-		$summary_data = array();
-		$details_data = array();
-		$details_data_rewards = array();
+		$summary_data = [];
+		$details_data = [];
+		$details_data_rewards = [];
 
 		foreach($report_data['summary'] as $key => $row)
 		{
 			if($row['sale_status'] == CANCELED)
 			{
 				$button_key = 'data-btn-restore';
-				$button_label = $this->lang->line('common_restore');
+				$button_label = lang('Common.restore');
 			}
 			else
 			{
 				$button_key = 'data-btn-delete';
-				$button_label = $this->lang->line('common_delete');
+				$button_label = lang('Common.delete');
 			}
 
-			$summary_data[] = $this->xss_clean(array(
+			$summary_data[] = [
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'customer_name' => $row['customer_name'],
 				'subtotal' => to_currency($row['subtotal']),
@@ -1086,13 +1285,20 @@ class Reports extends Secure_Controller
 				'profit' => to_currency($row['profit']),
 				'payment_type' => $row['payment_type'],
 				'comment' => $row['comment'],
-				'edit' => anchor('sales/edit/'. $row['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
-					array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update')))
-			));
-
+				'edit' => anchor(
+					'sales/edit/'. $row['sale_id'],
+					'<span class="glyphicon glyphicon-edit"></span>',
+					[
+						'class' => 'modal-dlg print_hide',
+						$button_key => $button_label,
+						'data-btn-submit' => lang('Common.submit'),
+						'title' => lang('Sales.update')
+					])
+			];
+			//TODO: Duplicated Code
 			foreach($report_data['details'][$key] as $drow)
 			{
-				$details_data[$row['sale_id']][] = $this->xss_clean(array(
+				$details_data[$row['sale_id']][] = [
 					$drow['name'],
 					$drow['category'],
 					$drow['item_number'],
@@ -1104,87 +1310,90 @@ class Reports extends Secure_Controller
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
 					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
-				));
+				];
 			}
 
 			if(isset($report_data['rewards'][$key]))
 			{
 				foreach($report_data['rewards'][$key] as $drow)
 				{
-					$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
+					$details_data_rewards[$row['sale_id']][] = [$drow['used'], $drow['earned']];
 				}
 			}
 		}
 
-		$employee_info = $this->Employee->get_info($employee_id);
-		$data = array(
-			'title' => $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name . ' ' . $this->lang->line('reports_report')),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$employee_info = $this->employee->get_info($employee_id);
+		//TODO: Duplicated Code
+		$data = [
+			'title' => $employee_info->first_name . ' ' . $employee_info->last_name . ' ' . lang('Reports.report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'headers' => $headers,
 			'editable' => 'sales',
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
 			'details_data_rewards' => $details_data_rewards,
-			'overall_summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'overall_summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular_details', $data);
+		echo view('reports/tabular_details', $data);
 	}
 
-	public function specific_discount_input()
+	public function specific_discount_input(): void
 	{
-		$data = array();
-		$data['specific_input_name'] = $this->lang->line('reports_discount');
+		$data = [];
+		$data['specific_input_name'] = lang('Reports.discount');
 
-		$discounts = array();
+		$discounts = [];
 		for($i = 0; $i <= 100; $i += 10)
 		{
 			$discounts[$i] = $i . '%';
 		}
 		$data['specific_input_data'] = $discounts;
-		$data['discount_type_options'] = array(
-			'0' => $this->lang->line('reports_discount_percent'),
-			'1'=> $this->lang->line('reports_discount_fixed'));
+		$data['discount_type_options'] = ['0' => lang('Reports.discount_percent'), '1'=> lang('Reports.discount_fixed')];
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$data = $this->xss_clean($data);
-
-		$this->load->view('reports/specific_input', $data);
+		echo view('reports/specific_input', $data);
 	}
 
-	public function specific_discount($start_date, $end_date, $discount, $sale_type, $discount_type)
+	public function specific_discount(string $start_date, string $end_date, string $discount, string $sale_type, string $discount_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'discount' => $discount, 'sale_type' => $sale_type, 'discount_type' => $discount_type);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'discount' => $discount,
+			'sale_type' => $sale_type,
+			'discount_type' => $discount_type
+		];
 
-		$this->load->model('reports/Specific_discount');
-		$model = $this->Specific_discount;
+		$this->specific_discount = model('reports/Specific_discount');
+		$model = $this->specific_discount;
 
 		$model->create($inputs);
 
-		$headers = $this->xss_clean($model->getDataColumns());
+		$headers = $model->getDataColumns();
 		$report_data = $model->getData($inputs);
 
-		$summary_data = array();
-		$details_data = array();
-		$details_data_rewards = array();
+		$summary_data = [];
+		$details_data = [];
+		$details_data_rewards = [];
 
 		foreach($report_data['summary'] as $key => $row)
-		{
+		{	//TODO: Duplicated Code
 			if($row['sale_status'] == CANCELED)
 			{
 				$button_key = 'data-btn-restore';
-				$button_label = $this->lang->line('common_restore');
+				$button_label = lang('Common.restore');
 			}
 			else
 			{
 				$button_key = 'data-btn-delete';
-				$button_label = $this->lang->line('common_delete');
+				$button_label = lang('Common.delete');
 			}
 
-			$summary_data[] = $this->xss_clean(array(
+			$summary_data[] = [
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'customer_name' => $row['customer_name'],
@@ -1195,13 +1404,20 @@ class Reports extends Secure_Controller
 				'profit' => to_currency($row['profit']),
 				'payment_type' => $row['payment_type'],
 				'comment' => $row['comment'],
-				'edit' => anchor('sales/edit/'. $row['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
-					array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update')))
-			));
-
+				'edit' => anchor(
+					'sales/edit/'. $row['sale_id'],
+					'<span class="glyphicon glyphicon-edit"></span>',
+					[
+						'class' => 'modal-dlg print_hide',
+						$button_key => $button_label,
+						'data-btn-submit' => lang('Common.submit'),
+						'title' => lang('Sales.update')
+					])
+			];
+			//TODO: Duplicated Code
 			foreach($report_data['details'][$key] as $drow)
 			{
-				$details_data[$row['sale_id']][] = $this->xss_clean(array(
+				$details_data[$row['sale_id']][] = [
 					$drow['name'],
 					$drow['category'],
 					$drow['item_number'],
@@ -1212,38 +1428,40 @@ class Reports extends Secure_Controller
 					to_currency($drow['total']),
 					to_currency($drow['cost']),
 					to_currency($drow['profit']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])
-				));
+					($drow['discount_type'] == PERCENT)
+						? $drow['discount'].'%'
+						: to_currency($drow['discount'])
+				];
 			}
 
 			if(isset($report_data['rewards'][$key]))
 			{
 				foreach($report_data['rewards'][$key] as $drow)
 				{
-					$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
+					$details_data_rewards[$row['sale_id']][] = [$drow['used'], $drow['earned']];
 				}
 			}
 		}
 
-		$data = array(
-			'title' => $discount . '% ' . $this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => $discount . '% ' . lang('Reports.discount') . ' ' . lang('Reports.report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'headers' => $headers,
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
 			'details_data_rewards' => $details_data_rewards,
-			'overall_summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'overall_summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular_details', $data);
+		echo view('reports/tabular_details', $data);
 	}
 
-	public function get_detailed_sales_row($sale_id)
+	public function get_detailed_sales_row(string $sale_id): void
 	{
-		$inputs = array('sale_id' => $sale_id);
+		$inputs = ['sale_id' => $sale_id];
 
-		$this->load->model('reports/Detailed_sales');
-		$model = $this->Detailed_sales;
+		$this->detailed_sales = model('reports/Detailed_sales');
+		$model = $this->detailed_sales;
 
 		$model->create($inputs);
 
@@ -1252,17 +1470,17 @@ class Reports extends Secure_Controller
 		if($report_data['sale_status'] == CANCELED)
 		{
 			$button_key = 'data-btn-restore';
-			$button_label = $this->lang->line('common_restore');
+			$button_label = lang('Common.restore');
 		}
 		else
 		{
 			$button_key = 'data-btn-delete';
-			$button_label = $this->lang->line('common_delete');
+			$button_label = lang('Common.delete');
 		}
 
-		$summary_data = $this->xss_clean(array(
+		$summary_data = [
 			'sale_id' => $report_data['sale_id'],
-			'sale_time' => to_datetime(strtotime($row['sale_time'])),
+			'sale_date' => to_date(strtotime($report_data['sale_date'])),
 			'quantity' => to_quantity_decimals($report_data['items_purchased']),
 			'employee_name' => $report_data['employee_name'],
 			'customer_name' => $report_data['customer_name'],
@@ -1273,47 +1491,59 @@ class Reports extends Secure_Controller
 			'profit' => to_currency($report_data['profit']),
 			'payment_type' => $report_data['payment_type'],
 			'comment' => $report_data['comment'],
-			'edit' => anchor('sales/edit/'. $report_data['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
-				array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update')))
-		));
+			'edit' => anchor(
+				'sales/edit/'. $report_data['sale_id'],
+				'<span class="glyphicon glyphicon-edit"></span>',
+				[
+					'class' => 'modal-dlg print_hide',
+					$button_key => $button_label,
+					'data-btn-submit' => lang('Common.submit'),
+					'title' => lang('Sales.update')
+				])
+		];
 
-		echo json_encode(array($sale_id => $summary_data));
+		echo json_encode ([$sale_id => $summary_data]);
 	}
 
-	public function specific_supplier_input()
+	public function specific_supplier_input(): void
 	{
-		$data = array();
-		$data['specific_input_name'] = $this->lang->line('reports_supplier');
+		$data = [];
+		$data['specific_input_name'] = lang('Reports.supplier');
 
-		$supplier = array();
-		foreach($this->Supplier->get_all()->result() as $supplier)
+		$suppliers = [];
+		foreach($this->supplier->get_all()->getResult() as $supplier)
 		{
-			$suppliers[$supplier->person_id] = $this->xss_clean($supplier->company_name . ' (' . $supplier->first_name . ' ' . $supplier->last_name . ')');
+			$suppliers[$supplier->person_id] = $supplier->company_name . ' (' . $supplier->first_name . ' ' . $supplier->last_name . ')';
 		}
 		$data['specific_input_data'] = $suppliers;
 		$data['sale_type_options'] = $this->get_sale_type_options();
 
-		$this->load->view('reports/specific_input', $data);
+		echo view('reports/specific_input', $data);
 	}
 
-	public function specific_supplier($start_date, $end_date, $supplier_id, $sale_type)
+	public function specific_supplier(string $start_date, string $end_date, string $supplier_id, string $sale_type): void
 	{
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'supplier_id' => $supplier_id, 'sale_type' => $sale_type);
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'supplier_id' => $supplier_id,
+			'sale_type' => $sale_type
+		];
 
-		$this->load->model('reports/Specific_supplier');
-		$model = $this->Specific_supplier;
+		$this->specific_supplier = model('reports/Specific_supplier');
+		$model = $this->specific_supplier;
 
 		$model->create($inputs);
 
 		$report_data = $model->getData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'name' => $row['name'],
 				'category' => $row['category'],
 				'item_number' => $row['item_number'],
@@ -1323,82 +1553,88 @@ class Reports extends Secure_Controller
 				'total' => to_currency($row['total']),
 				'cost' => to_currency($row['cost']),
 				'profit' => to_currency($row['profit']),
-				'discount' => ($row['discount_type'] == PERCENT)? $row['discount'].'%':to_currency($row['discount'])				
-			));
+				'discount' => ($row['discount_type'] == PERCENT)? $row['discount'].'%':to_currency($row['discount'])
+			];
 		}
 
-		$supplier_info = $this->Supplier->get_info($supplier_id);
-		$data = array(
-			'title' => $this->xss_clean($supplier_info->company_name . ' (' . $supplier_info->first_name . ' ' . $supplier_info->last_name . ') ' . $this->lang->line('reports_report')),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
-			'headers' => $this->xss_clean($model->getDataColumns()),
+		$supplier_info = $this->supplier->get_info($supplier_id);
+		$data = [
+			'title' => $supplier_info->company_name . ' (' . $supplier_info->first_name . ' ' . $supplier_info->last_name . ') ' . lang('Reports.report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
-			'summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	public function get_sale_type_options()
+	public function get_sale_type_options(): array
 	{
-		$sale_type_options = array();
-		$sale_type_options['complete'] = $this->lang->line('reports_complete');
-		$sale_type_options['sales'] = $this->lang->line('reports_completed_sales');
-		if($this->config->item('invoice_enable') == '1')
+		$sale_type_options = [];
+		$sale_type_options['complete'] = lang('Reports.complete');
+		$sale_type_options['sales'] = lang('Reports.completed_sales');
+		if(config('OSPOS')->invoice_enable)
 		{
-			$sale_type_options['quotes'] = $this->lang->line('reports_quotes');
-			if($this->config->item('work_order_enable') == '1')
+			$sale_type_options['quotes'] = lang('Reports.quotes');
+			if(config('OSPOS')->work_order_enable)
 			{
-				$sale_type_options['work_orders'] = $this->lang->line('reports_work_orders');
+				$sale_type_options['work_orders'] = lang('Reports.work_orders');
 			}
 		}
-		$sale_type_options['canceled'] = $this->lang->line('reports_canceled');
-		$sale_type_options['returns'] = $this->lang->line('reports_returns');
+		$sale_type_options['canceled'] = lang('Reports.canceled');
+		$sale_type_options['returns'] = lang('Reports.returns');
 
 		return $sale_type_options;
 	}
 
-	public function detailed_sales($start_date, $end_date, $sale_type, $location_id = 'all')
+	public function detailed_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
 	{
-		$definition_names = $this->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_SALES);
+		$definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_SALES);
 
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'sale_type' => $sale_type, 'location_id' => $location_id, 'definition_ids' => array_keys($definition_names));
+		$inputs = [
+			'start_date' => $start_date,
+			'end_date' => $end_date,
+			'sale_type' => $sale_type,
+			'location_id' => $location_id,
+			'definition_ids' => array_keys($definition_names)
+		];
 
-		$this->load->model('reports/Detailed_sales');
-		$model = $this->Detailed_sales;
+		$this->detailed_sales = model('reports/Detailed_sales');
+		$model = $this->detailed_sales;
 
 		$model->create($inputs);
 
 		$columns = $model->getDataColumns();
 		$columns['details'] = array_merge($columns['details'], $definition_names);
 
-		$headers = $this->xss_clean($columns);
+		$headers = $columns;
 
 		$report_data = $model->getData($inputs);
 
-		$summary_data = array();
-		$details_data = array();
-		$details_data_rewards = array();
+		$summary_data = [];
+		$details_data = [];
+		$details_data_rewards = [];
 
-		$show_locations = $this->xss_clean($this->Stock_location->multiple_locations());
+		$show_locations = $this->stock_location->multiple_locations();
 
 		foreach($report_data['summary'] as $key => $row)
-		{
+		{	//TODO: Duplicated Code
 			if($row['sale_status'] == CANCELED)
 			{
 				$button_key = 'data-btn-restore';
-				$button_label = $this->lang->line('common_restore');
+				$button_label = lang('Common.restore');
 			}
 			else
 			{
 				$button_key = 'data-btn-delete';
-				$button_label = $this->lang->line('common_delete');
+				$button_label = lang('Common.delete');
 			}
 
-			$summary_data[] = $this->xss_clean(array(
+			$summary_data[] = [
 				'id' => $row['sale_id'],
 				'type_code' => $row['type_code'],
-				'sale_time' => to_datetime(strtotime($row['sale_time'])),
+				'sale_date' => to_date(strtotime($row['sale_date'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'customer_name' => $row['customer_name'],
@@ -1409,71 +1645,81 @@ class Reports extends Secure_Controller
 				'profit' => to_currency($row['profit']),
 				'payment_type' => $row['payment_type'],
 				'comment' => $row['comment'],
-				'edit' => anchor('sales/edit/'.$row['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
-					array('class' => 'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update')))
-			));
+				'edit' => anchor(
+					'sales/edit/'.$row['sale_id'],
+					'<span class="glyphicon glyphicon-edit"></span>',
+					[
+						'class' => 'modal-dlg print_hide',
+						$button_key => $button_label,
+						'data-btn-submit' => lang('Common.submit'),
+						'title' => lang('Sales.update')
+					])
+			];
 
 			foreach($report_data['details'][$key] as $drow)
 			{
 				$quantity_purchased = to_quantity_decimals($drow['quantity_purchased']);
 				if($show_locations)
 				{
-					$quantity_purchased .= ' [' . $this->Stock_location->get_location_name($drow['item_location']) . ']';
+					$quantity_purchased .= ' [' . $this->stock_location->get_location_name($drow['item_location']) . ']';
 				}
 
 				$attribute_values = expand_attribute_values($definition_names, $drow);
 
-				$details_data[$row['sale_id']][] = $this->xss_clean(array_merge(array(
-					$drow['name'],
-					$drow['category'],
-					$drow['item_number'],
-					$drow['description'],
-					$quantity_purchased,
-					to_currency($drow['subtotal']),
-					to_currency_tax($drow['tax']),
-					to_currency($drow['total']),
-					to_currency($drow['cost']),
-					to_currency($drow['profit']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])), $attribute_values));
+				$details_data[$row['sale_id']][] = 
+					array_merge ([
+						$drow['name'],
+						$drow['category'],
+						$drow['item_number'],
+						$drow['description'],
+						$quantity_purchased,
+						to_currency($drow['subtotal']),
+						to_currency_tax($drow['tax']),
+						to_currency($drow['total']),
+						to_currency($drow['cost']),
+						to_currency($drow['profit']),
+						($drow['discount_type'] == PERCENT) ? $drow['discount'].'%' : to_currency($drow['discount'])
+					],
+					$attribute_values
+				);
 			}
 
 			if(isset($report_data['rewards'][$key]))
 			{
 				foreach($report_data['rewards'][$key] as $drow)
 				{
-					$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
+					$details_data_rewards[$row['sale_id']][] = [$drow['used'], $drow['earned']];
 				}
 			}
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_detailed_sales_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.detailed_sales_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'headers' => $headers,
 			'editable' => 'sales',
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
 			'details_data_rewards' => $details_data_rewards,
-			'overall_summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
-
-		$this->load->view('reports/tabular_details', $data);
+			'overall_summary_data' => $model->getSummaryData($inputs)
+		];
+		echo view('reports/tabular_details', $data);
 	}
 
-	public function get_detailed_receivings_row($receiving_id)
+	public function get_detailed_receivings_row(string $receiving_id): void
 	{
-		$inputs = array('receiving_id' => $receiving_id);
+		$inputs = ['receiving_id' => $receiving_id];
 
-		$this->load->model('reports/Detailed_receivings');
-		$model = $this->Detailed_receivings;
+		$this->detailed_receivings = model('reports/Detailed_receivings');
+		$model = $this->detailed_receivings;
 
 		$model->create($inputs);
 
 		$report_data = $model->getDataByReceivingId($receiving_id);
 
-		$summary_data = $this->xss_clean(array(
+		$summary_data = [
 			'receiving_id' => $report_data['receiving_id'],
-			'receiving_time' => to_datetime(strtotime($row['receiving_time'])),
+			'receiving_date' => to_date(strtotime($report_data['receiving_date'])),
 			'quantity' => to_quantity_decimals($report_data['items_purchased']),
 			'employee_name' => $report_data['employee_name'],
 			'supplier_name' => $report_data['supplier_name'],
@@ -1481,41 +1727,47 @@ class Reports extends Secure_Controller
 			'payment_type' => $report_data['payment_type'],
 			'reference' => $report_data['reference'],
 			'comment' => $report_data['comment'],
-			'edit' => anchor('receivings/edit/'. $report_data['receiving_id'], '<span class="glyphicon glyphicon-edit"></span>',
-				array('class'=>'modal-dlg print_hide', 'data-btn-submit' => $this->lang->line('common_submit'), 'data-btn-delete' => $this->lang->line('common_delete'), 'title' => $this->lang->line('receivings_update'))
-			)
-		));
+			'edit' => anchor(
+				'receivings/edit/'. $report_data['receiving_id'],
+				'<span class="glyphicon glyphicon-edit"></span>',
+				[
+					'class' => 'modal-dlg print_hide',
+					'data-btn-submit' => lang('Common.submit'),
+					'data-btn-delete' => lang('Common.delete'),
+					'title' => lang('Receivings.update')
+				])
+		];
 
-		echo json_encode(array($receiving_id => $summary_data));
+		echo json_encode ([$receiving_id => $summary_data]);
 	}
 
-	public function detailed_receivings($start_date, $end_date, $receiving_type, $location_id = 'all')
+	public function detailed_receivings(string $start_date, string $end_date, string $receiving_type, string $location_id = 'all'): void
 	{
-		$definition_names = $this->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_RECEIVINGS);
+		$definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_RECEIVINGS);
 
-		$inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id, 'definition_ids' => array_keys($definition_names));
+		$inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id, 'definition_ids' => array_keys($definition_names)];
 
-		$this->load->model('reports/Detailed_receivings');
-		$model = $this->Detailed_receivings;
+		$this->detailed_receivings = model('reports/Detailed_receivings');
+		$model = $this->detailed_receivings;
 
 		$model->create($inputs);
 
 		$columns = $model->getDataColumns();
 		$columns['details'] = array_merge($columns['details'], $definition_names);
 
-		$headers = $this->xss_clean($columns);
+		$headers = $columns;
 		$report_data = $model->getData($inputs);
 
-		$summary_data = array();
-		$details_data = array();
+		$summary_data = [];
+		$details_data = [];
 
-		$show_locations = $this->xss_clean($this->Stock_location->multiple_locations());
+		$show_locations = $this->stock_location->multiple_locations();
 
 		foreach($report_data['summary'] as $key => $row)
 		{
-			$summary_data[] = $this->xss_clean(array(
+			$summary_data[] = [
 				'id' => $row['receiving_id'],
-				'receiving_time' => to_datetime(strtotime($row['receiving_time'])),
+				'receiving_date' => to_date(strtotime($row['receiving_date'])),
 				'quantity' => to_quantity_decimals($row['items_purchased']),
 				'employee_name' => $row['employee_name'],
 				'supplier_name' => $row['supplier_name'],
@@ -1524,104 +1776,110 @@ class Reports extends Secure_Controller
 				'payment_type' => $row['payment_type'],
 				'reference' => $row['reference'],
 				'comment' => $row['comment'],
-				'edit' => anchor('receivings/edit/' . $row['receiving_id'], '<span class="glyphicon glyphicon-edit"></span>',
-					array('class' => 'modal-dlg print_hide', 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('receivings_update'))
-				)
-			));
+				'edit' => anchor(
+					'receivings/edit/' . $row['receiving_id'],
+					'<span class="glyphicon glyphicon-edit"></span>',
+					[
+						'class' => 'modal-dlg print_hide',
+						'data-btn-delete' => lang('Common.delete'),
+						'data-btn-submit' => lang('Common.submit'),
+						'title' => lang('Receivings.update')
+					])
+			];
 
 			foreach($report_data['details'][$key] as $drow)
 			{
 				$quantity_purchased = $drow['receiving_quantity'] > 1 ? to_quantity_decimals($drow['quantity_purchased']) . ' x ' . to_quantity_decimals($drow['receiving_quantity']) : to_quantity_decimals($drow['quantity_purchased']);
 				if($show_locations)
 				{
-					$quantity_purchased .= ' [' . $this->Stock_location->get_location_name($drow['item_location']) . ']';
+					$quantity_purchased .= ' [' . $this->stock_location->get_location_name($drow['item_location']) . ']';
 				}
 
 				$attribute_values = expand_attribute_values($definition_names, $drow);
 
-				$details_data[$row['receiving_id']][] = $this->xss_clean(array_merge(array(
+				$details_data[$row['receiving_id']][] = array_merge ([
 					$drow['item_number'],
 					$drow['name'],
 					$drow['category'],
 					$quantity_purchased,
 					to_currency($drow['total']),
-					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])), $attribute_values));
+					($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])], $attribute_values);
 			}
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_detailed_receivings_report'),
-			'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)),
+		$data = [
+			'title' => lang('Reports.detailed_receivings_report'),
+			'subtitle' => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
 			'headers' => $headers,
 			'editable' => 'receivings',
 			'summary_data' => $summary_data,
 			'details_data' => $details_data,
-			'overall_summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'overall_summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular_details', $data);
+		echo view('reports/tabular_details', $data);
 	}
 
-	public function inventory_low()
+	public function inventory_low(): void
 	{
-		$inputs = array();
+		$inputs = [];
 
-		$this->load->model('reports/Inventory_low');
-		$model = $this->Inventory_low;
+		$this->inventory_low = model('reports/Inventory_low');
+		$model = $this->inventory_low;
 
 		$report_data = $model->getData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'item_name' => $row['name'],
 				'item_number' => $row['item_number'],
 				'quantity' => to_quantity_decimals($row['quantity']),
 				'reorder_level' => to_quantity_decimals($row['reorder_level']),
 				'location_name' => $row['location_name']
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_inventory_low_report'),
+		$data = [
+			'title' => lang('Reports.inventory_low_report'),
 			'subtitle' => '',
-			'headers' => $this->xss_clean($model->getDataColumns()),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
-			'summary_data' => $this->xss_clean($model->getSummaryData($inputs))
-		);
+			'summary_data' => $model->getSummaryData($inputs)
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
-	public function inventory_summary_input()
+	public function inventory_summary_input(): void
 	{
-		$this->load->model('reports/Inventory_summary');
-		$model = $this->Inventory_summary;
+		$this->inventory_summary = model('reports/Inventory_summary');
+		$model = $this->inventory_summary;
 
-		$data = array();
+		$data = [];
 		$data['item_count'] = $model->getItemCountDropdownArray();
 
-		$stock_locations = $this->xss_clean($this->Stock_location->get_allowed_locations());
-		$stock_locations['all'] = $this->lang->line('reports_all');
+		$stock_locations = $this->stock_location->get_allowed_locations();
+		$stock_locations['all'] = lang('Reports.all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
 
-		$this->load->view('reports/inventory_summary_input', $data);
+		echo view('reports/inventory_summary_input', $data);
 	}
 
-	public function inventory_summary($location_id = 'all', $item_count = 'all')
+	public function inventory_summary(string $location_id = 'all', string $item_count = 'all'): void
 	{
-		$inputs = array('location_id' => $location_id, 'item_count' => $item_count);
+		$inputs = ['location_id' => $location_id, 'item_count' => $item_count];
 
-		$this->load->model('reports/Inventory_summary');
-		$model = $this->Inventory_summary;
+		$this->inventory_summary = model('reports/Inventory_summary');
+		$model = $this->inventory_summary;
 
 		$report_data = $model->getData($inputs);
 
-		$tabular_data = array();
+		$tabular_data = [];
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = $this->xss_clean(array(
+			$tabular_data[] = [
 				'item_name' => $row['name'],
 				'item_number' => $row['item_number'],
 				'category' => $row['category'],
@@ -1632,35 +1890,34 @@ class Reports extends Secure_Controller
 				'cost_price' => to_currency($row['cost_price']),
 				'unit_price' => to_currency($row['unit_price']),
 				'subtotal' => to_currency($row['sub_total_value'])
-			));
+			];
 		}
 
-		$data = array(
-			'title' => $this->lang->line('reports_inventory_summary_report'),
+		$data = [
+			'title' => lang('Reports.inventory_summary_report'),
 			'subtitle' => '',
-			'headers' => $this->xss_clean($model->getDataColumns()),
+			'headers' => $model->getDataColumns(),
 			'data' => $tabular_data,
-			'summary_data' => $this->xss_clean($model->getSummaryData($report_data))
-		);
+			'summary_data' => $model->getSummaryData($report_data)
+		];
 
-		$this->load->view('reports/tabular', $data);
+		echo view('reports/tabular', $data);
 	}
 
 	//	Returns subtitle for the reports
-	private function _get_subtitle_report($inputs)
+	private function _get_subtitle_report(array $inputs): string	//TODO: Hungarian Notation
 	{
 		$subtitle = '';
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
-			$subtitle .= date($this->config->item('dateformat'), strtotime($inputs['start_date'])) . ' - ' .date($this->config->item('dateformat'), strtotime($inputs['end_date']));
+			$subtitle .= date(config('OSPOS')->dateformat, strtotime($inputs['start_date'])) . ' - ' . date(config('OSPOS')->dateformat, strtotime($inputs['end_date']));
 		}
 		else
 		{
-			$subtitle .= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['start_date']))) . ' - ' . date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime(rawurldecode($inputs['end_date'])));
+			$subtitle .= date(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, strtotime(rawurldecode($inputs['start_date']))) . ' - ' . date(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, strtotime(rawurldecode($inputs['end_date'])));
 		}
 
 		return $subtitle;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 587ce5d04..0bdb1191c 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -1,31 +1,71 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Libraries\Barcode_lib;
+use app\Libraries\Email_lib;
+use app\Libraries\Sale_lib;
+use app\Libraries\Tax_lib;
+use app\Libraries\Token_lib;
+use app\Models\Customer;
+use app\Models\Customer_rewards;
+use app\Models\Dinner_table;
+use app\Models\Employee;
+use app\Models\Giftcard;
+use app\Models\Inventory;
+use app\Models\Item;
+use app\Models\Item_kit;
+use app\Models\Sale;
+use app\Models\Stock_location;
+use app\Models\Tokens\Token_invoice_count;
+use app\Models\Tokens\Token_customer;
+use app\Models\Tokens\Token_invoice_sequence;
+use CodeIgniter\Config\Services;
+use ReflectionException;
+
+/**
+ * @property barcode_lib barcode_lib
+ * @property email_lib email_lib
+ * @property sale_lib sale_lib
+ * @property tax_lib tax_lib
+ * @property token_lib token_lib
+ * @property customer customer
+ * @property customer_rewards customer_rewards
+ * @property dinner_table dinner_table
+ * @property employee employee
+ * @property giftcard giftcard
+ * @property inventory inventory
+ * @property item item
+ * @property item_kit item_kit
+ * @property sale sale
+ * @property stock_location stock_location
+ */
 class Sales extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('sales');
 
-		$this->load->helper('file');
-		$this->load->library('sale_lib');
-		$this->load->library('email_lib');
-		$this->load->library('token_lib');
-		$this->load->library('barcode_lib');
+		helper('file');
+
+		$this->barcode_lib = new Barcode_lib();
+		$this->email_lib = new Email_lib();
+		$this->sale_lib = new Sale_lib();
+		$this->tax_lib = new Tax_lib();
+		$this->token_lib = new Token_lib();
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$this->session->set_userdata('allow_temp_items', 1);
-		$this->_reload();
+		$this->session->set('allow_temp_items', 1);
+		$this->_reload();	//TODO: Hungarian Notation
 	}
 
-	public function manage()
+	public function manage(): void
 	{
-		$person_id = $this->session->userdata('person_id');
+		$person_id = $this->session->get('person_id');
 
-		if(!$this->Employee->has_grant('reports_sales', $person_id))
+		if(!$this->employee->has_grant('reports_sales', $person_id))
 		{
 			redirect('no_access/sales/reports_sales');
 		}
@@ -33,101 +73,106 @@ class Sales extends Secure_Controller
 		{
 			$data['table_headers'] = get_sales_manage_table_headers();
 
-			$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
-				'only_due' => $this->lang->line('sales_due_filter'),
-				'only_check' => $this->lang->line('sales_check_filter'),
-				'only_creditcard' => $this->lang->line('sales_credit_filter'),
-				'only_invoices' => $this->lang->line('sales_invoice_filter'));
+			$data['filters'] = ['only_cash' => lang('Sales.cash_filter'),
+				'only_due' => lang('Sales.due_filter'),
+				'only_check' => lang('Sales.check_filter'),
+				'only_creditcard' => lang('Sales.credit_filter'),
+				'only_invoices' => lang('Sales.invoice_filter')
+			];
 
-			$this->load->view('sales/manage', $data);
+			echo view('sales/manage', $data);
 		}
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$sale_info = $this->Sale->get_info($row_id)->row();
-		$data_row = $this->xss_clean(get_sale_data_row($sale_info));
+		$sale_info = $this->sale->get_info($row_id)->getRow();
+		$data_row = get_sale_data_row($sale_info);
 
 		echo json_encode($data_row);
 	}
 
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort = $this->input->get('sort');
-		$order = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$filters = array('sale_type' => 'all',
-						 'location_id' => 'all',
-						 'start_date' => $this->input->get('start_date'),
-						 'end_date' => $this->input->get('end_date'),
-						 'only_cash' => FALSE,
-						 'only_due' => FALSE,
-						 'only_check' => FALSE,
-						 'only_creditcard' => FALSE,
-						 'only_invoices' => $this->config->item('invoice_enable') && $this->input->get('only_invoices'),
-						 'is_valid_receipt' => $this->Sale->is_valid_receipt($search));
+		$filters = [
+			'sale_type' => 'all',
+			'location_id' => 'all',
+			'start_date' => $this->request->getGet('start_date', FILTER_SANITIZE_STRING),
+			'end_date' => $this->request->getGet('end_date', FILTER_SANITIZE_STRING),
+			'only_cash' => FALSE,
+			'only_due' => FALSE,
+			'only_check' => FALSE,
+			'only_creditcard' => FALSE,
+			'only_invoices' => config('OSPOS')->invoice_enable && $this->request->getGet('only_invoices', FILTER_SANITIZE_NUMBER_INT),
+			'is_valid_receipt' => $this->sale->is_valid_receipt($search)
+		];
 
 		// check if any filter is set in the multiselect dropdown
-		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$filledup = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_STRING), TRUE);	//TODO: Variable does not meet naming conventions
 		$filters = array_merge($filters, $filledup);
 
-		$sales = $this->Sale->search($search, $filters, $limit, $offset, $sort, $order);
-		$total_rows = $this->Sale->get_found_rows($search, $filters);
-		$payments = $this->Sale->get_payments_summary($search, $filters);
-		$payment_summary = $this->xss_clean(get_sales_manage_payments_summary($payments));
+		$sales = $this->sale->search($search, $filters, $limit, $offset, $sort, $order);
+		$total_rows = $this->sale->get_found_rows($search, $filters);
+		$payments = $this->sale->get_payments_summary($search, $filters);
+		$payment_summary = get_sales_manage_payments_summary($payments);
 
-		$data_rows = array();
-		foreach($sales->result() as $sale)
+		$data_rows = [];
+		foreach($sales->getResult() as $sale)
 		{
-			$data_rows[] = $this->xss_clean(get_sale_data_row($sale));
+			$data_rows[] = get_sale_data_row($sale);
 		}
 
 		if($total_rows > 0)
 		{
-			$data_rows[] = $this->xss_clean(get_sale_data_last_row($sales));
+			$data_rows[] = get_sale_data_last_row($sales);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary]);
 	}
 
-	public function item_search()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function item_search(): void
 	{
-		$suggestions = array();
-		$receipt = $search = $this->input->get('term') != '' ? $this->input->get('term') : NULL;
+		$suggestions = [];
+		$receipt = $search = $this->request->getGet('term') != '' ? $this->request->getGet('term', FILTER_SANITIZE_STRING) : NULL;
 
-		if($this->sale_lib->get_mode() == 'return' && $this->Sale->is_valid_receipt($receipt))
+		if($this->sale_lib->get_mode() == 'return' && $this->sale->is_valid_receipt($receipt))
 		{
 			// if a valid receipt or invoice was found the search term will be replaced with a receipt number (POS #)
 			$suggestions[] = $receipt;
 		}
-		$suggestions = array_merge($suggestions, $this->Item->get_search_suggestions($search, array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE));
-		$suggestions = array_merge($suggestions, $this->Item_kit->get_search_suggestions($search));
-
-		$suggestions = $this->xss_clean($suggestions);
+		$suggestions = array_merge($suggestions, $this->item->get_search_suggestions($search, ['search_custom' => FALSE, 'is_deleted' => FALSE], TRUE));
+		$suggestions = array_merge($suggestions, $this->item_kit->get_search_suggestions($search));
 
 		echo json_encode($suggestions);
 	}
 
-	public function suggest_search()
+	public function suggest_search(): void
 	{
-		$search = $this->input->post('term') != '' ? $this->input->post('term') : NULL;
+		$search = $this->request->getPost('term') != '' ? $this->request->getPost('term', FILTER_SANITIZE_STRING) : NULL;
 
-		$suggestions = $this->xss_clean($this->Sale->get_search_suggestions($search));
+		$suggestions = $this->sale->get_search_suggestions($search);
 
 		echo json_encode($suggestions);
 	}
 
-	public function select_customer()
+	public function select_customer(): void
 	{
-		$customer_id = $this->input->post('customer');
-		if($this->Customer->exists($customer_id))
+		$customer_id = $this->request->getPost('customer', FILTER_SANITIZE_NUMBER_INT);
+		if($this->customer->exists($customer_id))
 		{
 			$this->sale_lib->set_customer($customer_id);
-			$discount = $this->Customer->get_info($customer_id)->discount;
-			$discount_type = $this->Customer->get_info($customer_id)->discount_type;
+			$discount = $this->customer->get_info($customer_id)->discount;
+			$discount_type = $this->customer->get_info($customer_id)->discount_type;
 
 			// apply customer default discount to items that have 0 discount
 			if($discount != '')
@@ -139,9 +184,9 @@ class Sales extends Secure_Controller
 		$this->_reload();
 	}
 
-	public function change_mode()
+	public function change_mode(): void
 	{
-		$mode = $this->input->post('mode');
+		$mode = $this->request->getPost('mode', FILTER_SANITIZE_STRING);
 		$this->sale_lib->set_mode($mode);
 
 		if($mode == 'sale')
@@ -165,26 +210,27 @@ class Sales extends Secure_Controller
 			$this->sale_lib->set_sale_type(SALE_TYPE_RETURN);
 		}
 
-		if($this->config->item('dinner_table_enable') == TRUE)
+		if(config('OSPOS')->dinner_table_enable)
 		{
-			$occupied_dinner_table = $this->input->post('dinner_table');
+			$occupied_dinner_table = $this->request->getPost('dinner_table', FILTER_SANITIZE_NUMBER_INT);
 			$released_dinner_table = $this->sale_lib->get_dinner_table();
-			$occupied = $this->Dinner_table->is_occupied($released_dinner_table);
+			$occupied = $this->dinner_table->is_occupied($released_dinner_table);
 
 			if($occupied && ($occupied_dinner_table != $released_dinner_table))
 			{
-				$this->Dinner_table->swap_tables($released_dinner_table, $occupied_dinner_table);
+				$this->dinner_table->swap_tables($released_dinner_table, $occupied_dinner_table);
 			}
 
 			$this->sale_lib->set_dinner_table($occupied_dinner_table);
 		}
 
-		$stock_location = $this->input->post('stock_location');
+		$stock_location = $this->request->getPost('stock_location', FILTER_SANITIZE_NUMBER_INT);
+
 		if(!$stock_location || $stock_location == $this->sale_lib->get_sale_location())
 		{
-
+//TODO: This has an empty body.  What to do here?
 		}
-		elseif($this->Stock_location->is_allowed_location($stock_location, 'sales'))
+		elseif($this->stock_location->is_allowed_location($stock_location, 'sales'))
 		{
 			$this->sale_lib->set_sale_location($stock_location);
 		}
@@ -194,8 +240,8 @@ class Sales extends Secure_Controller
 		$this->_reload();
 	}
 
-	public function change_register_mode($sale_type)
-	{
+	public function change_register_mode(int $sale_type): void
+	{//TODO: This set of if statements should be refactored to a switch
 		if($sale_type == SALE_TYPE_POS)
 		{
 			$this->sale_lib->set_mode('sale');
@@ -222,174 +268,199 @@ class Sales extends Secure_Controller
 		}
 	}
 
-	public function set_comment()
+	public function set_comment(): void
 	{
-		$this->sale_lib->set_comment($this->input->post('comment'));
+		$this->sale_lib->set_comment($this->request->getPost('comment', FILTER_SANITIZE_STRING));
 	}
 
-	public function set_invoice_number()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function set_invoice_number(): void
 	{
-		$this->sale_lib->set_invoice_number($this->input->post('sales_invoice_number'));
+		$this->sale_lib->set_invoice_number($this->request->getPost('sales_invoice_number', FILTER_SANITIZE_NUMBER_INT));
 	}
 
-	public function set_payment_type()
+	public function set_payment_type(): void	//TODO: This function does not appear to be called anywhere in the code.
 	{
-		$this->sale_lib->set_payment_type($this->input->post('selected_payment_type'));
-		$this->_reload();
+		$this->sale_lib->set_payment_type($this->request->getPost('selected_payment_type', FILTER_SANITIZE_STRING));
+		$this->_reload();	//TODO: Hungarian notation.
 	}
 
-	public function set_print_after_sale()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function set_print_after_sale(): void
 	{
-		$this->sale_lib->set_print_after_sale($this->input->post('sales_print_after_sale'));
+		$this->sale_lib->set_print_after_sale($this->request->getPost('sales_print_after_sale', FILTER_SANITIZE_NUMBER_INT));
 	}
 
-	public function set_price_work_orders()
+	public function set_price_work_orders(): void
 	{
-		$this->sale_lib->set_price_work_orders($this->input->post('price_work_orders'));
+		$this->sale_lib->set_price_work_orders($this->request->getPost('price_work_orders', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
 	}
 
-	public function set_email_receipt()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function set_email_receipt(): void
 	{
-		$this->sale_lib->set_email_receipt($this->input->post('email_receipt'));
+		$this->sale_lib->set_email_receipt($this->request->getPost('email_receipt', FILTER_SANITIZE_STRING));
 	}
 
-	// Multiple Payments
-	public function add_payment()
+	/**
+	 * Multiple Payments. Called in the view.
+	 * @return void
+	 */
+	public function add_payment(): void
 	{
-		$data = array();
+		$data = [];
 
-		$payment_type = $this->input->post('payment_type');
-		if($payment_type !== $this->lang->line('sales_giftcard'))
+		$payment_type = $this->request->getPost('payment_type', FILTER_SANITIZE_STRING);
+
+		//TODO: See the code block below.  This too needs to be ternary notation.
+		if($payment_type !== lang('Sales.giftcard'))
 		{
-			$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|callback_numeric');
+			$this->validator->setRule('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|numeric');
 		}
 		else
 		{
-			$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required');
+			$this->validator->setRule('amount_tendered', 'lang:sales_amount_tendered', 'trim|required');
 		}
 
-		if($this->form_validation->run() == FALSE)
-		{
-			if($payment_type === $this->lang->line('sales_giftcard'))
+		if(!$this->validate([]))
+		{//TODO: the code below should be refactored to the following ternary notation since it's much more readable and concise:
+			//$data['error'] = $payment_type === lang('Sales.giftcard')
+			//	? $data['error'] = lang('Sales.must_enter_numeric_giftcard')
+			//	: $data['error'] = lang('Sales.must_enter_numeric');
+
+			if($payment_type === lang('Sales.giftcard'))
 			{
-				$data['error'] = $this->lang->line('sales_must_enter_numeric_giftcard');
+				$data['error'] = lang('Sales.must_enter_numeric_giftcard');
 			}
 			else
 			{
-				$data['error'] = $this->lang->line('sales_must_enter_numeric');
+				$data['error'] = lang('Sales.must_enter_numeric');
 			}
 		}
 		else
 		{
-			if($payment_type === $this->lang->line('sales_giftcard'))
+			if($payment_type === lang('Sales.giftcard'))
 			{
 				// in case of giftcard payment the register input amount_tendered becomes the giftcard number
-				$giftcard_num = $this->input->post('amount_tendered');
+				$giftcard_num = $this->request->getPost('amount_tendered', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 
 				$payments = $this->sale_lib->get_payments();
 				$payment_type = $payment_type . ':' . $giftcard_num;
 				$current_payments_with_giftcard = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0;
-				$cur_giftcard_value = $this->Giftcard->get_giftcard_value($giftcard_num);
-				$cur_giftcard_customer = $this->Giftcard->get_giftcard_customer($giftcard_num);
+				$cur_giftcard_value = $this->giftcard->get_giftcard_value($giftcard_num);
+				$cur_giftcard_customer = $this->giftcard->get_giftcard_customer($giftcard_num);
 				$customer_id = $this->sale_lib->get_customer();
+
 				if(isset($cur_giftcard_customer) && $cur_giftcard_customer != $customer_id)
 				{
-					$data['error'] = $this->lang->line('giftcards_cannot_use', $giftcard_num);
+					$data['error'] = lang('Giftcards.cannot_use', ['giftcard_num' => $giftcard_num]);
 				}
-				elseif(($cur_giftcard_value - $current_payments_with_giftcard) <= 0 && $this->sale_lib->get_mode() == 'sale')
+				elseif(($cur_giftcard_value - $current_payments_with_giftcard) <= 0 && $this->sale_lib->get_mode() == 'sale')	//TODO ===?
 				{
-					$data['error'] = $this->lang->line('giftcards_remaining_balance', $giftcard_num, to_currency($cur_giftcard_value));
+					$data['error'] = lang('Giftcards.remaining_balance', ['giftcard_num' => $giftcard_num, 'balance' => to_currency($cur_giftcard_value)]);
 				}
 				else
 				{
-					$new_giftcard_value = $this->Giftcard->get_giftcard_value($giftcard_num) - $this->sale_lib->get_amount_due();
-					$new_giftcard_value = $new_giftcard_value >= 0 ? $new_giftcard_value : 0;
+					$new_giftcard_value = $this->giftcard->get_giftcard_value($giftcard_num) - $this->sale_lib->get_amount_due();
+					$new_giftcard_value = max($new_giftcard_value, 0);
 					$this->sale_lib->set_giftcard_remainder($new_giftcard_value);
 					$new_giftcard_value = str_replace('$', '\$', to_currency($new_giftcard_value));
-					$data['warning'] = $this->lang->line('giftcards_remaining_balance', $giftcard_num, $new_giftcard_value);
-					$amount_tendered = min($this->sale_lib->get_amount_due(), $this->Giftcard->get_giftcard_value($giftcard_num));
+					$data['warning'] = lang('Giftcards.remaining_balance', $giftcard_num, $new_giftcard_value);
+					$amount_tendered = min($this->sale_lib->get_amount_due(), $this->giftcard->get_giftcard_value($giftcard_num));
 
 					$this->sale_lib->add_payment($payment_type, $amount_tendered);
 				}
 			}
-			elseif($payment_type === $this->lang->line('sales_rewards'))
+			elseif($payment_type === lang('Sales.rewards'))
 			{
 				$customer_id = $this->sale_lib->get_customer();
-				$package_id = $this->Customer->get_info($customer_id)->package_id;
+				$package_id = $this->customer->get_info($customer_id)->package_id;
 				if(!empty($package_id))
 				{
-					$package_name = $this->Customer_rewards->get_name($package_id);
-					$points = $this->Customer->get_info($customer_id)->points;
+					$package_name = $this->customer_rewards->get_name($package_id);	//TODO: this variable is never used.
+					$points = $this->customer->get_info($customer_id)->points;
 					$points = ($points == NULL ? 0 : $points);
 
 					$payments = $this->sale_lib->get_payments();
-					$payment_type = $payment_type;
 					$current_payments_with_rewards = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0;
 					$cur_rewards_value = $points;
 
 					if(($cur_rewards_value - $current_payments_with_rewards) <= 0)
 					{
-						$data['error'] = $this->lang->line('rewards_remaining_balance') . to_currency($cur_rewards_value);
+						$data['error'] = lang('Sales.rewards_remaining_balance') . to_currency($cur_rewards_value);
 					}
 					else
 					{
 						$new_reward_value = $points - $this->sale_lib->get_amount_due();
-						$new_reward_value = $new_reward_value >= 0 ? $new_reward_value : 0;
+						$new_reward_value = max($new_reward_value, 0);
 						$this->sale_lib->set_rewards_remainder($new_reward_value);
 						$new_reward_value = str_replace('$', '\$', to_currency($new_reward_value));
-						$data['warning'] = $this->lang->line('rewards_remaining_balance'). $new_reward_value;
+						$data['warning'] = lang('Sales.rewards_remaining_balance'). $new_reward_value;
 						$amount_tendered = min($this->sale_lib->get_amount_due(), $points);
 
 						$this->sale_lib->add_payment($payment_type, $amount_tendered);
 					}
 				}
 			}
-			elseif($payment_type === $this->lang->line('sales_cash'))
+			elseif($payment_type === lang('Sales.cash'))
 			{
 				$amount_due = $this->sale_lib->get_total();
 				$sales_total = $this->sale_lib->get_total(FALSE);
 
-				$amount_tendered = $this->input->post('amount_tendered');
+				$amount_tendered = $this->request->getPost('amount_tendered', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 				$this->sale_lib->add_payment($payment_type, $amount_tendered);
 				$cash_adjustment_amount = $amount_due - $sales_total;
 				if($cash_adjustment_amount <> 0)
 				{
-					$this->session->set_userdata('cash_mode', CASH_MODE_TRUE);
-					$this->sale_lib->add_payment($this->lang->line('sales_cash_adjustment'), $cash_adjustment_amount, CASH_ADJUSTMENT_TRUE);
+					$this->session->set('cash_mode', CASH_MODE_TRUE);
+					$this->sale_lib->add_payment(lang('Sales.cash_adjustment'), $cash_adjustment_amount, CASH_ADJUSTMENT_TRUE);
 				}
 			}
 			else
 			{
-				$amount_tendered = $this->input->post('amount_tendered');
+				$amount_tendered = $this->request->getPost('amount_tendered', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 				$this->sale_lib->add_payment($payment_type, $amount_tendered);
 			}
 		}
 
-		$this->_reload($data);
+		$this->_reload($data);	//TODO: Hungarian notation
 	}
 
-	// Multiple Payments
-	public function delete_payment($payment_id)
+	/**
+	 * Multiple Payments. Called in the view.
+	 * @param string $payment_id
+	 * @return void
+	 */
+	public function delete_payment(string $payment_id): void
 	{
 		$this->sale_lib->delete_payment($payment_id);
 
-		$this->_reload();
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
-	public function add()
+	public function add(): void
 	{
-		$data = array();
+		$data = [];
 
-		$discount = $this->config->item('default_sales_discount');
-		$discount_type = $this->config->item('default_sales_discount_type');
+		$discount = config('OSPOS')->default_sales_discount;
+		$discount_type = config('OSPOS')->default_sales_discount_type;
 
 		// check if any discount is assigned to the selected customer
 		$customer_id = $this->sale_lib->get_customer();
-		if($customer_id != -1)
+		if($customer_id != -1)	//TODO: Replace -1 with a constant
 		{
 			// load the customer discount if any
-			$customer_discount = $this->Customer->get_info($customer_id)->discount;
-			$customer_discount_type = $this->Customer->get_info($customer_id)->discount_type;
+			$customer_discount = $this->customer->get_info($customer_id)->discount;
+			$customer_discount_type = $this->customer->get_info($customer_id)->discount_type;
 			if($customer_discount != '')
 			{
 				$discount = $customer_discount;
@@ -397,23 +468,23 @@ class Sales extends Secure_Controller
 			}
 		}
 
-		$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
+		$item_id_or_number_or_item_kit_or_receipt = $this->request->getPost('item', FILTER_SANITIZE_STRING);
 		$this->token_lib->parse_barcode($quantity, $price, $item_id_or_number_or_item_kit_or_receipt);
 		$mode = $this->sale_lib->get_mode();
 		$quantity = ($mode == 'return') ? -$quantity : $quantity;
 		$item_location = $this->sale_lib->get_sale_location();
 
-		if($mode == 'return' && $this->Sale->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt))
+		if($mode == 'return' && $this->sale->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt))
 		{
 			$this->sale_lib->return_entire_sale($item_id_or_number_or_item_kit_or_receipt);
 		}
-		elseif($this->Item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
+		elseif($this->item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt))
 		{
 			// Add kit item to order if one is assigned
 			$pieces = explode(' ', $item_id_or_number_or_item_kit_or_receipt);
 
 			$item_kit_id = (count($pieces) > 1) ? $pieces[1] : $item_id_or_number_or_item_kit_or_receipt;
-			$item_kit_info = $this->Item_kit->get_info($item_kit_id);
+			$item_kit_info = $this->item_kit->get_info($item_kit_id);
 			$kit_item_id = $item_kit_info->kit_item_id;
 			$kit_price_option = $item_kit_info->price_option;
 			$kit_print_option = $item_kit_info->print_option; // 0-all, 1-priced, 2-kit-only
@@ -431,13 +502,13 @@ class Sales extends Secure_Controller
 				$discount_type = $item_kit_info->kit_discount_type;
 			}
 
-			$print_option = PRINT_ALL; // Always include in list of items on invoice
+			$print_option = PRINT_ALL; // Always include in list of items on invoice //TODO: This variable is never used in the code
 
 			if(!empty($kit_item_id))
 			{
-				if(!$this->sale_lib->add_item($kit_item_id, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option, $price))
+				if(!$this->sale_lib->add_item($kit_item_id, $item_location, $quantity, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option, $price))
 				{
-					$data['error'] = $this->lang->line('sales_unable_to_add_item');
+					$data['error'] = lang('Sales.unable_to_add_item');
 				}
 				else
 				{
@@ -449,7 +520,7 @@ class Sales extends Secure_Controller
 			$stock_warning = NULL;
 			if(!$this->sale_lib->add_item_kit($item_id_or_number_or_item_kit_or_receipt, $item_location, $discount, $discount_type, $kit_price_option, $kit_print_option, $stock_warning))
 			{
-				$data['error'] = $this->lang->line('sales_unable_to_add_item');
+				$data['error'] = lang('Sales.unable_to_add_item');
 			}
 			elseif($stock_warning != NULL)
 			{
@@ -458,9 +529,9 @@ class Sales extends Secure_Controller
 		}
 		else
 		{
-			if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location, $discount, $discount_type, PRICE_MODE_STANDARD, NULL, NULL, $price))
+			if(!$this->sale_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $item_location, $quantity, $discount, $discount_type, PRICE_MODE_STANDARD, NULL, NULL, $price))
 			{
-				$data['error'] = $this->lang->line('sales_unable_to_add_item');
+				$data['error'] = lang('Sales.unable_to_add_item');
 			}
 			else
 			{
@@ -471,91 +542,109 @@ class Sales extends Secure_Controller
 		$this->_reload($data);
 	}
 
-	public function edit_item($item_id)
+	/**
+	 * Called in the view.
+	 * @param string $line
+	 * @return void
+	 */
+	public function edit_item(string $line): void
 	{
-		$data = array();
+		$data = [];
 
-		$this->form_validation->set_rules('price', 'lang:sales_price', 'required|callback_numeric');
-		$this->form_validation->set_rules('quantity', 'lang:sales_quantity', 'required|callback_numeric');
-		$this->form_validation->set_rules('discount', 'lang:sales_discount', 'required|callback_numeric');
+		$this->validator->setRule('price', 'lang:sales_price', 'required|numeric');
+		$this->validator->setRule('quantity', 'lang:sales_quantity', 'required|numeric');
+		$this->validator->setRule('discount', 'lang:sales_discount', 'required|numeric');
 
-		$description = $this->input->post('description');
-		$serialnumber = $this->input->post('serialnumber');
-		$price = parse_decimals($this->input->post('price'));
-		$quantity = parse_quantity($this->input->post('quantity'));
-		$discount_type = $this->input->post('discount_type');
-		$discount = $discount_type ? parse_quantity($this->input->post('discount')) : parse_decimals($this->input->post('discount'));
+		$description = $this->request->getPost('description', FILTER_SANITIZE_STRING);
+		$serialnumber = $this->request->getPost('serialnumber', FILTER_SANITIZE_STRING);
+		$price = parse_decimals($this->request->getPost('price', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$quantity = parse_quantity($this->request->getPost('quantity', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+		$discount_type = $this->request->getPost('discount_type', FILTER_SANITIZE_STRING);
+		$discount = $discount_type ? parse_quantity($this->request->getPost('discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)) : parse_decimals($this->request->getPost('discount', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
 
-		$item_location = $this->input->post('location');
-		$discounted_total = $this->input->post('discounted_total') != '' ? $this->input->post('discounted_total') : NULL;
+		$item_location = $this->request->getPost('location', FILTER_SANITIZE_NUMBER_INT);
+		$discounted_total = $this->request->getPost('discounted_total') != '' ? $this->request->getPost('discounted_total', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) : NULL;
 
-		if($this->form_validation->run() != FALSE)
+		if(!$this->validate([]))
 		{
-			$this->sale_lib->edit_item($item_id, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $discounted_total);
+			$this->sale_lib->edit_item($line, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $discounted_total);
 			
 			$this->sale_lib->empty_payments();
 		}
 		else
 		{
-			$data['error'] = $this->lang->line('sales_error_editing_item');
+			$data['error'] = lang('Sales.error_editing_item');
 		}
 
-		$data['warning'] = $this->sale_lib->out_of_stock($this->sale_lib->get_item_id($item_id), $item_location);
+		$data['warning'] = $this->sale_lib->out_of_stock($this->sale_lib->get_item_id($line), $item_location);
 
-		$this->_reload($data);
+		$this->_reload($data);	//TODO: Hungarian notation
 	}
 
-	public function delete_item($item_number)
+	/**
+	 * Deletes an item specified in the parameter from the shopping cart. Called in the view.
+	 * @param int $item_id
+	 * @return void
+	 * @throws ReflectionException
+	 */
+	public function delete_item(int $item_id): void
 	{
-		$this->sale_lib->delete_item($item_number);
+		$this->sale_lib->delete_item($item_id);
 
-		$this->sale_lib->empty_payments();		
+		$this->sale_lib->empty_payments();
 
-		$this->_reload();
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
-	public function remove_customer()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function remove_customer(): void
 	{
 		$this->sale_lib->clear_giftcard_remainder();
 		$this->sale_lib->clear_rewards_remainder();
-		$this->sale_lib->delete_payment($this->lang->line('sales_rewards'));
+		$this->sale_lib->delete_payment(lang('Sales.rewards'));
 		$this->sale_lib->clear_invoice_number();
 		$this->sale_lib->clear_quote_number();
 		$this->sale_lib->remove_customer();
 
-		$this->_reload();
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
-	public function complete()
+	/**
+	 * @return void
+	 * @throws ReflectionException
+	 */
+	public function complete(): void	//TODO: this function is huge.  Probably should be refactored.
 	{
 		$sale_id = $this->sale_lib->get_sale_id();
-		$sale_type = $this->sale_lib->get_sale_type();
-		$data = array();
+		$sale_type = $this->sale_lib->get_sale_type();	//TODO: This variable gets overwritten way down below before being used.
+		$data = [];
 		$data['dinner_table'] = $this->sale_lib->get_dinner_table();
 
 		$data['cart'] = $this->sale_lib->get_cart();
 
-		$data['include_hsn'] = ($this->config->item('include_hsn') == '1');
+		$data['include_hsn'] = (bool)config('OSPOS')->include_hsn;
 		$__time = time();
 		$data['transaction_time'] = to_datetime($__time);
 		$data['transaction_date'] = to_date($__time);
-		$data['show_stock_locations'] = $this->Stock_location->show_locations('sales');
+		$data['show_stock_locations'] = $this->stock_location->show_locations('sales');
 		$data['comments'] = $this->sale_lib->get_comment();
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$employee_info = $this->Employee->get_info($employee_id);
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$employee_info = $this->employee->get_info($employee_id);
 		$data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
 
-		$data['company_info'] = implode("\n", array(
-			$this->config->item('address'),
-			$this->config->item('phone')
-		));
-		if($this->config->item('account_number'))
+		$data['company_info'] = implode("\n", [config('OSPOS')->address, config('OSPOS')->phone]);
+
+		if(config('OSPOS')->account_number)
 		{
-			$data['company_info'] .= "\n" . $this->lang->line('sales_account_number') . ": " . $this->config->item('account_number');
+			$data['company_info'] .= "\n" . lang('Sales.account_number') . ": " . config('OSPOS')->account_number;
 		}
-		if($this->config->item('tax_id') != '')
+
+		if(config('OSPOS')->tax_id != '')
 		{
-			$data['company_info'] .= "\n" . $this->lang->line('sales_tax_id') . ": " . $this->config->item('tax_id');
+			$data['company_info'] .= "\n" . lang('Sales.tax_id') . ": " . config('OSPOS')->tax_id;
 		}
 
 		$data['invoice_number_enabled'] = $this->sale_lib->is_invoice_mode();
@@ -572,12 +661,13 @@ class Sales extends Secure_Controller
 		$quote_number = $this->sale_lib->get_quote_number();
 		$data["quote_number"] = $quote_number;
 		$customer_info = $this->_load_customer_data($customer_id, $data);
+
 		if($customer_info != NULL)
 		{
 			$data["customer_comments"] = $customer_info->comments;
 			$data['tax_id'] = $customer_info->tax_id;
 		}
-		$tax_details = $this->tax_lib->get_taxes($data['cart']);
+		$tax_details = $this->tax_lib->get_taxes($data['cart']);	//TODO: Duplicated code
 		$data['taxes'] = $tax_details[0];
 		$data['discount'] = $this->sale_lib->get_discount();
 		$data['payments'] = $this->sale_lib->get_payments();
@@ -588,15 +678,15 @@ class Sales extends Secure_Controller
 		$data['total'] = $totals['total'];
 		$data['payments_total'] = $totals['payment_total'];
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
-		$data['cash_rounding'] = $this->session->userdata('cash_rounding');
-		$data['cash_mode'] = $this->session->userdata('cash_mode');
+		$data['cash_rounding'] = $this->session->get('cash_rounding');
+		$data['cash_mode'] = $this->session->get('cash_mode');	//TODO: Duplicated code
 		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
 		$data['non_cash_amount_due'] = $totals['amount_due'];
 
-		if($data['cash_mode'])
+		if($data['cash_mode'])	//TODO: Convert this to ternary notation
 		{
 			$data['amount_due'] = $totals['cash_amount_due'];
 		}
@@ -611,13 +701,20 @@ class Sales extends Secure_Controller
 		{
 			// Save cash refund to the cash payment transaction if found, if not then add as new Cash transaction
 
-			if(array_key_exists($this->lang->line('sales_cash'), $data['payments']))
+			if(array_key_exists(lang('Sales.cash'), $data['payments']))
 			{
-				$data['payments'][$this->lang->line('sales_cash')]['cash_refund'] = $data['amount_change'];
+				$data['payments'][lang('Sales.cash')]['cash_refund'] = $data['amount_change'];
 			}
 			else
 			{
-				$payment = array($this->lang->line('sales_cash') => array('payment_type' => $this->lang->line('sales_cash'), 'payment_amount' => 0, 'cash_refund' => $data['amount_change']));
+				$payment = [
+					lang('Sales.cash') => [
+						'payment_type' => lang('Sales.cash'),
+						'payment_amount' => 0,
+						'cash_refund' => $data['amount_change']
+					]
+				];
+
 				$data['payments'] += $payment;
 			}
 		}
@@ -626,8 +723,9 @@ class Sales extends Secure_Controller
 
 		if($this->sale_lib->is_invoice_mode())
 		{
-			$invoice_format = $this->config->item('sales_invoice_format');
-			// generate final invoice numbr (if using the invoice in sales by receipt mode then the invoice number can be manually entered or altered in some way
+			$invoice_format = config('OSPOS')->sales_invoice_format;
+
+			// generate final invoice number (if using the invoice in sales by receipt mode then the invoice number can be manually entered or altered in some way
 			if(!empty($invoice_format) && $invoice_number == NULL)
 			{
 				// The user can retain the default encoded format or can manually override it.  It still passes through the rendering step.
@@ -635,9 +733,9 @@ class Sales extends Secure_Controller
 			}
 
 
-			if($sale_id == -1 && $this->Sale->check_invoice_number_exists($invoice_number))
+			if($sale_id == -1 && $this->sale->check_invoice_number_exists($invoice_number))	//TODO: Replace -1 with constant
 			{
-				$data['error'] = $this->lang->line('sales_invoice_number_duplicate', $invoice_number);
+				$data['error'] = lang('Sales.invoice_number_duplicate', ['invoice_number' => $invoice_number]);
 				$this->_reload($data);
 			}
 			else
@@ -647,25 +745,23 @@ class Sales extends Secure_Controller
 				$sale_type = SALE_TYPE_INVOICE;
 
 				// The PHP file name is the same as the invoice_type key
-				$invoice_view = $this->config->item('invoice_type');
+				$invoice_view = config('OSPOS')->invoice_type;
 
 				// Save the data to the sales table
-				$data['sale_id_num'] = $this->Sale->save($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+				$data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
 				$data['sale_id'] = 'POS ' . $data['sale_id_num'];
 
 				// Resort and filter cart lines for printing
 				$data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
 
-				$data = $this->xss_clean($data);
-
 				if($data['sale_id_num'] == -1)
 				{
-					$data['error_message'] = $this->lang->line('sales_transaction_failed');
+					$data['error_message'] = lang('Sales.transaction_failed');
 				}
 				else
 				{
 					$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
-					$this->load->view('sales/'.$invoice_view, $data);
+					echo view('sales/'.$invoice_view, $data);
 					$this->sale_lib->clear_all();
 				}
 			}
@@ -678,19 +774,19 @@ class Sales extends Secure_Controller
 				$data['print_price_info'] = FALSE;
 			}
 
-			$data['sales_work_order'] = $this->lang->line('sales_work_order');
-			$data['work_order_number_label'] = $this->lang->line('sales_work_order_number');
+			$data['sales_work_order'] = lang('Sales.work_order');
+			$data['work_order_number_label'] = lang('Sales.work_order_number');
 
 			if($work_order_number == NULL)
 			{
 				// generate work order number
-				$work_order_format = $this->config->item('work_order_format');
+				$work_order_format = config('OSPOS')->work_order_format;
 				$work_order_number = $this->token_lib->render($work_order_format);
 			}
 
-			if($sale_id == -1 && $this->Sale->check_work_order_number_exists($work_order_number))
+			if($sale_id == -1 && $this->sale->check_work_order_number_exists($work_order_number))
 			{
-				$data['error'] = $this->lang->line('sales_work_order_number_duplicate');
+				$data['error'] = lang('Sales.work_order_number_duplicate');
 				$this->_reload($data);
 			}
 			else
@@ -699,35 +795,33 @@ class Sales extends Secure_Controller
 				$data['sale_status'] = SUSPENDED;
 				$sale_type = SALE_TYPE_WORK_ORDER;
 
-				$data['sale_id_num'] = $this->Sale->save($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+				$data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
 				$this->sale_lib->set_suspended_id($data['sale_id_num']);
 
 				$data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
 
-				$data = $this->xss_clean($data);
-
 				$data['barcode'] = NULL;
 
-				$this->load->view('sales/work_order', $data);
+				echo view('sales/work_order', $data);
 				$this->sale_lib->clear_mode();
 				$this->sale_lib->clear_all();
 			}
 		}
 		elseif($this->sale_lib->is_quote_mode())
 		{
-			$data['sales_quote'] = $this->lang->line('sales_quote');
-			$data['quote_number_label'] = $this->lang->line('sales_quote_number');
+			$data['sales_quote'] = lang('Sales.quote');
+			$data['quote_number_label'] = lang('Sales.quote_number');
 
 			if($quote_number == NULL)
 			{
 				// generate quote number
-				$quote_format = $this->config->item('sales_quote_format');
+				$quote_format = config('OSPOS')->sales_quote_format;
 				$quote_number = $this->token_lib->render($quote_format);
 			}
 
-			if($sale_id == -1 && $this->Sale->check_quote_number_exists($quote_number))
+			if($sale_id == -1 && $this->sale->check_quote_number_exists($quote_number))
 			{
-				$data['error'] = $this->lang->line('sales_quote_number_duplicate');
+				$data['error'] = lang('Sales.quote_number_duplicate');
 				$this->_reload($data);
 			}
 			else
@@ -736,16 +830,13 @@ class Sales extends Secure_Controller
 				$data['sale_status'] = SUSPENDED;
 				$sale_type = SALE_TYPE_QUOTE;
 
-				$data['sale_id_num'] = $this->Sale->save($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+				$data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
 				$this->sale_lib->set_suspended_id($data['sale_id_num']);
 
 				$data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
-
-				$data = $this->xss_clean($data);
-
 				$data['barcode'] = NULL;
 
-				$this->load->view('sales/quote', $data);
+				echo view('sales/quote', $data);
 				$this->sale_lib->clear_mode();
 				$this->sale_lib->clear_all();
 			}
@@ -763,103 +854,113 @@ class Sales extends Secure_Controller
 				$sale_type = SALE_TYPE_POS;
 			}
 
-			$data['sale_id_num'] = $this->Sale->save($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
+			$data['sale_id_num'] = $this->sale->save_value($sale_id, $data['sale_status'], $data['cart'], $customer_id, $employee_id, $data['comments'], $invoice_number, $work_order_number, $quote_number, $sale_type, $data['payments'], $data['dinner_table'], $tax_details);
 
 			$data['sale_id'] = 'POS ' . $data['sale_id_num'];
 
 			$data['cart'] = $this->sale_lib->sort_and_filter_cart($data['cart']);
-			$data = $this->xss_clean($data);
 
-			if($data['sale_id_num'] == -1)
+			if($data['sale_id_num'] == -1)	//TODO: Replace -1 with a constant
 			{
-				$data['error_message'] = $this->lang->line('sales_transaction_failed');
+				$data['error_message'] = lang('Sales.transaction_failed');
 			}
 			else
 			{
 				$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
-				$this->load->view('sales/receipt', $data);
+				echo view('sales/receipt', $data);
 				$this->sale_lib->clear_all();
 			}
 		}
 	}
 
-	public function send_pdf($sale_id, $type = 'invoice')
+	/**
+	 * Called in the view.
+	 * @param int $sale_id
+	 * @param string $type
+	 * @return bool
+	 */
+	public function send_pdf(int $sale_id, string $type = 'invoice'): bool
 	{
 		$sale_data = $this->_load_sale_data($sale_id);
 
 		$result = FALSE;
-		$message = $this->lang->line('sales_invoice_no_email');
+		$message = lang('Sales.invoice_no_email');
 
 		if(!empty($sale_data['customer_email']))
 		{
 			$to = $sale_data['customer_email'];
 			$number = $sale_data[$type."_number"];
-			$subject = $this->lang->line("sales_" . $type) . ' ' . $number;
+			$subject = lang('Sales.' . $type) . ' ' . $number;
 
-			$text = $this->config->item('invoice_email_message');
-			$tokens = array(new Token_invoice_sequence($sale_data['invoice_number']),
+			$text = config('OSPOS')->invoice_email_message;
+			$tokens = [
+				new Token_invoice_sequence($sale_data['invoice_number']),
 				new Token_invoice_count('POS ' . $sale_data['sale_id']),
-				new Token_customer((object)$sale_data));
+				new Token_customer((object)$sale_data)
+			];
 			$text = $this->token_lib->render($text, $tokens);
-			$sale_data['mimetype'] = get_mime_by_extension('uploads/' . $this->config->item('company_logo'));
+			$sale_data['mimetype'] = mime_content_type('uploads/' . config('OSPOS')->company_logo);
 
 			// generate email attachment: invoice in pdf format
-			$html = $this->load->view("sales/" . $type . "_email", $sale_data, TRUE);
+			$view = Services::renderer();
+			$html = $view->render("sales/$type" . '_email', $sale_data);
 
 			// load pdf helper
-			$this->load->helper(array('dompdf', 'file'));
-			$filename = sys_get_temp_dir() . '/' . $this->lang->line("sales_" . $type) . '-' . str_replace('/', '-', $number) . '.pdf';
+			helper (['dompdf', 'file']);
+			$filename = sys_get_temp_dir() . '/' . lang('Sales.' . $type) . '-' . str_replace('/', '-', $number) . '.pdf';
 			if(file_put_contents($filename, create_pdf($html)) !== FALSE)
 			{
 				$result = $this->email_lib->sendEmail($to, $subject, $text, $filename);
 			}
 
-			$message = $this->lang->line($result ? "sales_" . $type . "_sent" : "sales_" . $type . "_unsent") . ' ' . $to;
+			$message = lang($result ? "sales_" . $type . "_sent" : "sales_" . $type . "_unsent") . ' ' . $to;
 		}
 
-		echo json_encode(array('success' => $result, 'message' => $message, 'id' => $sale_id));
+		echo json_encode (['success' => $result, 'message' => $message, 'id' => $sale_id]);
 
 		$this->sale_lib->clear_all();
 
 		return $result;
 	}
 
-	public function send_receipt($sale_id)
+	public function send_receipt(int $sale_id): bool
 	{
 		$sale_data = $this->_load_sale_data($sale_id);
 
 		$result = FALSE;
-		$message = $this->lang->line('sales_receipt_no_email');
+		$message = lang('Sales.receipt_no_email');
 
 		if(!empty($sale_data['customer_email']))
 		{
 			$sale_data['barcode'] = $this->barcode_lib->generate_receipt_barcode($sale_data['sale_id']);
 
 			$to = $sale_data['customer_email'];
-			$subject = $this->lang->line('sales_receipt');
+			$subject = lang('Sales.receipt');
 
-			$text = $this->load->view('sales/receipt_email', $sale_data, TRUE);
+			$view = Services::renderer();
+			$text = $view->render('sales/receipt_email', $sale_data);
 
 			$result = $this->email_lib->sendEmail($to, $subject, $text);
 
-			$message = $this->lang->line($result ? 'sales_receipt_sent' : 'sales_receipt_unsent') . ' ' . $to;
+			$message = lang($result ? 'sales_receipt_sent' : 'sales_receipt_unsent') . ' ' . $to;
 		}
 
-		echo json_encode(array('success' => $result, 'message' => $message, 'id' => $sale_id));
+		echo json_encode (['success' => $result, 'message' => $message, 'id' => $sale_id]);
 
 		$this->sale_lib->clear_all();
 
 		return $result;
 	}
 
-	private function _load_customer_data($customer_id, &$data, $stats = FALSE)
+	private function _load_customer_data(int $customer_id, array &$data, bool $stats = FALSE)	//TODO: Hungarian notation
 	{
 		$customer_info = '';
 
 		if($customer_id != -1)
 		{
-			$customer_info = $this->Customer->get_info($customer_id);
+			$customer_info = $this->customer->get_info($customer_id);
 			$data['customer_id'] = $customer_id;
+
 			if(!empty($customer_info->company_name))
 			{
 				$data['customer'] = $customer_info->company_name;
@@ -868,10 +969,12 @@ class Sales extends Secure_Controller
 			{
 				$data['customer'] = $customer_info->first_name . ' ' . $customer_info->last_name;
 			}
+
 			$data['first_name'] = $customer_info->first_name;
 			$data['last_name'] = $customer_info->last_name;
 			$data['customer_email'] = $customer_info->email;
 			$data['customer_address'] = $customer_info->address_1;
+
 			if(!empty($customer_info->zip) || !empty($customer_info->city))
 			{
 				$data['customer_location'] = $customer_info->zip . ' ' . $customer_info->city . "\n" . $customer_info->state;
@@ -880,14 +983,16 @@ class Sales extends Secure_Controller
 			{
 				$data['customer_location'] = '';
 			}
+
 			$data['customer_account_number'] = $customer_info->account_number;
 			$data['customer_discount'] = $customer_info->discount;
 			$data['customer_discount_type'] = $customer_info->discount_type;
-			$package_id = $this->Customer->get_info($customer_id)->package_id;
+			$package_id = $this->customer->get_info($customer_id)->package_id;
+
 			if($package_id != NULL)
 			{
-				$package_name = $this->Customer_rewards->get_name($package_id);
-				$points = $this->Customer->get_info($customer_id)->points;
+				$package_name = $this->customer_rewards->get_name($package_id);
+				$points = $this->customer->get_info($customer_id)->points;
 				$data['customer_rewards']['package_id'] = $package_id;
 				$data['customer_rewards']['points'] = empty($points) ? 0 : $points;
 				$data['customer_rewards']['package_name'] = $package_name;
@@ -895,23 +1000,24 @@ class Sales extends Secure_Controller
 
 			if($stats)
 			{
-				$cust_stats = $this->Customer->get_stats($customer_id);
+				$cust_stats = $this->customer->get_stats($customer_id);
 				$data['customer_total'] = empty($cust_stats) ? 0 : $cust_stats->total;
 			}
 
-			$data['customer_info'] = implode("\n", array(
+			$data['customer_info'] = implode("\n", [
 				$data['customer'],
 				$data['customer_address'],
 				$data['customer_location']
-			));
+			]);
 
 			if($data['customer_account_number'])
 			{
-				$data['customer_info'] .= "\n" . $this->lang->line('sales_account_number') . ": " . $data['customer_account_number'];
+				$data['customer_info'] .= "\n" . lang('Sales.account_number') . ": " . $data['customer_account_number'];
 			}
+
 			if($customer_info->tax_id != '')
 			{
-				$data['customer_info'] .= "\n" . $this->lang->line('sales_tax_id') . ": " . $customer_info->tax_id;
+				$data['customer_info'] .= "\n" . lang('Sales.tax_id') . ": " . $customer_info->tax_id;
 			}
 			$data['tax_id'] = $customer_info->tax_id;
 		}
@@ -919,42 +1025,42 @@ class Sales extends Secure_Controller
 		return $customer_info;
 	}
 
-	private function _load_sale_data($sale_id)
+	private function _load_sale_data($sale_id): array    //TODO: Hungarian notation
 	{
 		$this->sale_lib->clear_all();
 		$cash_rounding = $this->sale_lib->reset_cash_rounding();
 		$data['cash_rounding'] = $cash_rounding;
 
-		$sale_info = $this->Sale->get_info($sale_id)->row_array();
+		$sale_info = $this->sale->get_info($sale_id)->getRowArray();
 		$this->sale_lib->copy_entire_sale($sale_id);
-		$data = array();
+		$data = [];
 		$data['cart'] = $this->sale_lib->get_cart();
 		$data['payments'] = $this->sale_lib->get_payments();
 		$data['selected_payment_type'] = $this->sale_lib->get_payment_type();
 
 		$tax_details = $this->tax_lib->get_taxes($data['cart'], $sale_id);
-		$data['taxes'] = $this->Sale->get_sales_taxes($sale_id);
+		$data['taxes'] = $this->sale->get_sales_taxes($sale_id);
 		$data['discount'] = $this->sale_lib->get_discount();
 		$data['transaction_time'] = to_datetime(strtotime($sale_info['sale_time']));
 		$data['transaction_date'] = to_date(strtotime($sale_info['sale_time']));
-		$data['show_stock_locations'] = $this->Stock_location->show_locations('sales');
+		$data['show_stock_locations'] = $this->stock_location->show_locations('sales');
 
-		$data['include_hsn'] = ($this->config->item('include_hsn') == '1');
+		$data['include_hsn'] = (bool)config('OSPOS')->include_hsn;
 
 		// Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total'
 		$totals = $this->sale_lib->get_totals($tax_details[0]);
-		$this->session->set_userdata('cash_adjustment_amount', $totals['cash_adjustment_amount']);
+		$this->session->set('cash_adjustment_amount', $totals['cash_adjustment_amount']);
 		$data['subtotal'] = $totals['subtotal'];
 		$data['payments_total'] = $totals['payment_total'];
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
-		$data['cash_mode'] = $this->session->userdata('cash_mode');
+		$data['cash_mode'] = $this->session->get('cash_mode');	//TODO: Duplicated code.
 		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
 		$data['non_cash_amount_due'] = $totals['amount_due'];
 
-		if($data['cash_mode'] && ($data['selected_payment_type'] === $this->lang->line('sales_cash') || $data['payments_total'] > 0))
+		if($data['cash_mode'] && ($data['selected_payment_type'] === lang('Sales.cash') || $data['payments_total'] > 0))
 		{
 			$data['total'] = $totals['cash_total'];
 			$data['amount_due'] = $totals['cash_amount_due'];
@@ -967,7 +1073,7 @@ class Sales extends Secure_Controller
 
 		$data['amount_change'] = $data['amount_due'] * -1;
 
-		$employee_info = $this->Employee->get_info($this->sale_lib->get_employee());
+		$employee_info = $this->employee->get_info($this->sale_lib->get_employee());
 		$data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
 		$this->_load_customer_data($this->sale_lib->get_customer(), $data);
 
@@ -978,62 +1084,61 @@ class Sales extends Secure_Controller
 		$data['quote_number'] = $sale_info['quote_number'];
 		$data['sale_status'] = $sale_info['sale_status'];
 
-		$data['company_info'] = implode("\n", array(
-			$this->config->item('address'),
-			$this->config->item('phone')
-		));
-		if($this->config->item('account_number'))
+		$data['company_info'] = implode('\n', [config('OSPOS')->address, config('OSPOS')->phone]);	//TODO: Duplicated code.
+
+		if(config('OSPOS')->account_number)
 		{
-			$data['company_info'] .= "\n" . $this->lang->line('sales_account_number') . ": " . $this->config->item('account_number');
+			$data['company_info'] .= '\n' . lang('Sales.account_number') . ": " . config('OSPOS')->account_number;
 		}
-		if($this->config->item('tax_id') != '')
+		if(config('OSPOS')->tax_id != '')
 		{
-			$data['company_info'] .= "\n" . $this->lang->line('sales_tax_id') . ": " . $this->config->item('tax_id');
+			$data['company_info'] .= '\n' . lang('Sales.tax_id') . ": " . config('OSPOS')->tax_id;
 		}
 
 		$data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
 		$data['print_after_sale'] = FALSE;
 		$data['price_work_orders'] = FALSE;
 
-		if($this->sale_lib->get_mode() == 'sale_invoice')
+		if($this->sale_lib->get_mode() == 'sale_invoice')	//TODO: Duplicated code.
 		{
-			$data['mode_label'] = $this->lang->line('sales_invoice');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.invoice');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'sale_quote')
 		{
-			$data['mode_label'] = $this->lang->line('sales_quote');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.quote');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'sale_work_order')
 		{
-			$data['mode_label'] = $this->lang->line('sales_work_order');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.work_order');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'return')
 		{
-			$data['mode_label'] = $this->lang->line('sales_return');
-			$data['customer_required'] = $this->lang->line('sales_customer_optional');
+			$data['mode_label'] = lang('Sales.return');
+			$data['customer_required'] = lang('Sales.customer_optional');
 		}
 		else
 		{
-			$data['mode_label'] = $this->lang->line('sales_receipt');
-			$data['customer_required'] = $this->lang->line('sales_customer_optional');
+			$data['mode_label'] = lang('Sales.receipt');
+			$data['customer_required'] = lang('Sales.customer_optional');
 		}
 
-		$invoice_type = $this->config->item('invoice_type');
+		$invoice_type = config('OSPOS')->invoice_type;
 		$data['invoice_view'] = $invoice_type;
 
-		return $this->xss_clean($data);
+		return $data;
 	}
 
-	private function _reload($data = array())
+	private function _reload($data = []): void	//TODO: Hungarian notation
 	{
-		$sale_id = $this->session->userdata('sale_id');
+		$sale_id = $this->session->get('sale_id');	//TODO: This variable is never used
+
 		if($sale_id == '')
 		{
 			$sale_id = -1;
-			$this->session->set_userdata('sale_id', -1);
+			$this->session->set('sale_id', -1);	//TODO: replace -1 with a constant
 		}
 		$cash_rounding = $this->sale_lib->reset_cash_rounding();
 
@@ -1047,10 +1152,10 @@ class Sales extends Secure_Controller
 		$data['mode'] = $this->sale_lib->get_mode();
 		$data['selected_table'] = $this->sale_lib->get_dinner_table();
 		$data['empty_tables'] = $this->sale_lib->get_empty_tables($data['selected_table']);
-		$data['stock_locations'] = $this->Stock_location->get_allowed_locations('sales');
+		$data['stock_locations'] = $this->stock_location->get_allowed_locations('sales');
 		$data['stock_location'] = $this->sale_lib->get_sale_location();
 		$data['tax_exclusive_subtotal'] = $this->sale_lib->get_subtotal(TRUE, TRUE);
-		$tax_details = $this->tax_lib->get_taxes($data['cart']);
+		$tax_details = $this->tax_lib->get_taxes($data['cart']);	//TODO: Duplicated code.
 		$data['taxes'] = $tax_details[0];
 		$data['discount'] = $this->sale_lib->get_discount();
 		$data['payments'] = $this->sale_lib->get_payments();
@@ -1066,9 +1171,9 @@ class Sales extends Secure_Controller
 		$data['payments_cover_total'] = $totals['payments_cover_total'];
 
 		// cash_mode indicates whether this sale is going to be processed using cash_rounding
-		$cash_mode = $this->session->userdata('cash_mode');
+		$cash_mode = $this->session->get('cash_mode');
 		$data['cash_mode'] = $cash_mode;
-		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];
+		$data['prediscount_subtotal'] = $totals['prediscount_subtotal'];	//TODO: Duplicated code.
 		$data['cash_total'] = $totals['cash_total'];
 		$data['non_cash_total'] = $totals['total'];
 		$data['cash_amount_due'] = $totals['cash_amount_due'];
@@ -1076,7 +1181,7 @@ class Sales extends Secure_Controller
 
 		$data['selected_payment_type'] = $this->sale_lib->get_payment_type();
 
-		if($data['cash_mode'] && ($data['selected_payment_type'] == $this->lang->line('sales_cash') || $data['payments_total'] > 0))
+		if($data['cash_mode'] && ($data['selected_payment_type'] == lang('Sales.cash') || $data['payments_total'] > 0))
 		{
 			$data['total'] = $totals['cash_total'];
 			$data['amount_due'] = $totals['cash_amount_due'];
@@ -1092,27 +1197,26 @@ class Sales extends Secure_Controller
 		$data['comment'] = $this->sale_lib->get_comment();
 		$data['email_receipt'] = $this->sale_lib->is_email_receipt();
 
-		if($customer_info && $this->config->item('customer_reward_enable') == TRUE)
+		if($customer_info && config('OSPOS')->customer_reward_enable)
 		{
-			$data['payment_options'] = $this->Sale->get_payment_options(TRUE, TRUE);
+			$data['payment_options'] = $this->sale->get_payment_options(TRUE, TRUE);
 		}
 		else
 		{
-			$data['payment_options'] = $this->Sale->get_payment_options();
+			$data['payment_options'] = $this->sale->get_payment_options();
 		}
 
-		$data['items_module_allowed'] = $this->Employee->has_grant('items', $this->Employee->get_logged_in_employee_info()->person_id);
-		$data['change_price'] = $this->Employee->has_grant('sales_change_price', $this->Employee->get_logged_in_employee_info()->person_id);
+		$data['items_module_allowed'] = $this->employee->has_grant('items', $this->employee->get_logged_in_employee_info()->person_id);
+		$data['change_price'] = $this->employee->has_grant('sales_change_price', $this->employee->get_logged_in_employee_info()->person_id);
 
-		$temp_invoice_number = $this->sale_lib->get_invoice_number();
-		$invoice_format = $this->config->item('sales_invoice_format');
+		$invoice_number = $this->sale_lib->get_invoice_number();
 
-		if ($temp_invoice_number == NULL || $temp_invoice_number == '')
+		if ($this->sale_lib->get_invoice_number() == NULL)
 		{
-			$temp_invoice_number = $this->token_lib->render($invoice_format, array(), FALSE);
+			$invoice_number = config('OSPOS')->sales_invoice_format;
 		}
 
-		$data['invoice_number'] = $temp_invoice_number;
+		$data['invoice_number'] = $invoice_number;
 
 		$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
 		$data['price_work_orders'] = $this->sale_lib->is_price_work_orders();
@@ -1122,75 +1226,76 @@ class Sales extends Secure_Controller
 		$data['quote_number'] = $this->sale_lib->get_quote_number();
 		$data['work_order_number'] = $this->sale_lib->get_work_order_number();
 
-		if($this->sale_lib->get_mode() == 'sale_invoice')
+		//TODO: the if/else set below should be converted to a switch
+		if($this->sale_lib->get_mode() == 'sale_invoice')	//TODO: Duplicated code.
 		{
-			$data['mode_label'] = $this->lang->line('sales_invoice');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.invoice');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'sale_quote')
 		{
-			$data['mode_label'] = $this->lang->line('sales_quote');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.quote');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'sale_work_order')
 		{
-			$data['mode_label'] = $this->lang->line('sales_work_order');
-			$data['customer_required'] = $this->lang->line('sales_customer_required');
+			$data['mode_label'] = lang('Sales.work_order');
+			$data['customer_required'] = lang('Sales.customer_required');
 		}
 		elseif($this->sale_lib->get_mode() == 'return')
 		{
-			$data['mode_label'] = $this->lang->line('sales_return');
-			$data['customer_required'] = $this->lang->line('sales_customer_optional');
+			$data['mode_label'] = lang('Sales.return');
+			$data['customer_required'] = lang('Sales.customer_optional');
 		}
 		else
 		{
-			$data['mode_label'] = $this->lang->line('sales_receipt');
-			$data['customer_required'] = $this->lang->line('sales_customer_optional');
+			$data['mode_label'] = lang('Sales.receipt');
+			$data['customer_required'] = lang('Sales.customer_optional');
 		}
 
-		$data = $this->xss_clean($data);
-
-		$this->load->view("sales/register", $data);
+		echo view("sales/register", $data);
 	}
 
-	public function receipt($sale_id)
+	public function receipt(int $sale_id): void
 	{
 		$data = $this->_load_sale_data($sale_id);
-		$this->load->view('sales/receipt', $data);
+		echo view('sales/receipt', $data);
 		$this->sale_lib->clear_all();
 	}
 
-	public function invoice($sale_id)
+	public function invoice(int $sale_id): void
 	{
 		$data = $this->_load_sale_data($sale_id);
 
-		$this->load->view('sales/'.$data['invoice_view'], $data);
+		echo view('sales/'.$data['invoice_view'], $data);
 		$this->sale_lib->clear_all();
 	}
 
-	public function edit($sale_id)
+	public function edit(int $sale_id): void
 	{
-		$data = array();
+		$data = [];
 
-		$sale_info = $this->xss_clean($this->Sale->get_info($sale_id)->row_array());
+		$sale_info = $this->sale->get_info($sale_id)->getRowArray();
 		$data['selected_customer_id'] = $sale_info['customer_id'];
 		$data['selected_customer_name'] = $sale_info['customer_name'];
-		$employee_info = $this->Employee->get_info($sale_info['employee_id']);
+		$employee_info = $this->employee->get_info($sale_info['employee_id']);
 		$data['selected_employee_id'] = $sale_info['employee_id'];
-		$data['selected_employee_name'] = $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name);
+		$data['selected_employee_name'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 		$data['sale_info'] = $sale_info;
 		$balance_due = round($sale_info['amount_due'] - $sale_info['amount_tendered'] + $sale_info['cash_refund'], totals_decimals(), PHP_ROUND_HALF_UP);
+		
 		if(!$this->sale_lib->reset_cash_rounding() && $balance_due < 0)
 		{
 			$balance_due = 0;
 		}
 
-		$data['payments'] = array();
-		foreach($this->Sale->get_sale_payments($sale_id)->result() as $payment)
+		$data['payments'] = [];
+
+		foreach($this->sale->get_sale_payments($sale_id)->getResult() as $payment)
 		{
 			foreach(get_object_vars($payment) as $property => $value)
 			{
-				$payment->$property = $this->xss_clean($value);
+				$payment->$property = $value;
 			}
 			$data['payments'][] = $payment;
 		}
@@ -1201,69 +1306,78 @@ class Sales extends Secure_Controller
 		$data['balance_due'] = $balance_due != 0;
 
 		// don't allow gift card to be a payment option in a sale transaction edit because it's a complex change
-		$payment_options = $this->Sale->get_payment_options(FALSE);
+		$payment_options = $this->sale->get_payment_options(FALSE);
 
 		if($this->sale_lib->reset_cash_rounding())
 		{
-			$payment_options[$this->lang->line('sales_cash_adjustment')] = $this->lang->line('sales_cash_adjustment');
+			$payment_options[lang('Sales.cash_adjustment')] = lang('Sales.cash_adjustment');
 		}
 
-		$data['payment_options'] = $this->xss_clean($payment_options);
+		$data['payment_options'] = $payment_options;
 
 		// Set up a slightly modified list of payment types for new payment entry
-		$payment_options["--"] = $this->lang->line('common_none_selected_text');
+		$payment_options["--"] = lang('Common.none_selected_text');
 
-		$data['new_payment_options'] = $this->xss_clean($payment_options);
+		$data['new_payment_options'] = $payment_options;
 
-		$this->load->view('sales/form', $data);
+		echo view('sales/form', $data);
 	}
 
-	public function delete($sale_id = -1, $update_inventory = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function delete(int $sale_id = -1, bool $update_inventory = TRUE): void	//TODO: Replace -1 with a constant
 	{
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$has_grant = $this->Employee->has_grant('sales_delete', $employee_id);
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$has_grant = $this->employee->has_grant('sales_delete', $employee_id);
 
 		if(!$has_grant)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('sales_not_authorized')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Sales.not_authorized')]);
 		}
 		else
 		{
-			$sale_ids = $sale_id == -1 ? $this->input->post('ids') : array($sale_id);
+			$sale_ids = $sale_id == -1 ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$sale_id];	//TODO: Replace -1 with a constant
 
-			if($this->Sale->delete_list($sale_ids, $employee_id, $update_inventory))
+			if($this->sale->delete_list($sale_ids, $employee_id, $update_inventory))
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('sales_successfully_deleted') . ' ' .
-					count($sale_ids) . ' ' . $this->lang->line('sales_one_or_multiple'), 'ids' => $sale_ids));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Sales.successfully_deleted') . ' ' . count($sale_ids) . ' ' . lang('Sales.one_or_multiple'),
+					'ids' => $sale_ids
+				]);
 			}
 			else
 			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('sales_unsuccessfully_deleted')));
+				echo json_encode (['success' => FALSE, 'message' => lang('Sales.unsuccessfully_deleted')]);
 			}
 		}
 	}
 
-	public function restore($sale_id = -1, $update_inventory = TRUE)
+	public function restore(int $sale_id = -1, bool $update_inventory = TRUE): void	//TODO: Replace -1 with a constant
 	{
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
-		$has_grant = $this->Employee->has_grant('sales_delete', $employee_id);
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+		$has_grant = $this->employee->has_grant('sales_delete', $employee_id);
 
 		if(!$has_grant)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('sales_not_authorized')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Sales.not_authorized')]);
 		}
 		else
 		{
-			$sale_ids = $sale_id == -1 ? $this->input->post('ids') : array($sale_id);
+			$sale_ids = $sale_id == -1 ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$sale_id];	//TODO: Replace -1 with a constant
 
-			if($this->Sale->restore_list($sale_ids, $employee_id, $update_inventory))
+			if($this->sale->restore_list($sale_ids, $employee_id, $update_inventory))
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('sales_successfully_restored') . ' ' .
-					count($sale_ids) . ' ' . $this->lang->line('sales_one_or_multiple'), 'ids' => $sale_ids));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Sales.successfully_restored') . ' ' . count($sale_ids) . ' ' . lang('Sales.one_or_multiple'),
+					'ids' => $sale_ids
+				]);
 			}
 			else
 			{
-				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('sales_unsuccessfully_restored')));
+				echo json_encode (['success' => FALSE, 'message' => lang('Sales.unsuccessfully_restored')]);
 			}
 		}
 	}
@@ -1272,43 +1386,37 @@ class Sales extends Secure_Controller
 	 * This saves the sale from the update sale view (sales/form).
 	 * It only updates the sales table and payments.
 	 * @param int $sale_id
+	 * @throws ReflectionException
 	 */
-	public function save($sale_id = -1)
+	public function save(int $sale_id = -1): void	//TODO: Replace -1 with a constant
 	{
-		$newdate = $this->input->post('date');
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$newdate = $this->request->getPost('date', FILTER_SANITIZE_STRING);
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 
-		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
+		$date_formatter = date_create_from_format(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $newdate);
 		$sale_time = $date_formatter->format('Y-m-d H:i:s');
 
-		$sale_data = array(
+		$sale_data = [
 			'sale_time' => $sale_time,
-			'customer_id' => $this->input->post('customer_id') != '' ? $this->input->post('customer_id') : NULL,
-			'employee_id' => $this->input->post('employee_id') != '' ? $this->input->post('employee_id') : NULL,
-			'comment' => $this->input->post('comment'),
-			'invoice_number' => $this->input->post('invoice_number') != '' ? $this->input->post('invoice_number') : NULL
-		);
+			'customer_id' => $this->request->getPost('customer_id') != '' ? $this->request->getPost('customer_id', FILTER_SANITIZE_NUMBER_INT) : NULL,
+			'employee_id' => $this->request->getPost('employee_id') != '' ? $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT) : NULL,
+			'comment' => $this->request->getPost('comment', FILTER_SANITIZE_STRING),
+			'invoice_number' => $this->request->getPost('invoice_number') != '' ? $this->request->getPost('invoice_number', FILTER_SANITIZE_STRING) : NULL
+		];
 
 		// In order to maintain tradition the only element that can change on prior payments is the payment type
-		$payments = array();
+		$payments = [];
 		$amount_tendered = 0;
-		$number_of_payments = $this->input->post('number_of_payments');
+		$number_of_payments = $this->request->getPost('number_of_payments', FILTER_SANITIZE_NUMBER_INT);
 		for($i = 0; $i < $number_of_payments; ++$i)
 		{
-			$payment_id = $this->input->post('payment_id_' . $i);
-			$payment_type = $this->input->post('payment_type_' . $i);
-			$payment_amount = $this->input->post('payment_amount_' . $i);
-			$refund_type = $this->input->post('refund_type_' . $i);
-			$cash_refund = $this->input->post('refund_amount_' . $i);
+			$payment_id = $this->request->getPost("payment_id_$i", FILTER_SANITIZE_NUMBER_INT);
+			$payment_type = $this->request->getPost("payment_type_$i", FILTER_SANITIZE_STRING);
+			$payment_amount = $this->request->getPost("payment_amount_$i", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$refund_type = $this->request->getPost("refund_type_$i", FILTER_SANITIZE_STRING);
+			$cash_refund = $this->request->getPost("refund_amount_$i", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 
-			if($payment_type == $this->lang->line('sales_cash_adjustment'))
-			{
-				$cash_adjustment = CASH_ADJUSTMENT_TRUE;
-			}
-			else
-			{
-				$cash_adjustment = CASH_ADJUSTMENT_FALSE;
-			}
+			$cash_adjustment = $payment_type == lang('Sales.cash_adjustment') ? CASH_ADJUSTMENT_TRUE : CASH_ADJUSTMENT_FALSE;
 
 			if(!$cash_adjustment)
 			{
@@ -1316,7 +1424,7 @@ class Sales extends Secure_Controller
 			}
 
 			// if the refund is not cash ...
-			if(empty(strstr($refund_type, $this->lang->line('sales_cash'))))
+			if(empty(strstr($refund_type, lang('Sales.cash'))))	//TODO: This if and the one below can be combined.
 			{
 				// ... and it's positive ...
 				if($cash_refund > 0)
@@ -1329,17 +1437,24 @@ class Sales extends Secure_Controller
 			}
 
 
-			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'cash_adjustment' => $cash_adjustment,  'employee_id' => $employee_id);
+			$payments[] = [
+				'payment_id' => $payment_id,
+				'payment_type' => $payment_type,
+				'payment_amount' => $payment_amount,
+				'cash_refund' => $cash_refund,
+				'cash_adjustment' => $cash_adjustment,
+				'employee_id' => $employee_id
+			];
 		}
 
-		$payment_id = -1;
-		$payment_amount = $this->input->post('payment_amount_new');
-		$payment_type = $this->input->post('payment_type_new');
+		$payment_id = -1;	//TODO: Replace -1 with a constant
+		$payment_amount = $this->request->getPost('payment_amount_new', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$payment_type = $this->request->getPost('payment_type_new', FILTER_SANITIZE_STRING);
 
 		if($payment_type != PAYMENT_TYPE_UNASSIGNED && $payment_amount <> 0)
 		{
 			$cash_refund = 0;
-			if($payment_type == $this->lang->line('sales_cash_adjustment'))
+			if($payment_type == lang('Sales.cash_adjustment'))
 			{
 				$cash_adjustment = CASH_ADJUSTMENT_TRUE;
 			}
@@ -1347,7 +1462,7 @@ class Sales extends Secure_Controller
 			{
 				$cash_adjustment = CASH_ADJUSTMENT_FALSE;
 				$amount_tendered += $payment_amount;
-				$sale_info = $this->Sale->get_info($sale_id)->row_array();
+				$sale_info = $this->sale->get_info($sale_id)->getRowArray();
 
 				if($amount_tendered > $sale_info['amount_due'])
 				{
@@ -1355,17 +1470,24 @@ class Sales extends Secure_Controller
 				}
 			}
 
-			$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'cash_adjustment' => $cash_adjustment, 'employee_id' => $employee_id);
+			$payments[] = [
+				'payment_id' => $payment_id,
+				'payment_type' => $payment_type,
+				'payment_amount' => $payment_amount,
+				'cash_refund' => $cash_refund,
+				'cash_adjustment' => $cash_adjustment,
+				'employee_id' => $employee_id
+			];
 		}
 
-		$this->Inventory->update('POS '.$sale_id, ['trans_date' => $sale_time]);
-		if($this->Sale->update($sale_id, $sale_data, $payments))
+		$this->inventory->update('POS '.$sale_id, ['trans_date' => $sale_time]);	//TODO: Reflection Exception
+		if($this->sale->update($sale_id, $sale_data, $payments))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('sales_successfully_updated'), 'id' => $sale_id));
+			echo json_encode (['success' => TRUE, 'message' => lang('Sales.successfully_updated'), 'id' => $sale_id]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('sales_unsuccessfully_updated'), 'id' => $sale_id));
+			echo json_encode (['success' => FALSE, 'message' => lang('Sales.unsuccessfully_updated'), 'id' => $sale_id]);
 		}
 	}
 
@@ -1373,28 +1495,29 @@ class Sales extends Secure_Controller
 	 * This is used to cancel a suspended pos sale, quote.
 	 * Completed sales (POS Sales or Invoiced Sales) can not be removed from the system
 	 * Work orders can be canceled but are not physically removed from the sales history
+	 * @throws ReflectionException
 	 */
-	public function cancel()
+	public function cancel(): void
 	{
 		$sale_id = $this->sale_lib->get_sale_id();
-		if($sale_id != -1 && $sale_id != '')
+		if($sale_id != -1 && $sale_id != '')	//TODO: Replace -1 with a constant
 		{
 			$sale_type = $this->sale_lib->get_sale_type();
 
-			if($this->config->item('dinner_table_enable') == TRUE)
+			if(config('OSPOS')->dinner_table_enable)
 			{
 				$dinner_table = $this->sale_lib->get_dinner_table();
-				$this->Dinner_table->release($dinner_table);
+				$this->dinner_table->release($dinner_table);
 			}
 
 			if($sale_type == SALE_TYPE_WORK_ORDER)
 			{
-				$this->Sale->update_sale_status($sale_id, CANCELED);
+				$this->sale->update_sale_status($sale_id, CANCELED);
 			}
 			else
 			{
-				$this->Sale->delete($sale_id, FALSE);
-				$this->session->set_userdata('sale_id', -1);
+				$this->sale->delete($sale_id);
+				$this->session->set('sale_id', -1);	//TODO: Replace -1 with a constant
 			}
 		}
 		else
@@ -1403,75 +1526,79 @@ class Sales extends Secure_Controller
 		}
 
 		$this->sale_lib->clear_all();
-		$this->_reload();
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
-	public function discard_suspended_sale()
+	public function discard_suspended_sale(): void
 	{
 		$suspended_id = $this->sale_lib->get_suspended_id();
 		$this->sale_lib->clear_all();
-		$this->Sale->delete_suspended_sale($suspended_id);
-		$this->_reload();
+		$this->sale->delete_suspended_sale($suspended_id);
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
 	/**
 	 * Suspend the current sale.
-	 * If the current sale is already suspended then update the existing suspended sale.
-	 * Otherwise create it as a new suspended sale
+	 * If the current sale is already suspended then update the existing suspended sale otherwise create
+	 * it as a new suspended sale.
+	 * @throws ReflectionException
 	 */
-	public function suspend()
+	public function suspend(): void
 	{
 		$sale_id = $this->sale_lib->get_sale_id();
 		$dinner_table = $this->sale_lib->get_dinner_table();
 		$cart = $this->sale_lib->get_cart();
 		$payments = $this->sale_lib->get_payments();
-		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
+		$employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 		$customer_id = $this->sale_lib->get_customer();
 		$invoice_number = $this->sale_lib->get_invoice_number();
 		$work_order_number = $this->sale_lib->get_work_order_number();
 		$quote_number = $this->sale_lib->get_quote_number();
 		$sale_type = $this->sale_lib->get_sale_type();
+
 		if($sale_type == '')
 		{
 			$sale_type = SALE_TYPE_POS;
 		}
+
 		$comment = $this->sale_lib->get_comment();
 		$sale_status = SUSPENDED;
 
-		$data = array();
-		$sales_taxes = array(array(), array());
-		if($this->Sale->save($sale_id, $sale_status, $cart, $customer_id, $employee_id, $comment, $invoice_number, $work_order_number, $quote_number, $sale_type, $payments, $dinner_table, $sales_taxes) == '-1')
+		$data = [];
+		$sales_taxes = [[], []];
+
+		if($this->sale->save_value($sale_id, $sale_status, $cart, $customer_id, $employee_id, $comment, $invoice_number, $work_order_number, $quote_number, $sale_type, $payments, $dinner_table, $sales_taxes) == '-1')
 		{
-			$data['error'] = $this->lang->line('sales_unsuccessfully_suspended_sale');
+			$data['error'] = lang('Sales.unsuccessfully_suspended_sale');
 		}
 		else
 		{
-			$data['success'] = $this->lang->line('sales_successfully_suspended_sale');
+			$data['success'] = lang('Sales.successfully_suspended_sale');
 		}
 
 		$this->sale_lib->clear_all();
 
-		$this->_reload($data);
+		$this->_reload($data);	//TODO: Hungarian notation
 	}
 
 	/**
 	 * List suspended sales
 	 */
-	public function suspended()
+	public function suspended(): void
 	{
-		$data = array();
+		$data = [];
 		$customer_id = $this->sale_lib->get_customer();
-		$data['suspended_sales'] = $this->xss_clean($this->Sale->get_all_suspended($customer_id));
-		$this->load->view('sales/suspended', $data);
+		$data['suspended_sales'] = $this->sale->get_all_suspended($customer_id);
+		echo view('sales/suspended', $data);
 	}
 
 	/**
 	 * Unsuspended sales are now left in the tables and are only removed
 	 * when they are intentionally cancelled.
 	 */
-	public function unsuspend()
+	public function unsuspend(): void
 	{
-		$sale_id = $this->input->post('suspended_sale_id');
+		$sale_id = $this->request->getPost('suspended_sale_id', FILTER_SANITIZE_NUMBER_INT);
 		$this->sale_lib->clear_all();
 
 		if($sale_id > 0)
@@ -1482,25 +1609,20 @@ class Sales extends Secure_Controller
 		// Set current register mode to reflect that of unsuspended order type
 		$this->change_register_mode($this->sale_lib->get_sale_type());
 
-		$this->_reload();
-	}
-	
-	public function sales_keyboard_help()
-	{
-		$this->load->view('sales/help');
+		$this->_reload();	//TODO: Hungarian notation
 	}
 
-	public function check_invoice_number()
+	public function check_invoice_number(): void
 	{
-		$sale_id = $this->input->post('sale_id');
-		$invoice_number = $this->input->post('invoice_number');
-		$exists = !empty($invoice_number) && $this->Sale->check_invoice_number_exists($invoice_number, $sale_id);
+		$sale_id = $this->request->getPost('sale_id', FILTER_SANITIZE_NUMBER_INT);
+		$invoice_number = $this->request->getPost('invoice_number', FILTER_SANITIZE_STRING);
+		$exists = !empty($invoice_number) && $this->sale->check_invoice_number_exists($invoice_number, $sale_id);
 		echo !$exists ? 'true' : 'false';
 	}
 
-	public function get_filtered($cart)
+	public function get_filtered(array $cart): array
 	{
-		$filtered_cart = array();
+		$filtered_cart = [];
 		foreach($cart as $id => $item)
 		{
 			if($item['print_option'] == PRINT_ALL) // always include
@@ -1517,11 +1639,11 @@ class Sales extends Secure_Controller
 		return $filtered_cart;
 	}
 
-	public function change_item_number()
+	public function change_item_number(): void
 	{
-		$item_id = $this->input->post('item_id');
-		$item_number = $this->input->post('item_number');
-		$this->Item->update_item_number($item_id, $item_number);
+		$item_id = $this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT);
+		$item_number = $this->request->getPost('item_number', FILTER_SANITIZE_STRING);
+		$this->item->update_item_number($item_id, $item_number);
 		$cart = $this->sale_lib->get_cart();
 		$x = $this->search_cart_for_item_id($item_id, $cart);
 		if($x != NULL)
@@ -1531,38 +1653,47 @@ class Sales extends Secure_Controller
 		$this->sale_lib->set_cart($cart);
 	}
 
-	public function change_item_name()
+	public function change_item_name(): void
 	{
-		$item_id = $this->input->post('item_id');
-		$name = $this->input->post('item_name');
-		$this->Item->update_item_name($item_id, $name);
+		$item_id = $this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT);
+		$name = $this->request->getPost('item_name', FILTER_SANITIZE_STRING);
+
+		$this->item->update_item_name($item_id, $name);
+
 		$cart = $this->sale_lib->get_cart();
 		$x = $this->search_cart_for_item_id($item_id, $cart);
-		if($x != NULL) {
+
+		if($x != NULL)
+		{
 			$cart[$x]['name'] = $name;
 		}
+
 		$this->sale_lib->set_cart($cart);
 	}
 
-	public function change_item_description()
+	public function change_item_description(): void
 	{
-		$item_id = $this->input->post('item_id');
-		$description = $this->input->post('item_description');
-		$this->Item->update_item_description($item_id, $description);
+		$item_id = $this->request->getPost('item_id', FILTER_SANITIZE_NUMBER_INT);
+		$description = $this->request->getPost('item_description', FILTER_SANITIZE_STRING);
+
+		$this->item->update_item_description($item_id, $description);
+
 		$cart = $this->sale_lib->get_cart();
 		$x = $this->search_cart_for_item_id($item_id, $cart);
+
 		if($x != NULL)
 		{
 			$cart[$x]['description'] = $description;
 		}
+
 		$this->sale_lib->set_cart($cart);
 	}
 
-	public function search_cart_for_item_id($id, $array)
+	public function search_cart_for_item_id(int $id, array $array)	//TODO: The second parameter should not be named array perhaps int $needle_item_id, array $shopping_cart
 	{
-		foreach($array as $key => $val)
+		foreach($array as $key => $val)	//TODO: key and val are not reflective of the contents of the array and should be replaced with descriptive variable names.  Perhaps $cart_haystack => $item_details
 		{
-			if($val['item_id'] === $id)
+			if($val['item_id'] === $id)	//TODO: Then this becomes more readable $item_details['item_id'] === $needle_item_id
 			{
 				return $key;
 			}
@@ -1570,5 +1701,4 @@ class Sales extends Secure_Controller
 
 		return NULL;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Secure_Controller.php b/app/Controllers/Secure_Controller.php
index 38aa061d1..4bff8c5b8 100644
--- a/app/Controllers/Secure_Controller.php
+++ b/app/Controllers/Secure_Controller.php
@@ -1,52 +1,62 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Secure_Controller extends CI_Controller 
+namespace App\Controllers;
+
+use app\Models\Employee;
+use app\Models\Module;
+
+use CodeIgniter\Session\Session;
+
+/**
+ * Controllers that are considered secure extend Secure_Controller, optionally a $module_id can
+ * be set to also check if a user can access a particular module in the system.
+ *
+ * @property employee employee
+ * @property module module
+ * 
+ * @property session session
+ *
+ */
+class Secure_Controller extends BaseController
 {
-	/*
-	* Controllers that are considered secure extend Secure_Controller, optionally a $module_id can
-	* be set to also check if a user can access a particular module in the system.
-	*/
-	public function __construct($module_id = NULL, $submodule_id = NULL, $menu_group = NULL)
+	public function __construct(string $module_id = NULL, string $submodule_id = NULL, string $menu_group = NULL)
 	{
-		parent::__construct();
-		
-		$this->load->model('Employee');
-		$model = $this->Employee;
+		$this->employee = model('Employee');
+		$this->module = model('Module');
 
-		if(!$model->is_logged_in())
+		if(!$this->employee->is_logged_in())
 		{
 			redirect('login');
 		}
 
-		$logged_in_employee_info = $model->get_logged_in_employee_info();
-		if(!$model->has_module_grant($module_id, $logged_in_employee_info->person_id) || 
-			(isset($submodule_id) && !$model->has_module_grant($submodule_id, $logged_in_employee_info->person_id)))
+		$logged_in_employee_info = $this->employee->get_logged_in_employee_info();
+		if(!$this->employee->has_module_grant($module_id, $logged_in_employee_info->person_id)
+			|| (isset($submodule_id) && !$this->employee->has_module_grant($submodule_id, $logged_in_employee_info->person_id)))
 		{
-			redirect('no_access/' . $module_id . '/' . $submodule_id);
+			redirect("no_access/$module_id/$submodule_id");
 		}
 
 		// load up global data visible to all the loaded views
-
-		$this->load->library('session');
+		$this->session = session();
 		if($menu_group == NULL)
 		{
-			$menu_group = $this->session->userdata('menu_group');
+			$menu_group = $this->session->get('menu_group');
 		}
 		else
 		{
-			$this->session->set_userdata('menu_group', $menu_group);
+			$this->session->set('menu_group', $menu_group);
 		}
 
-		if($menu_group == 'home')
+		if($menu_group == 'home')	//TODO: Convert to ternary notation
 		{
-			$allowed_modules = $this->Module->get_allowed_home_modules($logged_in_employee_info->person_id);
+			$allowed_modules = $this->module->get_allowed_home_modules($logged_in_employee_info->person_id);
 		}
 		else
 		{
-			$allowed_modules = $this->Module->get_allowed_office_modules($logged_in_employee_info->person_id);
+			$allowed_modules = $this->module->get_allowed_office_modules($logged_in_employee_info->person_id);
 		}
 
-		foreach($allowed_modules->result() as $module)
+		foreach($allowed_modules->getResult() as $module)
 		{
 			$data['allowed_modules'][] = $module;
 		}
@@ -54,37 +64,14 @@ class Secure_Controller extends CI_Controller
 		$data['user_info'] = $logged_in_employee_info;
 		$data['controller_name'] = $module_id;
 
-		$this->load->vars($data);
-	}
-	
-	/*
-	* Internal method to do XSS clean in the derived classes
-	*/
-	protected function xss_clean($str, $is_image = FALSE)
-	{
-		// This setting is configurable in application/config/config.php.
-		// Users can disable the XSS clean for performance reasons
-		// (cases like intranet installation with no Internet access)
-		if($this->config->item('ospos_xss_clean') == FALSE)
-		{
-			return $str;
-		}
-		else
-		{
-			return $this->security->xss_clean($str, $is_image);
-		}
-	}
-
-	public function numeric($str)
-	{
-		return parse_decimals($str);
+		$this->load->vars($data);	//TODO: need to find out how to convert this.
 	}
 
 	public function check_numeric()
 	{
 		$result = TRUE;
 
-		foreach($this->input->get() as $str)
+		foreach($this->request->getGet(NULL, FILTER_SANITIZE_STRING) as $str)
 		{
 			$result &= parse_decimals($str);
 		}
@@ -96,8 +83,7 @@ class Secure_Controller extends CI_Controller
 	public function index() { return FALSE; }
 	public function search() { return FALSE; }
 	public function suggest_search() { return FALSE; }
-	public function view($data_item_id = -1) { return FALSE; }
-	public function save($data_item_id = -1) { return FALSE; }
+	public function view(int $data_item_id = -1) { return FALSE; }
+	public function save(int $data_item_id = -1) { return FALSE; }
 	public function delete() { return FALSE; }
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Suppliers.php b/app/Controllers/Suppliers.php
index 36b6f58ee..0440b3b62 100644
--- a/app/Controllers/Suppliers.php
+++ b/app/Controllers/Suppliers.php
@@ -1,171 +1,186 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once("Persons.php");
-
-class Suppliers extends Persons
-{
-	public function __construct()
-	{
-		parent::__construct('suppliers');
-	}
-
-	public function index()
-	{
-		$data['table_headers'] = $this->xss_clean(get_suppliers_manage_table_headers());
-
-		$this->load->view('people/manage', $data);
-	}
-
-	/*
-	Gets one row for a supplier manage table. This is called using AJAX to update one row.
-	*/
-	public function get_row($row_id)
-	{
-		$data_row = $this->xss_clean(get_supplier_data_row($this->Supplier->get_info($row_id)));
-		$data_row['category'] = $this->Supplier->get_category_name($data_row['category']);
-
-		echo json_encode($data_row);
-	}
-	
-	/*
-	Returns Supplier table data rows. This will be called with AJAX.
-	*/
-	public function search()
-	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
-
-		$suppliers = $this->Supplier->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Supplier->get_found_rows($search);
-
-		$data_rows = array();
-		foreach($suppliers->result() as $supplier)
-		{
-			$row = $this->xss_clean(get_supplier_data_row($supplier));
-			$row['category'] = $this->Supplier->get_category_name($row['category']);
-			$data_rows[] = $row;
-		}
-
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
-	}
-	
-	/*
-	Gives search suggestions based on what is being searched for
-	*/
-	public function suggest()
-	{
-		$suggestions = $this->xss_clean($this->Supplier->get_search_suggestions($this->input->get('term'), TRUE));
-
-		echo json_encode($suggestions);
-	}
-
-	public function suggest_search()
-	{
-		$suggestions = $this->xss_clean($this->Supplier->get_search_suggestions($this->input->post('term'), FALSE));
-
-		echo json_encode($suggestions);
-	}
-	
-	/*
-	Loads the supplier edit form
-	*/
-	public function view($supplier_id = -1)
-	{
-		$info = $this->Supplier->get_info($supplier_id);
-		foreach(get_object_vars($info) as $property => $value)
-		{
-			$info->$property = $this->xss_clean($value);
-		}
-		$data['person_info'] = $info;
-		$data['categories'] = $this->Supplier->get_categories();
-
-		$this->load->view("suppliers/form", $data);
-	}
-	
-	/*
-	Inserts/updates a supplier
-	*/
-	public function save($supplier_id = -1)
-	{
-		$first_name = $this->xss_clean($this->input->post('first_name'));
-		$last_name = $this->xss_clean($this->input->post('last_name'));
-		$email = $this->xss_clean(strtolower($this->input->post('email')));
-
-		// format first and last name properly
-		$first_name = $this->nameize($first_name);
-		$last_name = $this->nameize($last_name);
-
-		$person_data = array(
-			'first_name' => $first_name,
-			'last_name' => $last_name,
-			'gender' => $this->input->post('gender'),
-			'email' => $email,
-			'phone_number' => $this->input->post('phone_number'),
-			'address_1' => $this->input->post('address_1'),
-			'address_2' => $this->input->post('address_2'),
-			'city' => $this->input->post('city'),
-			'state' => $this->input->post('state'),
-			'zip' => $this->input->post('zip'),
-			'country' => $this->input->post('country'),
-			'comments' => $this->input->post('comments')
-		);
-
-		$supplier_data = array(
-			'company_name' => $this->input->post('company_name'),
-			'agency_name' => $this->input->post('agency_name'),
-			'category' => $this->input->post('category'),
-			'account_number' => $this->input->post('account_number') == '' ? NULL : $this->input->post('account_number'),
-			'tax_id' => $this->input->post('tax_id')
-		);
-
-		if($this->Supplier->save_supplier($person_data, $supplier_data, $supplier_id))
-		{
-			$supplier_data = $this->xss_clean($supplier_data);
-
-			//New supplier
-			if($supplier_id == -1)
-			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('suppliers_successful_adding') . ' ' . $supplier_data['company_name'],
-								'id' => $supplier_data['person_id']));
-			}
-			else //Existing supplier
-			{
-				echo json_encode(array('success' => TRUE,
-								'message' => $this->lang->line('suppliers_successful_updating') . ' ' . $supplier_data['company_name'],
-								'id' => $supplier_id));
-			}
-		}
-		else//failure
-		{
-			$supplier_data = $this->xss_clean($supplier_data);
-
-			echo json_encode(array('success' => FALSE,
-							'message' => $this->lang->line('suppliers_error_adding_updating') . ' ' . 	$supplier_data['company_name'],
-							'id' => -1));
-		}
-	}
-	
-	/*
-	This deletes suppliers from the suppliers table
-	*/
-	public function delete()
-	{
-		$suppliers_to_delete = $this->xss_clean($this->input->post('ids'));
-
-		if($this->Supplier->delete_list($suppliers_to_delete))
-		{
-			echo json_encode(array('success' => TRUE,'message' => $this->lang->line('suppliers_successful_deleted').' '.
-							count($suppliers_to_delete).' '.$this->lang->line('suppliers_one_or_multiple')));
-		}
-		else
-		{
-			echo json_encode(array('success' => FALSE,'message' => $this->lang->line('suppliers_cannot_be_deleted')));
-		}
-	}
-	
-}
-?>
+<?php
+
+namespace App\Controllers;
+
+use app\Models\Supplier;
+
+/**
+ *
+ *
+ * @property supplier supplier
+ *
+ */
+class Suppliers extends Persons
+{
+	public function __construct()
+	{
+		parent::__construct('suppliers');
+
+		$this->supplier = model('Supplier');
+	}
+
+	public function index(): void
+	{
+		$data['table_headers'] = get_suppliers_manage_table_headers();
+
+		echo view('people/manage', $data);
+	}
+
+	/**
+	 * Gets one row for a supplier manage table. This is called using AJAX to update one row.
+	 * @param $row_id
+	 * @return void
+	 */
+	public function get_row($row_id): void
+	{
+		$data_row = get_supplier_data_row($this->supplier->get_info($row_id));
+		$data_row['category'] = $this->supplier->get_category_name($data_row['category']);
+
+		echo json_encode($data_row);
+	}
+
+	/**
+	 * Returns Supplier table data rows. This will be called with AJAX.
+	 * @return void
+	 */
+	public function search(): void
+	{
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order = $this->request->getGet('order', FILTER_SANITIZE_STRING);
+
+		$suppliers = $this->supplier->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->supplier->get_found_rows($search);
+
+		$data_rows = [];
+
+		foreach($suppliers->getResult() as $supplier)
+		{
+			$row = get_supplier_data_row($supplier);
+			$row['category'] = $this->supplier->get_category_name($row['category']);
+			$data_rows[] = $row;
+		}
+
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
+	}
+	
+	/*
+	Gives search suggestions based on what is being searched for
+	*/
+	public function suggest(): void
+	{
+		$suggestions = $this->supplier->get_search_suggestions($this->request->getGet('term', FILTER_SANITIZE_STRING), TRUE);
+
+		echo json_encode($suggestions);
+	}
+
+	public function suggest_search()
+	{
+		$suggestions = $this->supplier->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING), FALSE);
+
+		echo json_encode($suggestions);
+	}
+	
+	/*
+	Loads the supplier edit form
+	*/
+	public function view(int $supplier_id = -1): void	//TODO: Replace -1 with constant
+	{
+		$info = $this->supplier->get_info($supplier_id);
+		foreach(get_object_vars($info) as $property => $value)
+		{
+			$info->$property = $value;
+		}
+		$data['person_info'] = $info;
+		$data['categories'] = $this->supplier->get_categories();
+
+		echo view("suppliers/form", $data);
+	}
+	
+	/*
+	Inserts/updates a supplier
+	*/
+	public function save(int $supplier_id = -1): void	//TODO: Replace -1 with constant
+	{
+		$first_name = $this->request->getPost('first_name', FILTER_SANITIZE_STRING);	//TODO: Duplicate code
+		$last_name = $this->request->getPost('last_name', FILTER_SANITIZE_STRING);
+		$email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
+
+		// format first and last name properly
+		$first_name = $this->nameize($first_name);
+		$last_name = $this->nameize($last_name);
+
+		$person_data = [
+			'first_name' => $first_name,
+			'last_name' => $last_name,
+			'gender' => $this->request->getPost('gender', FILTER_SANITIZE_STRING),
+			'email' => $email,
+			'phone_number' => $this->request->getPost('phone_number', FILTER_SANITIZE_STRING),
+			'address_1' => $this->request->getPost('address_1', FILTER_SANITIZE_STRING),
+			'address_2' => $this->request->getPost('address_2', FILTER_SANITIZE_STRING),
+			'city' => $this->request->getPost('city', FILTER_SANITIZE_STRING),
+			'state' => $this->request->getPost('state', FILTER_SANITIZE_STRING),
+			'zip' => $this->request->getPost('zip', FILTER_SANITIZE_STRING),
+			'country' => $this->request->getPost('country', FILTER_SANITIZE_STRING),
+			'comments' => $this->request->getPost('comments', FILTER_SANITIZE_STRING)
+		];
+
+		$supplier_data = [
+			'company_name' => $this->request->getPost('company_name', FILTER_SANITIZE_STRING),
+			'agency_name' => $this->request->getPost('agency_name', FILTER_SANITIZE_STRING),
+			'category' => $this->request->getPost('category', FILTER_SANITIZE_STRING),
+			'account_number' => $this->request->getPost('account_number') == '' ? NULL : $this->request->getPost('account_number', FILTER_SANITIZE_STRING),
+			'tax_id' => $this->request->getPost('tax_id', FILTER_SANITIZE_NUMBER_INT)
+		];
+
+		if($this->supplier->save_supplier($person_data, $supplier_data, $supplier_id))
+		{
+			//New supplier
+			if($supplier_id == -1)	//TODO: Replace -1 with a constant
+			{
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Suppliers.successful_adding') . ' ' . $supplier_data['company_name'],
+					'id' => $supplier_data['person_id']
+				]);
+			}
+			else //Existing supplier
+			{
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Suppliers.successful_updating') . ' ' . $supplier_data['company_name'],
+					'id' => $supplier_id]);
+			}
+		}
+		else//failure
+		{
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Suppliers.error_adding_updating') . ' ' . 	$supplier_data['company_name'],
+				'id' => -1	//TODO: Replace -1 with a constant
+			]);
+		}
+	}
+	
+	/*
+	This deletes suppliers from the suppliers table
+	*/
+	public function delete(): void
+	{
+		$suppliers_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
+
+		if($this->supplier->delete_list($suppliers_to_delete))
+		{
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Suppliers.successful_deleted') . ' ' . count($suppliers_to_delete) . ' ' . lang('Suppliers.one_or_multiple')
+			]);
+		}
+		else
+		{
+			echo json_encode (['success' => FALSE, 'message' => lang('Suppliers.cannot_be_deleted')]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/Controllers/Tax_categories.php b/app/Controllers/Tax_categories.php
index 952b166df..591fc56d5 100644
--- a/app/Controllers/Tax_categories.php
+++ b/app/Controllers/Tax_categories.php
@@ -1,100 +1,118 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Tax_category;
+
+/**
+ * @property tax_category tax_category
+ */
 class Tax_categories extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('tax_categories');
+		
+		$this->tax_category = model('Tax_category');
 	}
 
-
-	public function index()
+	public function index(): void
 	{
-		 $data['tax_categories_table_headers'] = $this->xss_clean(get_tax_categories_table_headers());
+		 $data['tax_categories_table_headers'] = get_tax_categories_table_headers();
 
-		 $this->load->view('taxes/tax_categories', $data);
+		 echo view('taxes/tax_categories', $data);
 	}
 
 	/*
 	 * Returns tax_category table data rows. This will be called with AJAX.
 	*/
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$tax_categories = $this->Tax_category->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Tax_category->get_found_rows($search);
+		$tax_categories = $this->tax_category->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->tax_category->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($tax_categories->result() as $tax_category)
+		$data_rows = [];
+		foreach($tax_categories->getResult() as $tax_category)
 		{
-			$data_rows[] = $this->xss_clean(get_tax_category_data_row($tax_category));
+			$data_rows[] = get_tax_categories_data_row($tax_category);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function get_row($row_id)
+	public function get_row($row_id): void
 	{
-		$data_row = $this->xss_clean(get_tax_category_data_row($this->Tax_category->get_info($row_id)));
+		$data_row = get_tax_categories_data_row($this->tax_category->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	public function view($tax_category_id = -1)
+	public function view(int $tax_category_id = -1): void	//TODO: Need to replace -1 with constant
 	{
-		$data['tax_category_info'] = $this->Tax_category->get_info($tax_category_id);
+		$data['tax_category_info'] = $this->tax_category->get_info($tax_category_id);
 
-		$this->load->view("taxes/tax_category_form", $data);
+		echo view("taxes/tax_category_form", $data);
 	}
 
 
-	public function save($tax_category_id = -1)
+	public function save(int $tax_category_id = -1): void	//TODO: Need to replace -1 with constant
 	{
-		$tax_category_data = array(
-			'tax_category' => $this->input->post('tax_category'),
-			'tax_category_code' => $this->input->post('tax_category_code'),
-			'tax_group_sequence' => $this->input->post('tax_group_sequence')
-		);
+		$tax_category_data = [
+			'tax_category' => $this->request->getPost('tax_category', FILTER_SANITIZE_STRING),
+			'tax_category_code' => $this->request->getPost('tax_category_code', FILTER_SANITIZE_STRING),
+			'tax_group_sequence' => $this->request->getPost('tax_group_sequence', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		if($this->Tax_category->save($tax_category_data, $tax_category_id))
+		if($this->tax_category->save_value($tax_category_data, $tax_category_id))
 		{
-			$tax_category_data = $this->xss_clean($tax_category_data);
-
 			// New tax_category_id
-			if($tax_category_id == -1)
+			if($tax_category_id == -1)	//TODO: Need to replace -1 with constant
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_categories_successful_adding'), 'id' => $tax_category_data['tax_category_id']));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_categories.successful_adding'),
+					'id' => $tax_category_data['tax_category_id']
+				]);
 			}
 			else
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_categories_successful_updating'), 'id' => $tax_category_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_categories.successful_updating'),
+					'id' => $tax_category_id
+				]);
 			}
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_categories_error_adding_updating') . ' ' . $tax_category_data['tax_category'], 'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Tax_categories.error_adding_updating') . ' ' . $tax_category_data['tax_category'],
+				'id' => -1	//TODO: Need to replace -1 with constant
+			]);
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$tax_categories_to_delete = $this->input->post('ids');
+		$tax_categories_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-		if($this->Tax_category->delete_list($tax_categories_to_delete))
+		if($this->tax_category->delete_list($tax_categories_to_delete))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_categories_successful_deleted') . ' ' . count($tax_categories_to_delete) . ' ' . $this->lang->line('taxes_categories_one_or_multiple')));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Tax_categories.successful_deleted') . ' ' . count($tax_categories_to_delete) . ' ' . lang('Tax_categories.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_categories_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Tax_categories.cannot_be_deleted')]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Tax_codes.php b/app/Controllers/Tax_codes.php
index af21db696..fd40fd851 100644
--- a/app/Controllers/Tax_codes.php
+++ b/app/Controllers/Tax_codes.php
@@ -1,104 +1,126 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Tax_code;
+
+/**
+ * @property tax_code tax_code
+ */
 class Tax_codes extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('tax_codes');
+		
+		$this->tax_code = model('Tax_code');
+		helper('tax_helper');
 	}
 
 
-	public function index()
+	public function index(): void
 	{
-		 $this->load->view('taxes/tax_codes',get_data());
+		 echo view('taxes/tax_codes', $this->get_data());
 	}
 
-	public function get_data()
+	public function get_data(): array
 	{
-		$data['table_headers'] = $this->xss_clean(get_tax_codes_table_headers());
+
+		$data['table_headers'] = get_tax_code_table_headers();
 		return $data;
 	}
 
 	/*
 	 * Returns tax_category table data rows. This will be called with AJAX.
 	 */
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$tax_codes = $this->Tax_code->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Tax_code->get_found_rows($search);
+		$tax_codes = $this->tax_code->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->tax_code->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($tax_codes->result() as $tax_code)
+		$data_rows = [];
+
+		foreach($tax_codes->getResult() as $tax_code)
 		{
-			$data_rows[] = $this->xss_clean(get_tax_code_data_row($tax_code));
+			$data_rows[] = get_tax_code_data_row($tax_code);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$data_row = $this->xss_clean(get_tax_code_data_row($this->Tax_code->get_info($row_id)));
+		$data_row = get_tax_code_data_row($this->tax_code->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	public function view($tax_code_id = -1)
+	public function view(int $tax_code_id = -1): void	//TODO: Need to replace -1 with constant
 	{
-		$data['tax_code_info'] = $this->Tax_code->get_info($tax_code_id);
+		$data['tax_code_info'] = $this->tax_code->get_info($tax_code_id);
 
-		$this->load->view("taxes/tax_code_form", $data);
+		echo view("taxes/tax_code_form", $data);
 	}
 
 
-	public function save($tax_code_id = -1)
+	public function save(int $tax_code_id = -1): void		//TODO: Need to replace -1 with constant
 	{
-		$tax_code_data = array(
-			'tax_code' => $this->input->post('tax_code'),
-			'tax_code_name' => $this->input->post('tax_code_name'),
-			'city' => $this->input->post('city'),
-			'state' => $this->input->post('state')
-		);
+		$tax_code_data = [
+			'tax_code' => $this->request->getPost('tax_code', FILTER_SANITIZE_STRING),
+			'tax_code_name' => $this->request->getPost('tax_code_name', FILTER_SANITIZE_STRING),
+			'city' => $this->request->getPost('city', FILTER_SANITIZE_STRING),
+			'state' => $this->request->getPost('state', FILTER_SANITIZE_STRING)
+		];
 
-		if($this->Tax_code->save($tax_code_data))
+		if($this->tax_code->save($tax_code_data))
 		{
-			$tax_code_data = $this->xss_clean($tax_code_data);
-
-			if($tax_code_id == -1)
+			if($tax_code_id == -1)	//TODO: Need to replace -1 with constant
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_codes_successful_adding'), 'id' => $tax_code_data['tax_code_id']));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_codes.successful_adding'),
+					'id' => $tax_code_data['tax_code_id']
+				]);
 			}
 			else
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_codes_successful_updating'), 'id' => $tax_code_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_codes.successful_updating'),
+					'id' => $tax_code_id
+				]);
 			}
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_codes_error_adding_updating') . ' ' . $tax_code_data['tax_code_id'], 'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Tax_codes.error_adding_updating') . ' ' . $tax_code_data['tax_code_id'],
+				'id' => -1
+			]);
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$tax_codes_to_delete = $this->input->post('ids');
+		$tax_codes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-		if($this->Tax_code->delete_list($tax_codes_to_delete))
+		if($this->tax_code->delete_list($tax_codes_to_delete))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_codes_successful_deleted') . ' ' . count($tax_codes_to_delete) . ' ' . $this->lang->line('taxes_codes_one_or_multiple')));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Tax_codes.successful_deleted') . ' ' . count($tax_codes_to_delete) . ' ' . lang('Tax_codes.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_codes_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Tax_codes.cannot_be_deleted')]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Tax_jurisdictions.php b/app/Controllers/Tax_jurisdictions.php
index 7059f7bcf..ade86567f 100644
--- a/app/Controllers/Tax_jurisdictions.php
+++ b/app/Controllers/Tax_jurisdictions.php
@@ -1,98 +1,119 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Models\Tax_jurisdiction;
+
+/**
+ * @property tax_jurisdiction tax_jurisdiction
+ */
 class Tax_jurisdictions extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('tax_jurisdictions');
+
+		$this->tax_jurisdiction = model('Tax_jurisdiction');
+
+		helper('tax_helper');
 	}
 
 
-	public function index()
+	public function index(): void
 	{
-		 $data['table_headers'] = $this->xss_clean(get_tax_jurisdictions_table_headers());
+		 $data['table_headers'] = get_tax_jurisdictions_table_headers();
 
-		 $this->load->view('taxes/tax_jurisdictions', $data);
+		 echo view('taxes/tax_jurisdictions', $data);
 	}
 
 	/*
 	 * Returns tax_category table data rows. This will be called with AJAX.
 	 */
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit  = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
-		$order  = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort   = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order  = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$tax_jurisdictions = $this->Tax_jurisdiction->search($search, $limit, $offset, $sort, $order);
-		$total_rows = $this->Tax_jurisdiction->get_found_rows($search);
+		$tax_jurisdictions = $this->tax_jurisdiction->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->tax_jurisdiction->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($tax_jurisdictions->result() as $tax_jurisdiction)
+		$data_rows = [];
+		foreach($tax_jurisdictions->getResult() as $tax_jurisdiction)
 		{
-			$data_rows[] = $this->xss_clean(get_tax_jurisdiction_data_row($tax_jurisdiction));
+			$data_rows[] = get_tax_jurisdictions_data_row($tax_jurisdiction);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$data_row = $this->xss_clean(get_tax_jurisdiction_data_row($this->Tax_jurisdiction->get_info($row_id)));
+		$data_row = get_tax_jurisdictions_data_row($this->tax_jurisdiction->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	public function view($tax_jurisdiction_id = -1)
+	public function view(int $tax_jurisdiction_id = -1): void	//TODO: Replace -1 with constant
 	{
-		$data['tax_jurisdiction_info'] = $this->Tax_jurisdiction->get_info($tax_jurisdiction_id);
+		$data['tax_jurisdiction_info'] = $this->tax_jurisdiction->get_info($tax_jurisdiction_id);
 
-		$this->load->view("taxes/tax_jurisdiction_form", $data);
+		echo view("taxes/tax_jurisdiction_form", $data);
 	}
 
 
-	public function save($jurisdiction_id = -1)
+	public function save(int $jurisdiction_id = -1): void	//TODO: Replace -1 with constant
 	{
-		$tax_jurisdiction_data = array(
-			'jurisdiction_name' => $this->input->post('jurisdiction_name'),
-			'reporting_authority' => $this->input->post('reporting_authority')
-		);
+		$tax_jurisdiction_data = [
+			'jurisdiction_name' => $this->request->getPost('jurisdiction_name', FILTER_SANITIZE_STRING),
+			'reporting_authority' => $this->request->getPost('reporting_authority', FILTER_SANITIZE_STRING)
+		];
 
-		if($this->Tax_jurisdiction->save($tax_jurisdiction_data))
+		if($this->tax_jurisdiction->save_value($tax_jurisdiction_data))
 		{
-			$tax_jurisdiction_data = $this->xss_clean($tax_jurisdiction_data);
-
-			if($jurisdiction_id == -1)
+			if($jurisdiction_id == -1)	//TODO: Replace -1 with constant
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_jurisdictions_successful_adding'), 'id' => $tax_jurisdiction_data['jurisdiction_id']));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_jurisdictions.successful_adding'),
+					'id' => $tax_jurisdiction_data['jurisdiction_id']
+				]);
 			}
 			else
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_jurisdictions_successful_updating'), 'id' => $jurisdiction_id));
+				echo json_encode ([
+					'success' => TRUE,
+					'message' => lang('Tax_jurisdictions.successful_updating'),
+					'id' => $jurisdiction_id
+				]);
 			}
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_jurisdictions_error_adding_updating') . ' ' . $tax_jurisdiction_data['jurisdiction_name'], 'id' => -1));
+			echo json_encode ([
+				'success' => FALSE,
+				'message' => lang('Tax_jurisdictions.error_adding_updating') . ' ' . $tax_jurisdiction_data['jurisdiction_name'],
+				'id' => -1
+			]);
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$tax_jurisdictions_to_delete = $this->input->post('ids');
+		$tax_jurisdictions_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-		if($this->Tax_jurisdiction->delete_list($tax_jurisdictions_to_delete))
+		if($this->tax_jurisdiction->delete_list($tax_jurisdictions_to_delete))
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_jurisdictions_successful_deleted') . ' ' . count($tax_jurisdictions_to_delete) . ' ' . $this->lang->line('taxes_jurisdictions_one_or_multiple')));
+			echo json_encode ([
+				'success' => TRUE,
+				'message' => lang('Tax_jurisdictions.successful_deleted') . ' ' . count($tax_jurisdictions_to_delete) . ' ' . lang('Tax_jurisdictions.one_or_multiple')
+			]);
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_jurisdictions_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Tax_jurisdictions.cannot_be_deleted')]);
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/Taxes.php b/app/Controllers/Taxes.php
index c4adc08d8..2aa63116a 100644
--- a/app/Controllers/Taxes.php
+++ b/app/Controllers/Taxes.php
@@ -1,40 +1,64 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Secure_Controller.php");
+namespace App\Controllers;
 
+use app\Libraries\Tax_lib;
+use app\Models\enums\Rounding_mode;
+use app\Models\Tax;
+use app\Models\Tax_category;
+use app\Models\Tax_code;
+use app\Models\Tax_jurisdiction;
+
+/**
+ * @property tax_lib tax_lib
+ * @property rounding_mode rounding_mode
+ * @property tax tax
+ * @property tax_category tax_category
+ * @property tax_code tax_code
+ * @property tax_jurisdiction tax_jurisdiction
+ */
 class Taxes extends Secure_Controller
 {
 	public function __construct()
 	{
 		parent::__construct('taxes');
 
-		$this->load->model('enums/Rounding_mode');
-		$this->load->library('tax_lib');
-		$this->load->helper('tax_helper');
+		$this->rounding_mode = model('enums/Rounding_mode');
+		$this->tax = model('Tax');
+		$this->tax_category = model('Tax_category');
+		$this->tax_code = model('Tax_code');
+		$this->tax_jurisdiction = model('Tax_jurisdiction');
+		
+		$this->tax_lib = new Tax_lib();
+
+		helper('tax_helper');
 	}
 
-	public function index()
+	public function index(): void
 	{
-		$data['tax_codes'] = $this->xss_clean($this->Tax_code->get_all()->result_array());
+		$data['tax_codes'] = $this->tax_code->get_all()->getResultArray();
 		if (count($data['tax_codes']) == 0)
 		{
-			$data['tax_codes'] = $this->Tax_code->get_empty_row();
+			$data['tax_codes'] = $this->tax_code->get_empty_row();
 		}
-		$data['tax_categories'] = $this->xss_clean($this->Tax_category->get_all()->result_array());
+
+		$data['tax_categories'] = $this->tax_category->get_all()->getResultArray();
 		if (count($data['tax_categories']) == 0)
 		{
-			$data['tax_categories'] = $this->Tax_category->get_empty_row();
+			$data['tax_categories'] = $this->tax_category->get_empty_row();
 		}
-		$data['tax_jurisdictions'] = $this->xss_clean($this->Tax_jurisdiction->get_all()->result_array());
+
+		$data['tax_jurisdictions'] = $this->tax_jurisdiction->get_all()->getResultArray();
 		if (count($data['tax_jurisdictions']) == 0)
 		{
-			$data['tax_jurisdictions'] = $this->Tax_jurisdiction->get_empty_row();
+			$data['tax_jurisdictions'] = $this->tax_jurisdiction->get_empty_row();
 		}
-		$data['tax_rate_table_headers'] = $this->xss_clean(get_tax_rates_manage_table_headers());
-		$data['tax_categories_table_headers'] = $this->xss_clean(get_tax_categories_table_headers());
+
+		$data['tax_rate_table_headers'] = get_tax_rates_manage_table_headers();
+		$data['tax_categories_table_headers'] = get_tax_categories_table_headers();
 		$data['tax_types'] = $this->tax_lib->get_tax_types();
 
-		if($this->config->item('tax_included') == '1')
+		if(config('OSPOS')->tax_included)
 		{
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
 		}
@@ -45,40 +69,40 @@ class Taxes extends Secure_Controller
 
 		$data['tax_type_options'] = $this->tax_lib->get_tax_type_options($data['default_tax_type']);
 
-		$this->load->view('taxes/manage', $data);
+		echo view('taxes/manage', $data);
 	}
 
 
 	/*
 	Returns tax_codes table data rows. This will be called with AJAX.
 	*/
-	public function search()
+	public function search(): void
 	{
-		$search = $this->input->get('search');
-		$limit = $this->input->get('limit');
-		$offset = $this->input->get('offset');
-		$sort = $this->input->get('sort');
-		$order = $this->input->get('order');
+		$search = $this->request->getGet('search', FILTER_SANITIZE_STRING);
+		$limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+		$offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
+		$sort = $this->request->getGet('sort', FILTER_SANITIZE_STRING);
+		$order = $this->request->getGet('order', FILTER_SANITIZE_STRING);
 
-		$tax_rates = $this->Tax->search($search, $limit, $offset, $sort, $order);
+		$tax_rates = $this->tax->search($search, $limit, $offset, $sort, $order);
 
-		$total_rows = $this->Tax->get_found_rows($search);
+		$total_rows = $this->tax->get_found_rows($search);
 
-		$data_rows = array();
-		foreach($tax_rates->result() as $tax_rate_row)
+		$data_rows = [];
+		foreach($tax_rates->getResult() as $tax_rate_row)
 		{
-			$data_rows[] = $this->xss_clean(get_tax_rates_data_row($tax_rate_row));
+			$data_rows[] = get_tax_rates_data_row($tax_rate_row);
 		}
 
-		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+		echo json_encode (['total' => $total_rows, 'rows' => $data_rows]);
 	}
 
-	/*
-	Gives search suggestions based on what is being searched for
-	*/
-	public function suggest_search()
+	/**
+	 * Gives search suggestions based on what is being searched for
+	 */
+	public function suggest_search(): void
 	{
-		$suggestions = $this->xss_clean($this->Tax->get_search_suggestions($this->input->post('term')));
+		$suggestions = $this->tax->get_search_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));	//TODO: There is no get_search_suggestions function in the tax model
 
 		echo json_encode($suggestions);
 	}
@@ -86,31 +110,31 @@ class Taxes extends Secure_Controller
 	/*
 	Provides list of tax categories to select from
 	*/
-	public function suggest_tax_categories()
+	public function suggest_tax_categories(): void
 	{
-		$suggestions = $this->xss_clean($this->Tax_category->get_tax_category_suggestions($this->input->post('term')));
+		$suggestions = $this->tax_category->get_tax_category_suggestions($this->request->getPost('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
 
-	public function get_row($row_id)
+	public function get_row(int $row_id): void
 	{
-		$data_row = $this->xss_clean(get_tax_rates_data_row($this->Tax->get_info($row_id), $this));
+		$data_row = get_tax_rates_data_row($this->tax->get_info($row_id));
 
 		echo json_encode($data_row);
 	}
 
-	public function view_tax_codes($tax_code = -1)
+	public function view_tax_codes(int $tax_code = -1): void	//TODO: Replace -1 with constant
 	{
-		$tax_code_info = $this->Tax->get_info($tax_code);
+		$tax_code_info = $this->tax->get_info($tax_code);
 
-		$default_tax_category_id = 1; // Tax category id is always the default tax category
-		$default_tax_category = $this->Tax->get_tax_category($default_tax_category_id);
+		$default_tax_category_id = 1; // Tax category id is always the default tax category	//TODO: Replace 1 with constant
+		$default_tax_category = $this->tax->get_tax_category($default_tax_category_id);	//TODO: this variable is never used in the code.
 
-		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+		$tax_rate_info = $this->tax->get_rate_info($tax_code, $default_tax_category_id);
 
-		if($this->config->item('tax_included') == '1')
+		if(config('OSPOS')->tax_included)
 		{
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
 		}
@@ -119,11 +143,11 @@ class Taxes extends Secure_Controller
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
 		}
 
-		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['rounding_options'] = rounding_mode::get_rounding_options();
 		$data['html_rounding_options'] = $this->get_html_rounding_options();
 
-		if($tax_code == -1)
-		{
+		if($tax_code == -1)	//TODO: Replace -1 with constant
+		{//TODO: Duplicated code
 			$data['tax_code'] = '';
 			$data['tax_code_name'] = '';
 			$data['tax_code_type'] = '0';
@@ -151,44 +175,41 @@ class Taxes extends Secure_Controller
 			$data['rounding_code'] = $tax_rate_info->rounding_code;
 		}
 
-		$data = $this->xss_clean($data);
-
-		$tax_rates = array();
-		foreach($this->Tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)
+		$tax_rates = [];
+		foreach($this->tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)	//TODO: get_tax_code_rate_exceptions doesn't exist.  This was deleted by @steveireland in https://github.com/opensourcepos/opensourcepos/commit/32204698379c230f2a6756655f40334308023de9#diff-e746bab6720cf5dbf855de6cda68f7aca9ecea7ddd5a39bb852e9b9047a7a838L435 but it's unclear if that was on purpose or accidental.
 		{
-			$tax_rate_row = array();
-			$tax_rate_row['rate_tax_category_id'] = $this->xss_clean($tax_code_rate['rate_tax_category_id']);
-			$tax_rate_row['tax_category'] = $this->xss_clean($tax_code_rate['tax_category']);
-			$tax_rate_row['tax_rate'] = $this->xss_clean($tax_code_rate['tax_rate']);
-			$tax_rate_row['rounding_code'] = $this->xss_clean($tax_code_rate['rounding_code']);
+			$tax_rate_row = [];
+			$tax_rate_row['rate_tax_category_id'] = $tax_code_rate['rate_tax_category_id'];
+			$tax_rate_row['tax_category'] = $tax_code_rate['tax_category'];
+			$tax_rate_row['tax_rate'] = $tax_code_rate['tax_rate'];
+			$tax_rate_row['rounding_code'] = $tax_code_rate['rounding_code'];
 
 			$tax_rates[] = $tax_rate_row;
 		}
 
 		$data['tax_rates'] = $tax_rates;
 
-		$this->load->view('taxes/tax_code_form', $data);
+		echo view('taxes/tax_code_form', $data);
 	}
 
 
-	public function view($tax_rate_id = -1)
+	public function view(int $tax_rate_id = -1): void	//TODO: Replace -1 with constant
 	{
-
-		$tax_rate_info = $this->Tax->get_info($tax_rate_id);
+		$tax_rate_info = $this->tax->get_info($tax_rate_id);
 
 		$data['tax_rate_id'] = $tax_rate_id;
-		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['rounding_options'] = rounding_mode::get_rounding_options();
 
 		$data['tax_code_options'] = $this->tax_lib->get_tax_code_options();
 		$data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
 		$data['tax_jurisdiction_options'] = $this->tax_lib->get_tax_jurisdiction_options();
 
-		if($tax_rate_id == -1)
+		if($tax_rate_id == -1)	//TODO: Replace -1 with constant
 		{
-			$data['rate_tax_code_id'] = $this->config->item('default_tax_code');
-			$data['rate_tax_category_id'] = $this->config->item('default_tax_category');
-			$data['rate_jurisdiction_id'] = $this->config->item('default_tax_jurisdiction');
-			$data['tax_rounding_code'] = Rounding_mode::HALF_UP;
+			$data['rate_tax_code_id'] = config('OSPOS')->default_tax_code;
+			$data['rate_tax_category_id'] = config('OSPOS')->default_tax_category;
+			$data['rate_jurisdiction_id'] = config('OSPOS')->default_tax_jurisdiction;
+			$data['tax_rounding_code'] = rounding_mode::HALF_UP;
 			$data['tax_rate'] = '0.0000';
 		}
 		else
@@ -201,26 +222,22 @@ class Taxes extends Secure_Controller
 			$data['tax_rate'] = $tax_rate_info->tax_rate;
 		}
 
-		$data = $this->xss_clean($data);
-
-		$this->load->view('taxes/tax_rates_form', $data);
+		echo view('taxes/tax_rates_form', $data);
 	}
 
-
-
-	public function view_tax_categories($tax_code = -1)
+	public function view_tax_categories(int $tax_code = -1): void	//TODO: Replace -1 with constant	//TODO: This appears to be called no where in the code.
 	{
-		$tax_code_info = $this->Tax->get_info($tax_code);
+		$tax_code_info = $this->tax->get_info($tax_code);	//TODO: Duplicated Code
 
-		$default_tax_category_id = 1; // Tax category id is always the default tax category
-		$default_tax_category = $this->Tax->get_tax_category($default_tax_category_id);
+		$default_tax_category_id = 1; // Tax category id is always the default tax category	//TODO: replace with a constant.
+		$default_tax_category = $this->tax->get_tax_category($default_tax_category_id);
 
-		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+		$tax_rate_info = $this->tax->get_rate_info($tax_code, $default_tax_category_id);
 
-		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['rounding_options'] = rounding_mode::get_rounding_options();
 		$data['html_rounding_options'] = $this->get_html_rounding_options();
 
-		if($this->config->item('tax_included') == '1')
+		if(config('OSPOS')->tax_included)
 		{
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
 		}
@@ -229,7 +246,7 @@ class Taxes extends Secure_Controller
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
 		}
 
-		if($tax_code == -1)
+		if($tax_code == -1)	//TODO: Replace -1 with constant
 		{
 			$data['tax_code'] = '';
 			$data['tax_code_name'] = '';
@@ -258,38 +275,36 @@ class Taxes extends Secure_Controller
 			$data['rounding_code'] = $tax_rate_info->rounding_code;
 		}
 
-		$data = $this->xss_clean($data);
-
-		$tax_rates = array();
-		foreach($this->Tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)
+		$tax_rates = [];
+		foreach($this->tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)	//TODO: get_tax_code_rate_exceptions doesn't exist in the tax model
 		{
-			$tax_rate_row = array();
-			$tax_rate_row['rate_tax_category_id'] = $this->xss_clean($tax_code_rate['rate_tax_category_id']);
-			$tax_rate_row['tax_category'] = $this->xss_clean($tax_code_rate['tax_category']);
-			$tax_rate_row['tax_rate'] = $this->xss_clean($tax_code_rate['tax_rate']);
-			$tax_rate_row['rounding_code'] = $this->xss_clean($tax_code_rate['rounding_code']);
+			$tax_rate_row = [];
+			$tax_rate_row['rate_tax_category_id'] = $tax_code_rate['rate_tax_category_id'];
+			$tax_rate_row['tax_category'] = $tax_code_rate['tax_category'];
+			$tax_rate_row['tax_rate'] = $tax_code_rate['tax_rate'];
+			$tax_rate_row['rounding_code'] = $tax_code_rate['rounding_code'];
 
 			$tax_rates[] = $tax_rate_row;
 		}
 
 		$data['tax_rates'] = $tax_rates;
 
-		$this->load->view('taxes/tax_category_form', $data);
+		echo view('taxes/tax_category_form', $data);
 	}
 
-	public function view_tax_jurisdictions($tax_code = -1)
+	public function view_tax_jurisdictions(int $tax_code = -1): void	//TODO: Replace -1 with constant	//TODO: This appears to be called no where in the code.
 	{
-		$tax_code_info = $this->Tax->get_info($tax_code);
+		$tax_code_info = $this->tax->get_info($tax_code);	//TODO: Duplicated code
 
 		$default_tax_category_id = 1; // Tax category id is always the default tax category
-		$default_tax_category = $this->Tax->get_tax_category($default_tax_category_id);
+		$default_tax_category = $this->tax->get_tax_category($default_tax_category_id);	//TODO: This variable is not used anywhere in the code
 
-		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+		$tax_rate_info = $this->tax->get_rate_info($tax_code, $default_tax_category_id);
 
-		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['rounding_options'] = rounding_mode::get_rounding_options();
 		$data['html_rounding_options'] = $this->get_html_rounding_options();
 
-		if($this->config->item('tax_included') == '1')
+		if(config('OSPOS')->tax_included)
 		{
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
 		}
@@ -298,7 +313,7 @@ class Taxes extends Secure_Controller
 			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
 		}
 
-		if($tax_code == -1)
+		if($tax_code == -1)	//TODO: Replace -1 with constant
 		{
 			$data['tax_code'] = '';
 			$data['tax_code_name'] = '';
@@ -327,141 +342,150 @@ class Taxes extends Secure_Controller
 			$data['rounding_code'] = $tax_rate_info->rounding_code;
 		}
 
-		$data = $this->xss_clean($data);
-
-		$tax_rates = array();
-		foreach($this->Tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)
+		$tax_rates = [];
+		foreach($this->tax->get_tax_code_rate_exceptions($tax_code) as $tax_code_rate)	//TODO: get_tax_code_rate_exceptions doesn't exist in the tax model
 		{
-			$tax_rate_row = array();
-			$tax_rate_row['rate_tax_category_id'] = $this->xss_clean($tax_code_rate['rate_tax_category_id']);
-			$tax_rate_row['tax_category'] = $this->xss_clean($tax_code_rate['tax_category']);
-			$tax_rate_row['tax_rate'] = $this->xss_clean($tax_code_rate['tax_rate']);
-			$tax_rate_row['rounding_code'] = $this->xss_clean($tax_code_rate['rounding_code']);
+			$tax_rate_row = [];
+			$tax_rate_row['rate_tax_category_id'] = $tax_code_rate['rate_tax_category_id'];
+			$tax_rate_row['tax_category'] = $tax_code_rate['tax_category'];
+			$tax_rate_row['tax_rate'] = $tax_code_rate['tax_rate'];
+			$tax_rate_row['rounding_code'] = $tax_code_rate['rounding_code'];
 
 			$tax_rates[] = $tax_rate_row;
 		}
 
 		$data['tax_rates'] = $tax_rates;
 
-		$this->load->view('taxes/tax_jurisdiction_form', $data);
+		echo view('taxes/tax_jurisdiction_form', $data);
 	}
 
-	public static function get_html_rounding_options()
+	public static function get_html_rounding_options(): string
 	{
-		return Rounding_mode::get_html_rounding_options();
+		return rounding_mode::get_html_rounding_options();
 	}
 
-	public function save($tax_rate_id = -1)
+	public function save(int $tax_rate_id = -1): void	//TODO: Replace -1 with constant
 	{
-		$tax_category_id = $this->input->post('rate_tax_category_id');
-		$tax_rate = parse_tax($this->input->post('tax_rate'));
+		$tax_category_id = $this->request->getPost('rate_tax_category_id', FILTER_SANITIZE_NUMBER_INT);
+		$tax_rate = parse_tax($this->request->getPost('tax_rate', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
 
-		if ($tax_rate == 0) {
-			$tax_category_info = $this->Tax_category->get_info($tax_category_id);
+		if ($tax_rate == 0)	//TODO: Replace 0 with constant?
+		{
+			$tax_category_info = $this->tax_category->get_info($tax_category_id);	//TODO: this variable is not used anywhere in the code
 		}
 
-		$tax_rate_data = array(
-			'rate_tax_code_id' => $this->input->post('rate_tax_code_id'),
-			'rate_tax_category_id' => $this->input->post('rate_tax_category_id'),
-			'rate_jurisdiction_id' => $this->input->post('rate_jurisdiction_id'),
+		$tax_rate_data = [
+			'rate_tax_code_id' => $this->request->getPost('rate_tax_code_id', FILTER_SANITIZE_NUMBER_INT),
+			'rate_tax_category_id' => $this->request->getPost('rate_tax_category_id', FILTER_SANITIZE_NUMBER_INT),
+			'rate_jurisdiction_id' => $this->request->getPost('rate_jurisdiction_id', FILTER_SANITIZE_NUMBER_INT),
 			'tax_rate' => $tax_rate,
-			'tax_rounding_code' => $this->input->post('tax_rounding_code')
-		);
+			'tax_rounding_code' => $this->request->getPost('tax_rounding_code', FILTER_SANITIZE_NUMBER_INT)
+		];
 
-		if($this->Tax->save($tax_rate_data, $tax_rate_id))
+		if($this->tax->save_value($tax_rate_data, $tax_rate_id))
 		{
-			if($tax_rate_id == -1)
-			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_tax_rate_successfully_added')));
+			if($tax_rate_id == -1)	//TODO: Replace -1 with constant
+			{//TODO: this needs to be replaced with ternary notation
+				echo json_encode (['success' => TRUE, 'message' => lang('Taxes.tax_rate_successfully_added')]);
 			}
 			else //Existing tax_code
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_tax_rate_successful_updated')));
+				echo json_encode (['success' => TRUE, 'message' => lang('Taxes.tax_rate_successful_updated')]);
 			}
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_tax_rate_error_adding_updating')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Taxes.tax_rate_error_adding_updating')]);
 		}
 	}
 
-	public function delete()
+	public function delete(): void
 	{
-		$tax_codes_to_delete = $this->xss_clean($this->input->post('ids'));
+		$tax_codes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-		if($this->Tax->delete_list($tax_codes_to_delete))
+		if($this->tax->delete_list($tax_codes_to_delete))	//TODO: this needs to be replaced with ternary notation
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_tax_code_successful_deleted')));
+			echo json_encode (['success' => TRUE, 'message' => lang('Taxes.tax_code_successful_deleted')]);
 		} else
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_tax_code_cannot_be_deleted')));
+			echo json_encode (['success' => FALSE, 'message' => lang('Taxes.tax_code_cannot_be_deleted')]);
 		}
 	}
 
-	public function suggest_tax_codes()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function suggest_tax_codes(): void
 	{
-		$suggestions = $this->xss_clean($this->Tax_code->get_tax_codes_search_suggestions($this->input->post_get('term')));
+		$suggestions = $this->tax_code->get_tax_codes_search_suggestions($this->request->getPostGet('term', FILTER_SANITIZE_STRING));
 
 		echo json_encode($suggestions);
 	}
 
-
-	public function save_tax_codes()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function save_tax_codes(): void
 	{
-		$tax_code_id = $this->input->post('tax_code_id');
-		$tax_code = $this->input->post('tax_code');
-		$tax_code_name = $this->input->post('tax_code_name');
-		$tax_code_id = $this->input->post('tax_code_id');
-		$city = $this->input->post('city');
-		$state = $this->input->post('state');
+		$tax_code_id = $this->request->getPost('tax_code_id', FILTER_SANITIZE_NUMBER_INT);
+		$tax_code = $this->request->getPost('tax_code', FILTER_SANITIZE_STRING);
+		$tax_code_name = $this->request->getPost('tax_code_name', FILTER_SANITIZE_STRING);
+		$city = $this->request->getPost('city', FILTER_SANITIZE_STRING);
+		$state = $this->request->getPost('state', FILTER_SANITIZE_STRING);
 
-		$array_save = array();
+		$array_save = [];	//TODO: the naming of this variable is not good.
 		foreach($tax_code_id as $key=>$val)
 		{
-			$array_save[] = array('tax_code_id'=>$this->xss_clean($val), 'tax_code'=>$this->xss_clean($tax_code[$key]),
-			'tax_code_name'=>$this->xss_clean($tax_code_name[$key]), 'tax_code_id'=>$this->xss_clean($tax_code_id[$key]),
-			'city'=>$this->xss_clean($city[$key]), 'state'=>$this->xss_clean($state[$key]));
+			$array_save[] = [
+				'tax_code_id'=>$val,
+				'tax_code'=>$tax_code[$key],
+				'tax_code_name'=>$tax_code_name[$key],
+				'city'=>$city[$key],
+				'state'=>$state[$key]
+			];
 		}
 
-		$success = $this->Tax_code->save_tax_codes($array_save);
+		$success = $this->tax_code->save_tax_codes($array_save);
 
-		echo json_encode(array(
+		echo json_encode ([
 			'success' => $success,
-			'message' => $this->lang->line('taxes_tax_codes_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+			'message' => lang('Taxes.tax_codes_saved_' . ($success ? '' : 'un') . 'successfully')
+		]);
 	}
 
-	public function save_tax_jurisdictions()
+	public function save_tax_jurisdictions(): void
 	{
-		$jurisdiction_id = $this->input->post('jurisdiction_id');
-		$jurisdiction_name = $this->input->post('jurisdiction_name');
-		$tax_group = $this->input->post('tax_group');
-		$tax_type = $this->input->post('tax_type');
-		$reporting_authority = $this->input->post('reporting_authority');
-		$tax_group_sequence = $this->input->post('tax_group_sequence');
-		$cascade_sequence = $this->input->post('cascade_sequence');
-
-		$array_save = array();
+		$jurisdiction_id = $this->request->getPost('jurisdiction_id', FILTER_SANITIZE_NUMBER_INT);
+		$jurisdiction_name = $this->request->getPost('jurisdiction_name', FILTER_SANITIZE_STRING);
+		$tax_group = $this->request->getPost('tax_group', FILTER_SANITIZE_STRING);
+		$tax_type = $this->request->getPost('tax_type', FILTER_SANITIZE_NUMBER_INT);
+		$reporting_authority = $this->request->getPost('reporting_authority', FILTER_SANITIZE_STRING);
+		$tax_group_sequence = $this->request->getPost('tax_group_sequence', FILTER_SANITIZE_NUMBER_INT);
+		$cascade_sequence = $this->request->getPost('cascade_sequence', FILTER_SANITIZE_NUMBER_INT);
 
+		$array_save = [];
 		$unique_tax_groups = [];
 
 		foreach($jurisdiction_id as $key => $val)
 		{
-			$array_save[] = array(
-				'jurisdiction_id'=>$this->xss_clean($val),
-				'jurisdiction_name'=>$this->xss_clean($jurisdiction_name[$key]),
-				'tax_group'=>$this->xss_clean($tax_group[$key]),
-				'tax_type'=>$this->xss_clean($tax_type[$key]),
-				'reporting_authority'=>$this->xss_clean($reporting_authority[$key]),
-				'tax_group_sequence'=>$this->xss_clean($tax_group_sequence[$key]),
-				'cascade_sequence'=>$this->xss_clean($cascade_sequence[$key]));
+			$array_save[] = [
+				'jurisdiction_id'=>$val,
+				'jurisdiction_name'=>$jurisdiction_name[$key],
+				'tax_group'=>$tax_group[$key],
+				'tax_type'=>$tax_type[$key],
+				'reporting_authority'=>$reporting_authority[$key],
+				'tax_group_sequence'=>$tax_group_sequence[$key],
+				'cascade_sequence'=>$cascade_sequence[$key]
+			];
 
-			if (array_search($tax_group[$key], $unique_tax_groups) !== false)
+			if (in_array($tax_group[$key], $unique_tax_groups))	//TODO: This can be replaced with `in_array($tax_group[$key], $unique_tax_groups)`
 			{
-				echo json_encode(array(
+				echo json_encode ([
 					'success' => FALSE,
-					'message' => $this->lang->line('taxes_tax_group_not_unique', $tax_group[$key])
-				));
+					'message' => lang('Taxes.tax_group_not_unique', ['group' => $tax_group[$key]])
+				]);
 				return;
 			}
 			else
@@ -470,61 +494,70 @@ class Taxes extends Secure_Controller
 			}
 		}
 
-		$success = $this->Tax_jurisdiction->save_jurisdictions($array_save);
+		$success = $this->tax_jurisdiction->save_jurisdictions($array_save);
 
-		echo json_encode(array(
+		echo json_encode ([
 			'success' => $success,
-			'message' => $this->lang->line('taxes_tax_jurisdictions_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+			'message' => lang('Taxes.tax_jurisdictions_saved_' . ($success ? '' : 'un') . 'successfully')
+		]);
 	}
 
-	public function save_tax_categories()
+	public function save_tax_categories(): void
 	{
-		$tax_category_id = $this->input->post('tax_category_id');
-		$tax_category = $this->input->post('tax_category');
-		$tax_group_sequence = $this->input->post('tax_group_sequence');
+		$tax_category_id = $this->request->getPost('tax_category_id', FILTER_SANITIZE_NUMBER_INT);
+		$tax_category = $this->request->getPost('tax_category', FILTER_SANITIZE_STRING);
+		$tax_group_sequence = $this->request->getPost('tax_group_sequence', FILTER_SANITIZE_NUMBER_INT);
 
-		$array_save= array();
+		$array_save= [];
 
 		foreach($tax_category_id as $key => $val)
 		{
-			$array_save[] = array(
-				'tax_category_id'=>$this->xss_clean($val),
-				'tax_category'=>$this->xss_clean($tax_category[$key]),
-				'tax_group_sequence'=>$this->xss_clean($tax_group_sequence[$key]));
+			$array_save[] = [
+				'tax_category_id'=>$val,
+				'tax_category'=>$tax_category[$key],
+				'tax_group_sequence'=>$tax_group_sequence[$key]
+			];
 		}
 
-		$success = $this->Tax_category->save_categories($array_save);
+		$success = $this->tax_category->save_categories($array_save);
 
-		echo json_encode(array(
+		echo json_encode ([
 			'success' => $success,
-			'message' => $this->lang->line('taxes_tax_categories_saved_' . ($success ? '' : 'un') . 'successfully')
-		));
+			'message' => lang('Taxes.tax_categories_saved_' . ($success ? '' : 'un') . 'successfully')
+		]);
 	}
 
-	public function ajax_tax_codes()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function ajax_tax_codes(): void
 	{
-		$tax_codes = $this->Tax_code->get_all()->result_array();
+		$tax_codes = $this->tax_code->get_all()->getResultArray();
 
-		$tax_codes = $this->xss_clean($tax_codes);
-
-		$this->load->view('partial/tax_codes', array('tax_codes' => $tax_codes));
+		echo view('partial/tax_codes', ['tax_codes' => $tax_codes]);
 	}
 
-	public function ajax_tax_categories()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function ajax_tax_categories(): void
 	{
-		$tax_categories = $this->Tax_category->get_all()->result_array();
+		$tax_categories = $this->tax_category->get_all()->getResultArray();
 
-		$tax_categories = $this->xss_clean($tax_categories);
-
-		$this->load->view('partial/tax_categories', array('tax_categories' => $tax_categories));
+		echo view('partial/tax_categories', ['tax_categories' => $tax_categories]);
 	}
 
-	public function ajax_tax_jurisdictions()
+	/**
+	 * Called in the view.
+	 * @return void
+	 */
+	public function ajax_tax_jurisdictions(): void
 	{
-		$tax_jurisdictions = $this->Tax_jurisdiction->get_all()->result_array();
+		$tax_jurisdictions = $this->tax_jurisdiction->get_all()->getResultArray();
 
-		if($this->config->item('tax_included') == '1')
+		if(config('OSPOS')->tax_included)	//TODO: ternary notation
 		{
 			$default_tax_type = Tax_lib::TAX_TYPE_INCLUDED;
 		}
@@ -533,10 +566,12 @@ class Taxes extends Secure_Controller
 			$default_tax_type = Tax_lib::TAX_TYPE_EXCLUDED;
 		}
 
-		$tax_jurisdictions = $this->xss_clean($tax_jurisdictions);
 		$tax_types = $this->tax_lib->get_tax_types();
 
-		$this->load->view('partial/tax_jurisdictions', array('tax_jurisdictions' => $tax_jurisdictions, 'tax_types' => $tax_types, 'default_tax_type' => $default_tax_type));
+		echo view('partial/tax_jurisdictions', [
+			'tax_jurisdictions' => $tax_jurisdictions,
+			'tax_types' => $tax_types,
+			'default_tax_type' => $default_tax_type
+		]);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Controllers/index.html b/app/Controllers/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Controllers/index.html
+++ b/app/Controllers/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/bin/.placeholder b/app/Database/Migrations/.gitkeep
similarity index 100%
rename from bin/.placeholder
rename to app/Database/Migrations/.gitkeep
diff --git a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
index d0f3a231c..e2570db75 100644
--- a/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
+++ b/app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php
@@ -1,20 +1,23 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Upgrade_To_3_1_1 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Upgrade_To_3_1_1 extends Migration
 {
 	public function __construct()
 	{
 		parent::__construct();
 	}
 
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.0.2_to_3.1.1.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20170502221506_sales_tax_data.php b/app/Database/Migrations/20170502221506_sales_tax_data.php
index e25af45a4..5529dc3c9 100644
--- a/app/Database/Migrations/20170502221506_sales_tax_data.php
+++ b/app/Database/Migrations/20170502221506_sales_tax_data.php
@@ -1,8 +1,21 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Sales_Tax_Data extends CI_Migration
+namespace App\Database\Migrations;
+
+use app\Libraries\Tax_lib;
+use app\Models\Appconfig;
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\ResultInterface;
+
+/**
+ * 
+ * 
+ * @property tax_lib tax_lib
+ * @property appconfig appconfig
+ */
+class Migration_Sales_Tax_Data extends Migration
 {
-	const ROUND_UP = 5;
+	const ROUND_UP = 5;	//TODO: These need to be moved to constants.php
 	const ROUND_DOWN = 6;
 	const HALF_FIVE = 7;
 	const YES = '1';
@@ -12,35 +25,39 @@ class Migration_Sales_Tax_Data extends CI_Migration
 	public function __construct()
 	{
 		parent::__construct();
-		$this->load->library('tax_lib');
+		$this->tax_lib = new Tax_lib();
+		$this->appconfig = model('Appconfig');
 	}
 
-	public function up()
+	public function up(): void
 	{
 		$number_of_unmigrated = $this->get_count_of_unmigrated();
-		error_log('Migrating sales tax history. The number of sales that will be migrated is ' . $number_of_unmigrated);
+		error_log("Migrating sales tax history. The number of sales that will be migrated is $number_of_unmigrated");		//TODO: String interpolation
+		
 		if($number_of_unmigrated > 0)
 		{
-			$unmigrated_invoices = $this->get_unmigrated($number_of_unmigrated)->result_array();
-			foreach($unmigrated_invoices as $key=>$unmigrated_invoice)
+			$unmigrated_invoices = $this->get_unmigrated($number_of_unmigrated)->getResultArray();
+			
+			foreach($unmigrated_invoices as $key => $unmigrated_invoice)
 			{
 				$this->upgrade_tax_history_for_sale($unmigrated_invoice['sale_id']);
 			}
 		}
+		
 		error_log('Migrating sales tax history. The number of sales that will be migrated is finished.');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
 
-	private function upgrade_tax_history_for_sale($sale_id)
+	private function upgrade_tax_history_for_sale(int $sale_id): void
 	{
-		$CI =& get_instance();
-		$tax_decimals = $CI->Appconfig->get('tax_decimals', 2);
-		$tax_included = $CI->Appconfig->get('tax_included', Migration_Sales_Tax_Data::YES) == Migration_Sales_Tax_Data::YES;
+		$tax_decimals = $this->appconfig->get_value('tax_decimals', 2);
+		$tax_included = $this->appconfig->get_value('tax_included', Migration_Sales_Tax_Data::YES) == Migration_Sales_Tax_Data::YES;
 		$customer_sales_tax_support = FALSE;
-		if($tax_included)
+
+		if($tax_included)	//TODO: Convert to ternary notation.
 		{
 			$tax_type = Migration_Sales_Tax_Data::VAT_TAX;
 		}
@@ -48,149 +65,157 @@ class Migration_Sales_Tax_Data extends CI_Migration
 		{
 			$tax_type = Migration_Sales_Tax_Data::SALES_TAX;
 		}
-		$sales_taxes = array();
+
+		$sales_taxes = [];
 		$tax_group_sequence = 0;
-		$items = $this->get_sale_items_for_migration($sale_id)->result_array();
+		$items = $this->get_sale_items_for_migration($sale_id)->getResultArray();
+
 		foreach($items as $item)
 		{
 			// This computes tax for each line item and adds it to the tax type total
 			$tax_group = (float)$item['percent'] . '% ' . $item['name'];
 			$tax_basis = $this->get_item_total($item['quantity_purchased'], $item['item_unit_price'], $item['discount_percent'], TRUE);
-			$item_tax_amount = 0;
-			if($tax_included)
-			{
-				$item_tax_amount = $this->get_item_tax($item['quantity_purchased'], $item['item_unit_price'], $item['discount_percent'], $item['percent']);
-			}
-			else
-			{
-				$item_tax_amount = $this->get_sales_tax_for_amount($tax_basis, $item['percent'], PHP_ROUND_HALF_UP, $tax_decimals);
-			}
+
+			$item_tax_amount = $tax_included
+				? $this->get_item_tax($item['quantity_purchased'], $item['item_unit_price'], $item['discount_percent'], $item['percent'])
+				: $this->get_sales_tax_for_amount($tax_basis, $item['percent'], PHP_ROUND_HALF_UP, $tax_decimals);
+
 			$this->update_sales_items_taxes_amount($sale_id, $item['line'], $item['name'], $item['percent'], $tax_type, $item_tax_amount);
 			$this->update_sales_taxes($sales_taxes, $tax_type, $tax_group, $item['percent'], $tax_basis, $item_tax_amount, $tax_group_sequence, PHP_ROUND_HALF_UP, $sale_id, $item['name']);
-			$tax_group_sequence += 1;
+			$tax_group_sequence++;
 		}
-		// Not sure when this would ever kick in, but this is technically the correct logic.
-		if($customer_sales_tax_support)
+		//Not sure when this would ever kick in, but this is technically the correct logic.
+		if($customer_sales_tax_support)	//TODO: This will always evaluate to false
 		{
 			$this->apply_invoice_taxing($sales_taxes);
 		}
+
 		$this->round_sales_taxes($sales_taxes);
 		$this->save_sales_tax($sales_taxes);
 	}
 
-	private function get_unmigrated($block_count)
+	private function get_unmigrated(int $block_count): ResultInterface
 	{
-		$this->db->select('SIT.sale_id');
-		$this->db->select('ST.sale_id as sales_taxes_sale_id');
-		$this->db->from('sales_items_taxes as SIT');
-		$this->db->join('sales_taxes as ST','SIT.sale_id = ST.sale_id', 'left');
-		$this->db->where('ST.sale_id is null');
-		$this->db->group_by('SIT.sale_id');
-		$this->db->group_by('ST.sale_id');
-		$this->db->order_by('SIT.sale_id');
-		$this->db->limit($block_count);
-		return $this->db->get();
+		$builder = $this->db->table('sales_items_taxes as SIT');
+		$builder->select('SIT.sale_id');
+		$builder->select('ST.sale_id as sales_taxes_sale_id');
+		$builder->join('sales_taxes as ST','SIT.sale_id = ST.sale_id', 'left');
+		$builder->where('ST.sale_id', null);
+		$builder->groupBy('SIT.sale_id');
+		$builder->groupBy('ST.sale_id');
+		$builder->orderBy('SIT.sale_id');
+		$builder->limit($block_count);
+
+		return $builder->get();
 	}
 
-	private function get_sale_items_for_migration($sale_id)
+	private function get_sale_items_for_migration(int $sale_id): ResultInterface
 	{
-		$this->db->select('sales_items.sale_id as sale_id');
-		$this->db->select('sales_items.line as line');
-		$this->db->select('item_unit_price');
-		$this->db->select('discount_percent');
-		$this->db->select('quantity_purchased');
-		$this->db->select('percent');
-		$this->db->select('name');
-		$this->db->from('sales_items as sales_items');
-		$this->db->join('sales_items_taxes as sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id and sales_items.line = sales_items_taxes.line');
-		$this->db->where('sales_items.sale_id', $sale_id);
-		return $this->db->get();
+		$builder = $this->db->table('sales_items as sales_items');
+		$builder->select('sales_items.sale_id as sale_id');
+		$builder->select('sales_items.line as line');
+		$builder->select('item_unit_price');
+		$builder->select('discount_percent');
+		$builder->select('quantity_purchased');
+		$builder->select('percent');
+		$builder->select('name');
+		$builder->join('sales_items_taxes as sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id and sales_items.line = sales_items_taxes.line');
+		$builder->where('sales_items.sale_id', $sale_id);
+
+		return $builder->get();
 	}
 
-	private function get_count_of_unmigrated()
+	private function get_count_of_unmigrated(): int
 	{
 		$result = $this->db->query('SELECT COUNT(*) FROM(SELECT SIT.sale_id, ST.sale_id as sales_taxes_sale_id FROM '
-			. $this->db->dbprefix('sales_items_taxes')
+			. $this->db->prefixTable('sales_items_taxes')
 			. ' as SIT LEFT JOIN '
-			. $this->db->dbprefix('sales_taxes')
+			. $this->db->prefixTable('sales_taxes')
 			. ' as ST ON SIT.sale_id = ST.sale_id WHERE ST.sale_id is null GROUP BY SIT.sale_id, ST.sale_id'
-			. ' ORDER BY SIT.sale_id) as US')->result_array();
+			. ' ORDER BY SIT.sale_id) as US')->getResultArray();
 		return $result[0]['COUNT(*)'];
 	}
 
-	private function update_sales_items_taxes_amount($sale_id, $line, $name, $percent, $tax_type, $item_tax_amount)
+	private function update_sales_items_taxes_amount(int $sale_id, int $line, string $name, float $percent, int $tax_type, float $item_tax_amount): void
 	{
-		$this->db->where('sale_id', $sale_id);
-		$this->db->where('line', $line);
-		$this->db->where('name', $name);
-		$this->db->where('percent', $percent);
-		$this->db->update('sales_items_taxes', array('tax_type' => $tax_type, 'item_tax_amount' => $item_tax_amount));
+		$builder = $this->db->table('sales_items_taxes');
+		$builder->where('sale_id', $sale_id);
+		$builder->where('line', $line);
+		$builder->where('name', $name);
+		$builder->where('percent', $percent);
+		$builder->update(['tax_type' => $tax_type, 'item_tax_amount' => $item_tax_amount]);
 	}
 
-	private function save_sales_tax(&$sales_taxes)
+	private function save_sales_tax(array &$sales_taxes): void
 	{
-		foreach($sales_taxes as $line=>$sales_tax)
+		$builder = $this->db->Table('sales_taxes');
+
+		foreach($sales_taxes as $line => $sales_tax)
 		{
-			$this->db->insert('sales_taxes', $sales_tax);
+			$builder->insert($sales_tax);
 		}
 	}
 
-	public function get_item_total($quantity, $price, $discount_percentage, $include_discount = FALSE)
+	public function get_item_total(string $quantity, string $price, string $discount_percentage, bool $include_discount = FALSE): string
 	{
 		$total = bcmul($quantity, $price);
+
 		if($include_discount)
 		{
 			$discount_amount = $this->get_item_discount($quantity, $price, $discount_percentage);
 			return bcsub($total, $discount_amount);
 		}
+
 		return $total;
 	}
 
-	public function get_item_discount($quantity, $price, $discount)
+	public function get_item_discount(string $quantity, string $price, string $discount): float
 	{
 		$total = bcmul($quantity, $price);
 		$discount_fraction = bcdiv($discount, 100);
 		$discount = bcmul($total, $discount_fraction);
 
-		return round($discount, totals_decimals(), PHP_ROUND_HALF_UP);
+		return round($discount, totals_decimals(), PHP_ROUND_HALF_UP);	//TODO: I don't think this is currency safe.  Round will cast it's first parameter to a float. It also returns a float.
 	}
 
-	public function get_item_tax($quantity, $price, $discount_percentage, $tax_percentage)
+	public function get_item_tax(string $quantity, string $price, string $discount_percentage, string $tax_percentage): string
 	{
-		$CI =& get_instance();
-		$tax_included = $CI->Appconfig->get('tax_included', Migration_Sales_Tax_Data::YES) == Migration_Sales_Tax_Data::YES;
+		$tax_included = $this->appconfig->get_value('tax_included', Migration_Sales_Tax_Data::YES) == Migration_Sales_Tax_Data::YES;
 
 		$price = $this->get_item_total($quantity, $price, $discount_percentage, TRUE);
 
 		if($tax_included)
 		{
-			$tax_fraction = bcadd(100, $tax_percentage);
-			$tax_fraction = bcdiv($tax_fraction, 100);
+			$tax_fraction = bcadd('100', $tax_percentage);
+			$tax_fraction = bcdiv($tax_fraction, '100');
 			$price_tax_excl = bcdiv($price, $tax_fraction);
+
 			return bcsub($price, $price_tax_excl);
 		}
-		$tax_fraction = bcdiv($tax_percentage, 100);
+		$tax_fraction = bcdiv($tax_percentage, '100');
+
 		return bcmul($price, $tax_fraction);
 	}
 
-	public function get_sales_tax_for_amount($tax_basis, $tax_percentage, $rounding_mode, $decimals)
+	public function get_sales_tax_for_amount(string $tax_basis, string $tax_percentage, int $rounding_mode, int $decimals): float
 	{
-		$tax_fraction = bcdiv($tax_percentage, 100);
+		$tax_fraction = bcdiv($tax_percentage, '100');
 		$tax_amount = bcmul($tax_basis, $tax_fraction);
+
 		return $this->round_number($rounding_mode, $tax_amount, $decimals);
 	}
 
-	public function round_number($rounding_mode, $amount, $decimals)
+	public function round_number(int $rounding_mode, string $amount, int $decimals): float
 	{
 		if($rounding_mode == Migration_Sales_Tax_Data::ROUND_UP)
 		{
 			$fig = pow(10,$decimals);
-			$rounded_total = (ceil($fig*$amount) + ceil($fig*$amount - ceil($fig*$amount)))/$fig;
+			$rounded_total = (ceil($fig * $amount) + ceil($fig * $amount - ceil($fig * $amount)))/$fig;
 		}
 		elseif($rounding_mode == Migration_Sales_Tax_Data::ROUND_DOWN)
 		{
 			$fig = pow(10,$decimals);
-			$rounded_total = (floor($fig*$amount) + floor($fig*$amount - floor($fig*$amount)))/$fig;
+			$rounded_total = (floor($fig * $amount) + floor($fig * $amount - floor($fig * $amount)))/$fig;
 		}
 		elseif($rounding_mode == Migration_Sales_Tax_Data::HALF_FIVE)
 		{
@@ -201,83 +226,91 @@ class Migration_Sales_Tax_Data extends CI_Migration
 			$rounded_total = round($amount, $decimals, $rounding_mode);
 		}
 
-		return $rounded_total;
+		return $rounded_total;	//TODO: I don't think this is currency safe.  I think we need to be using bcmath() functions like we are in the rest of the code.
 	}
 
-	public function update_sales_taxes(&$sales_taxes, $tax_type, $tax_group, $tax_rate, $tax_basis, $item_tax_amount, $tax_group_sequence, $rounding_code, $sale_id, $name='', $tax_code='')
+	public function update_sales_taxes(array &$sales_taxes, string $tax_type, string $tax_group, float $tax_rate, string $tax_basis, string $item_tax_amount, int $tax_group_sequence, int $rounding_code, int $sale_id, string $name = '', string $tax_code = ''): void
 	{
 		$tax_group_index = $this->clean('X'.$tax_group);
 		if(!array_key_exists($tax_group_index, $sales_taxes))
 		{
-			$insertkey = $tax_group_index;
-			$sales_tax = array($insertkey => array(
-				'sale_id' => $sale_id,
-				'tax_type' => $tax_type,
-				'tax_group' => $tax_group,
-				'sale_tax_basis' => $tax_basis,
-				'sale_tax_amount' => $item_tax_amount,
-				'print_sequence' => $tax_group_sequence,
-				'name' => $name,
-				'tax_rate' => $tax_rate,
-				'sales_tax_code' => $tax_code,
-				'rounding_code' => $rounding_code
-			));
+			$insertkey = $tax_group_index;	//TODO: $insertkey does not follow naming conventions.
+			$sales_tax = [
+				$insertkey => [
+					'sale_id' => $sale_id,
+					'tax_type' => $tax_type,
+					'tax_group' => $tax_group,
+					'sale_tax_basis' => $tax_basis,
+					'sale_tax_amount' => $item_tax_amount,
+					'print_sequence' => $tax_group_sequence,
+					'name' => $name,
+					'tax_rate' => $tax_rate,
+					'sales_tax_code' => $tax_code,
+					'rounding_code' => $rounding_code
+				]
+			];
 			//add to existing array
 			$sales_taxes += $sales_tax;
 		}
 		else
 		{
 			// Important ... the sales amounts are accumulated for the group at the maximum configurable scale value of 4
-			// but the scale will in reality be the scale specified by the tax_decimal configuration value  used for sales_items_taxes
+			// but the scale will in reality be the scale specified by the tax_decimal configuration value used for sales_items_taxes
 			$sales_taxes[$tax_group_index]['sale_tax_basis'] = bcadd($sales_taxes[$tax_group_index]['sale_tax_basis'], $tax_basis, 4);
 			$sales_taxes[$tax_group_index]['sale_tax_amount'] = bcadd($sales_taxes[$tax_group_index]['sale_tax_amount'], $item_tax_amount, 4);
 		}
 	}
 
-	public function clean($string)
+	public function clean(string $string): string	//TODO: $string is not a good name for this variable
 	{
 		$string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens.
 
 		return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars.
 	}
 
-	public function apply_invoice_taxing(&$sales_taxes)
+	public function apply_invoice_taxing(array &$sales_taxes): void
 	{
-		if(!empty($sales_taxes))
+		if(!empty($sales_taxes))	//TODO: Duplicated code
 		{
-			$sort = array();
-			foreach($sales_taxes as $k => $v)
+			$sort = [];
+
+			foreach($sales_taxes as $k => $v)	//TODO: Refactor $k and $v to proper variable names
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
 			}
+
 			array_multisort($sort['print_sequence'], SORT_ASC, $sales_taxes);
 		}
+
 		$decimals = totals_decimals();
+
 		foreach($sales_taxes as $row_number => $sales_tax)
 		{
 			$sales_taxes[$row_number]['sale_tax_amount'] = $this->get_sales_tax_for_amount($sales_tax['sale_tax_basis'], $sales_tax['tax_rate'], $sales_tax['rounding_code'], $decimals);
 		}
 	}
 
-	public function round_sales_taxes(&$sales_taxes)
+	public function round_sales_taxes(array &$sales_taxes): void
 	{
 		if(!empty($sales_taxes))
 		{
-			$sort = array();
+			$sort = [];
 			foreach($sales_taxes as $k=>$v)
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
 			}
 			array_multisort($sort['print_sequence'], SORT_ASC, $sales_taxes);
 		}
+
 		$decimals = totals_decimals();
+
 		foreach($sales_taxes as $row_number => $sales_tax)
 		{
 			$sale_tax_amount = $sales_tax['sale_tax_amount'];
 			$rounding_code = $sales_tax['rounding_code'];
 			$rounded_sale_tax_amount = $sale_tax_amount;
 
-			if ($rounding_code == PHP_ROUND_HALF_UP
+			if ($rounding_code == PHP_ROUND_HALF_UP	//TODO: This block of if/elseif statements should be replaced by a switch
 				|| $rounding_code == PHP_ROUND_HALF_DOWN
 				|| $rounding_code == PHP_ROUND_HALF_EVEN
 				|| $rounding_code == PHP_ROUND_HALF_ODD)
@@ -298,8 +331,8 @@ class Migration_Sales_Tax_Data extends CI_Migration
 			{
 				$rounded_sale_tax_amount = round($sale_tax_amount / 5) * 5;
 			}
+
 			$sales_taxes[$row_number]['sale_tax_amount'] = $rounded_sale_tax_amount;
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
index a30185e91..dfa02430d 100644
--- a/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
+++ b/app/Database/Migrations/20180225100000_upgrade_to_3_2_0.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Upgrade_To_3_2_0 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Upgrade_To_3_2_0 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.1.1_to_3.2.0.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
index 1fc8308b1..e585c1cc0 100644
--- a/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
+++ b/app/Database/Migrations/20180501100000_upgrade_to_3_2_1.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Upgrade_To_3_2_1 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Upgrade_To_3_2_1 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.2.0_to_3.2.1.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20181015100000_attributes.php b/app/Database/Migrations/20181015100000_attributes.php
index eced57a9c..4a55521ed 100644
--- a/app/Database/Migrations/20181015100000_attributes.php
+++ b/app/Database/Migrations/20181015100000_attributes.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Attributes extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Attributes extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_attributes.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
index fda74aa77..6d2d31afe 100644
--- a/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
+++ b/app/Database/Migrations/20190111270000_upgrade_to_3_3_0.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_Upgrade_To_3_3_0 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_Upgrade_To_3_3_0 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.2.1_to_3.3.0.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190129212600_indiagst.php b/app/Database/Migrations/20190129212600_indiagst.php
index dbded8191..af08b7387 100644
--- a/app/Database/Migrations/20190129212600_indiagst.php
+++ b/app/Database/Migrations/20190129212600_indiagst.php
@@ -1,15 +1,14 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_IndiaGST extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_IndiaGST extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
-	}
-
-	public function up()
-	{
-		if(!$this->db->field_exists('sales_tax_code', 'customers'))
+		if(!$this->db->fieldExists('sales_tax_code', 'customers'))
 		{
 			return;
 		}
@@ -20,12 +19,12 @@ class Migration_IndiaGST extends CI_Migration
 		error_log('Migrating tax configuration');
 
 		$count_of_tax_codes = $this->get_count_of_tax_code_entries();
+		
 		if($count_of_tax_codes > 0)
 		{
 			$this->migrate_tax_code_data();
 		}
 
-
 		$this->migrate_customer_tax_codes();
 
 		$count_of_rate_entries = $this->get_count_of_rate_entries();
@@ -47,32 +46,32 @@ class Migration_IndiaGST extends CI_Migration
 		error_log('Migrating tax configuration completed');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
 
-	private function get_count_of_tax_code_entries()
+	private function get_count_of_tax_code_entries(): int
 	{
-		$this->db->select('COUNT(*) as count');
-		$this->db->from('tax_codes_backup');
-
-		return $this->db->get()->row()->count;
+		$builder = $this->db->table('tax_codes_backup');
+		$builder->select('COUNT(*) as count');
+		
+		return $builder->get()->getRow()->count;
 	}
 
-	private function get_count_of_sales_taxes_entries()
+	private function get_count_of_sales_taxes_entries(): int
 	{
-		$this->db->select('COUNT(*) as count');
-		$this->db->from('sales_taxes_backup');
-
-		return $this->db->get()->row()->count;
+		$builder = $this->db->table('sales_taxes_backup');
+		$builder->select('COUNT(*) as count');
+		
+		return $builder->get()->getRow()->count;
 	}
 
-	private function get_count_of_rate_entries()
+	private function get_count_of_rate_entries(): int
 	{
-		$this->db->select('COUNT(*) as count');
-		$this->db->from('tax_code_rates_backup');
-
-		return $this->db->get()->row()->count;
+		$builder = $this->db->table('tax_code_rates_backup');
+		$builder->select('COUNT(*) as count');
+		
+		return $builder->get()->getRow()->count;
 	}
 
 	/*
@@ -80,11 +79,10 @@ class Migration_IndiaGST extends CI_Migration
 	 * assigning a tax_code_id id to the entry  This only needs to be done if there are
 	 * tax codes in the table.
 	 */
-	private function migrate_tax_code_data()
+	private function migrate_tax_code_data(): void
 	{
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('tax_codes') . ' (tax_code, tax_code_name, city, state)
-			SELECT tax_code, tax_code_name, city, state FROM ' . $this->db->dbprefix('tax_codes_backup'));
-
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('tax_codes') . ' (tax_code, tax_code_name, city, state)
+			SELECT tax_code, tax_code_name, city, state FROM ' . $this->db->prefixTable('tax_codes_backup'));
 	}
 
 	/* 
@@ -93,12 +91,12 @@ class Migration_IndiaGST extends CI_Migration
 	 * After it is complete then it will drop the old customer tax code.
 	 * This MUST run so that the old tax code is dropped
 	 */	
-	private function migrate_customer_tax_codes()
+	private function migrate_customer_tax_codes(): void
 	{
-		$this->db->query('UPDATE ' . $this->db->dbprefix('customers') . ' AS  fa SET fa.sales_tax_code_id = (
-			SELECT tax_code_id FROM ' . $this->db->dbprefix('tax_codes') . ' AS fb where fa.sales_tax_code = fb.tax_code)');
+		$this->db->query('UPDATE ' . $this->db->prefixTable('customers') . ' AS  fa SET fa.sales_tax_code_id = (
+			SELECT tax_code_id FROM ' . $this->db->prefixTable('tax_codes') . ' AS fb where fa.sales_tax_code = fb.tax_code)');
 
-		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('customers') . ' DROP COLUMN sales_tax_code');
+		$this->db->query('ALTER TABLE ' . $this->db->prefixTable('customers') . ' DROP COLUMN sales_tax_code');
 	}
 
 	/**
@@ -111,43 +109,40 @@ class Migration_IndiaGST extends CI_Migration
 	 * to be created and defined manually AFTER the upgrade.
 	 * CONVERTING OLD TAX DATA TO BE SPLIT OUT BY JURISDICTION IS BEYOND THE SCOPE OF THIS EFFORT
 	 */
-	private function migrate_sales_taxes_data()
+	private function migrate_sales_taxes_data(): void
 	{
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('sales_taxes')
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('sales_taxes')
 			. ' (sale_id, jurisdiction_id, tax_category_id, tax_type, tax_group, sale_tax_basis, sale_tax_amount, print_sequence, '
 			. '`name`, tax_rate, sales_tax_code_id, rounding_code) '
 			. 'select sale_id, rate_jurisdiction_id, rate_tax_category_id, tax_type, tax_group, sale_tax_basis, sale_tax_amount, '
 			. 'print_sequence, `name`, A.tax_rate, tax_code_id, rounding_code '
-			. 'from ' . $this->db->dbprefix('sales_taxes_backup') . ' AS A '
-			. 'left outer join ' . $this->db->dbprefix('tax_codes') . ' AS B on sales_tax_code = tax_code '
-			. 'left outer join ' . $this->db->dbprefix('tax_rates') . ' AS C on tax_code_id = rate_tax_code_id and A.tax_rate = C.tax_rate '
+			. 'from ' . $this->db->prefixTable('sales_taxes_backup') . ' AS A '
+			. 'left outer join ' . $this->db->prefixTable('tax_codes') . ' AS B on sales_tax_code = tax_code '
+			. 'left outer join ' . $this->db->prefixTable('tax_rates') . ' AS C on tax_code_id = rate_tax_code_id and A.tax_rate = C.tax_rate '
 			. 'order by sale_id');
 	}
 
-	private function migrate_tax_rates()
+	private function migrate_tax_rates(): void
 	{
 		// create a dummy jurisdiction record and retrieve the jurisdiction rate id
 
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('tax_jurisdictions') . ' (jurisdiction_name, tax_group, tax_type, reporting_authority, '
-		. "tax_group_sequence, cascade_sequence, deleted)  VALUES ('Jurisdiction1','TaxGroup1','1','Authority1',1,0,'0')");
-
-		$jurisdiction_id = $this->db->query('SELECT jurisdiction_id FROM ' . $this->db->dbprefix('tax_jurisdictions') . " WHERE jurisdiction_name = 'Jurisdiction1'")->row()->jurisdiction_id;
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('tax_jurisdictions') . ' (jurisdiction_name, tax_group, tax_type, reporting_authority, '
+		. "tax_group_sequence, cascade_sequence, deleted)  VALUES ('Jurisdiction1', 'TaxGroup1', '1', 'Authority1', 1, 0, '0')");
 
+		$jurisdiction_id = $this->db->query('SELECT jurisdiction_id FROM ' . $this->db->prefixTable('tax_jurisdictions') . " WHERE jurisdiction_name = 'Jurisdiction1'")->getRow()->jurisdiction_id;
 
 		// Insert old tax_code rates data into the new tax rates table
-
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('tax_rates')
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('tax_rates')
 			. ' (rate_tax_category_id, rate_jurisdiction_id, rate_tax_code_id, tax_rate, tax_rounding_code) '
 			. 'SELECT rate_tax_category_id, ' . $jurisdiction_id . ', tax_code_id, tax_rate, rounding_code FROM '
-			. $this->db->dbprefix('tax_code_rates_backup') . ' JOIN ' . $this->db->dbprefix('tax_codes')
+			. $this->db->prefixTable('tax_code_rates_backup') . ' JOIN ' . $this->db->prefixTable('tax_codes')
 			. ' ON tax_code = rate_tax_code');
 	}
 
-	private function drop_backups()
+	private function drop_backups(): void
 	{
-		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->dbprefix('tax_codes_backup'));
-		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->dbprefix('sales_taxes_backup'));
-		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->dbprefix('tax_code_rates_backup'));
+		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->prefixTable('tax_codes_backup'));
+		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->prefixTable('sales_taxes_backup'));
+		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->prefixTable('tax_code_rates_backup'));
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190213210000_indiagst1.php b/app/Database/Migrations/20190213210000_indiagst1.php
index e14dc8c6e..3c8f0f927 100644
--- a/app/Database/Migrations/20190213210000_indiagst1.php
+++ b/app/Database/Migrations/20190213210000_indiagst1.php
@@ -1,13 +1,12 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_IndiaGST1 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_IndiaGST1 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_indiagst1.sql');
 
@@ -16,9 +15,8 @@ class Migration_IndiaGST1 extends CI_Migration
 		error_log('Definition of Supplier.Tax Id corrected');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190220210000_indiagst2.php b/app/Database/Migrations/20190220210000_indiagst2.php
index a99d71ef3..7ed0da1b9 100644
--- a/app/Database/Migrations/20190220210000_indiagst2.php
+++ b/app/Database/Migrations/20190220210000_indiagst2.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_IndiaGST2 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_IndiaGST2 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_indiagst2.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190301124900_decimal_attribute_type.php b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
index bb882f814..ee6a0dfac 100644
--- a/app/Database/Migrations/20190301124900_decimal_attribute_type.php
+++ b/app/Database/Migrations/20190301124900_decimal_attribute_type.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_decimal_attribute_type extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_decimal_attribute_type extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_decimal_attribute_type.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190317102600_add_iso_4217.php b/app/Database/Migrations/20190317102600_add_iso_4217.php
index 0a851f55b..6a9252dfb 100644
--- a/app/Database/Migrations/20190317102600_add_iso_4217.php
+++ b/app/Database/Migrations/20190317102600_add_iso_4217.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_add_iso_4217 extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_add_iso_4217 extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_add_iso_4217.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190427100000_paymenttracking.php b/app/Database/Migrations/20190427100000_paymenttracking.php
index 430d4891b..5a1977f18 100644
--- a/app/Database/Migrations/20190427100000_paymenttracking.php
+++ b/app/Database/Migrations/20190427100000_paymenttracking.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_PaymentTracking extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_PaymentTracking extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_paymenttracking.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190502100000_refundtracking.php b/app/Database/Migrations/20190502100000_refundtracking.php
index 86f1a7af4..8117b871d 100644
--- a/app/Database/Migrations/20190502100000_refundtracking.php
+++ b/app/Database/Migrations/20190502100000_refundtracking.php
@@ -1,62 +1,60 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_RefundTracking extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_RefundTracking extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_refundtracking.sql');
 
 		// Add missing cash_refund amounts to payments table
-
 		$decimals = totals_decimals();
 
 		$trans_amount = 'ROUND(SUM(CASE WHEN sales_items.discount_type = ' . PERCENT
 			. ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) '
 			. 'ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END), ' . $decimals . ') AS trans_amount';
 
-		$cash_payment = $this->lang->line('sales_cash');
+		$cash_payment = lang('Sales.cash');
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('migrate_taxes') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('migrate_taxes') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT sales.sale_id, SUM(sales_taxes.sale_tax_amount) AS total_taxes
-				FROM ' . $this->db->dbprefix('sales') . ' AS sales
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_taxes') . ' AS sales_taxes
+				FROM ' . $this->db->prefixTable('sales') . ' AS sales
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_taxes') . ' AS sales_taxes
 					ON sales.sale_id = sales_taxes.sale_id
 				WHERE sales.sale_status = \'' . COMPLETED . '\' AND sales_taxes.tax_type = \'1\'
 				GROUP BY sale_id
 			)'
 		);
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('migrate_sales') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('migrate_sales') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT sales.sale_id, '. $trans_amount . ', sales.employee_id, sales.sale_time'
-				. ' FROM ' . $this->db->dbprefix('sales') . ' AS sales '
-				. 'LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items '
+				. ' FROM ' . $this->db->prefixTable('sales') . ' AS sales '
+				. 'LEFT OUTER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items '
 				. 'ON sales.sale_id = sales_items.sale_id '
-				. 'LEFT OUTER JOIN ' . $this->db->dbprefix('migrate_taxes') . ' AS sumpay_taxes '
+				. 'LEFT OUTER JOIN ' . $this->db->prefixTable('migrate_taxes') . ' AS sumpay_taxes '
 				. 'ON sales.sale_id = sumpay_taxes.sale_id '
 				. 'WHERE sales.sale_status = \'' . COMPLETED . '\' GROUP BY sale_id
 			)'
 		);
 
-		$this->db->query('UPDATE ' . $this->db->dbprefix('migrate_sales') . ' AS sumpay_items '
-			. 'SET trans_amount = trans_amount + IFNULL((SELECT total_taxes FROM ' . $this->db->dbprefix('migrate_taxes')
+		$this->db->query('UPDATE ' . $this->db->prefixTable('migrate_sales') . ' AS sumpay_items '
+			. 'SET trans_amount = trans_amount + IFNULL((SELECT total_taxes FROM ' . $this->db->prefixTable('migrate_taxes')
 			. ' AS sumpay_taxes WHERE sumpay_items.sale_id = sumpay_taxes.sale_id),0)');
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('migrate_payments') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('migrate_payments') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT sales.sale_id, COUNT(sales.sale_id) AS number_payments, 
 					SUM(sales_payments.payment_amount - sales_payments.cash_refund) AS total_payments
-				FROM ' . $this->db->dbprefix('sales') . ' AS sales
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_payments') . ' AS sales_payments
+				FROM ' . $this->db->prefixTable('sales') . ' AS sales
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_payments') . ' AS sales_payments
 					ON sales.sale_id = sales_payments.sale_id
 				WHERE sales.sale_status = \'' . COMPLETED . '\' GROUP BY sale_id
 			)'
@@ -65,46 +63,44 @@ class Migration_RefundTracking extends CI_Migration
 		// You may be asking yourself why the following is not creating a temporary table.
 		// It should be, it originallly was, but there is a bug in MySQL where temporary tables where some SQL statements fail.
 		//  The update statement that follows this CREATE TABLE is one of those statements.
-
-		$this->db->query('CREATE TABLE IF NOT EXISTS ' . $this->db->dbprefix('migrate_refund') .
+		$this->db->query('CREATE TABLE IF NOT EXISTS ' . $this->db->prefixTable('migrate_refund') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT a.sale_id, total_payments - trans_amount AS refund_amount
-				FROM ' . $this->db->dbprefix('migrate_sales') . ' AS a
-				JOIN ' . $this->db->dbprefix('migrate_payments') . ' AS b ON a.sale_id = b.sale_id
+				FROM ' . $this->db->prefixTable('migrate_sales') . ' AS a
+				JOIN ' . $this->db->prefixTable('migrate_payments') . ' AS b ON a.sale_id = b.sale_id
 				WHERE total_payments > trans_amount AND number_payments = 1
 			)'
 		);
 
 		// Update existing cash transactions with refund amount
-		$this->db->query('UPDATE ' . $this->db->dbprefix('sales_payments') . ' AS a
+		$this->db->query('UPDATE ' . $this->db->prefixTable('sales_payments') . ' AS a
 			SET a.cash_refund =
 			(SELECT b.refund_amount 
-				FROM ' . $this->db->dbprefix('migrate_refund') . ' AS b 
+				FROM ' . $this->db->prefixTable('migrate_refund') . ' AS b 
 				WHERE a.sale_id = b.sale_id AND a.payment_type = \'' . $cash_payment . '\')
 			WHERE EXISTS
 				(SELECT b.refund_amount 
-					FROM ' . $this->db->dbprefix('migrate_refund') . ' AS b 
+					FROM ' . $this->db->prefixTable('migrate_refund') . ' AS b 
 					WHERE a.sale_id = b.sale_id AND a.payment_type = \'' . $cash_payment . ' \')'
 		);
 
 		// Insert new cash refund transactions for non-cash payments
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('sales_payments') .
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('sales_payments') .
 		   ' (sale_id, payment_type, employee_id, payment_time, payment_amount, cash_refund) 
 			SELECT r.sale_id, \'' . $cash_payment . '\', s.employee_id, sale_time, 0, r.refund_amount 
-			FROM ' . $this->db->dbprefix('migrate_refund') . ' AS r
-			JOIN ' . $this->db->dbprefix('sales_payments') . ' AS p ON r.sale_id = p.sale_id
-			JOIN ' . $this->db->dbprefix('migrate_sales') . ' AS s ON r.sale_id = s.sale_id
+			FROM ' . $this->db->prefixTable('migrate_refund') . ' AS r
+			JOIN ' . $this->db->prefixTable('sales_payments') . ' AS p ON r.sale_id = p.sale_id
+			JOIN ' . $this->db->prefixTable('migrate_sales') . ' AS s ON r.sale_id = s.sale_id
 			WHERE p.payment_type != \'' . $cash_payment . '\''
 		);
 
 		// Post migration cleanup
-		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->dbprefix('migrate_refund'));
+		$this->db->query('DROP TABLE IF EXISTS ' . $this->db->prefixTable('migrate_refund'));
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190612100000_dbfix.php b/app/Database/Migrations/20190612100000_dbfix.php
index 42dabafe5..811e644a0 100644
--- a/app/Database/Migrations/20190612100000_dbfix.php
+++ b/app/Database/Migrations/20190612100000_dbfix.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_DBFix extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_DBFix extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_dbfix.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
index 03743b367..6b94abda0 100644
--- a/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
+++ b/app/Database/Migrations/20190615100000_fix_attribute_datetime.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_fix_attribute_datetime extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_fix_attribute_datetime extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20190712150200_fix_empty_reports.php b/app/Database/Migrations/20190712150200_fix_empty_reports.php
index ed067329c..8a3fdf243 100644
--- a/app/Database/Migrations/20190712150200_fix_empty_reports.php
+++ b/app/Database/Migrations/20190712150200_fix_empty_reports.php
@@ -1,30 +1,29 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_fix_empty_reports extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_fix_empty_reports extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
-	}
-
-	public function up()
-	{
-		$this->db->select('location_name');
-		$this->db->from('stock_locations');
-		$this->db->where('location_id', 1);
-		$this->db->limit(1);
-		$location_name = $this->db->get()->result_array()[0]['location_name'];
+		$builder = $this->db->table('stock_locations');
+		$builder->select('location_name');
+		$builder->where('location_id', 1);
+		$builder->limit(1);
+		$location_name = $builder->get()->getResultArray()[0]['location_name'];
 
 		$location_name = str_replace(' ', '_', $location_name);
-		$this->db->set('location_id',1);
-		$this->db->where('permission_id','receivings_' . $location_name);
-		$this->db->or_where('permission_id', 'sales_' . $location_name);
-		$this->db->update('permissions');
+		$builder = $this->db->table('permissions');
+		$builder->set('location_id', 1);
+		$builder->where('permission_id','receivings_' . $location_name);
+		$builder->orWhere('permission_id', 'sales_' . $location_name);
+		$builder->update();
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20191008100000_receipttaxindicator.php b/app/Database/Migrations/20191008100000_receipttaxindicator.php
index b5fafeccf..388bd0c2d 100644
--- a/app/Database/Migrations/20191008100000_receipttaxindicator.php
+++ b/app/Database/Migrations/20191008100000_receipttaxindicator.php
@@ -1,21 +1,19 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_receipttaxindicator extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_receipttaxindicator extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
-	}
-
-	public function up()
-	{
-		$this->db->query('INSERT INTO ' . $this->db->dbprefix('app_config') . ' (`key`, `value`)
+		$this->db->query('INSERT INTO ' . $this->db->prefixTable('app_config') . ' (`key`, `value`)
 			VALUES (\'receipt_show_tax_ind\', \'0\')');
 	}
 
-	public function down()
+	public function down(): void
 	{
-		$this->db->query('DELETE FROM ' . $this->db->dbprefix('app_config') . ' WHERE key = \'receipt_show_tax_ind\'');
+		$this->db->query('DELETE FROM ' . $this->db->prefixTable('app_config') . ' WHERE key = \'receipt_show_tax_ind\'');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20191231100000_paymentdatefix.php b/app/Database/Migrations/20191231100000_paymentdatefix.php
index a49aa3a71..2c66acc6d 100644
--- a/app/Database/Migrations/20191231100000_paymentdatefix.php
+++ b/app/Database/Migrations/20191231100000_paymentdatefix.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_PaymentDateFix extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_PaymentDateFix extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.2_paymentdatefix.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20200125100000_saleschangeprice.php b/app/Database/Migrations/20200125100000_saleschangeprice.php
index f635bce39..6e11fe69a 100644
--- a/app/Database/Migrations/20200125100000_saleschangeprice.php
+++ b/app/Database/Migrations/20200125100000_saleschangeprice.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_SalesChangePrice extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_SalesChangePrice extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		execute_script(APPPATH . 'migrations/sqlscripts/3.3.2_saleschangeprice.sql');
 	}
 
-	public function down()
+	public function down(): void
 	{
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20200202000000_taxamount.php b/app/Database/Migrations/20200202000000_taxamount.php
index 30fffa3bc..fd5df0778 100644
--- a/app/Database/Migrations/20200202000000_taxamount.php
+++ b/app/Database/Migrations/20200202000000_taxamount.php
@@ -1,56 +1,76 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_TaxAmount extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use app\Libraries\Tax_lib;
+use app\Models\Appconfig;
+use CodeIgniter\Database\ResultInterface;
+
+/**
+ * 
+ *
+ * @property appconfig appconfig
+ * @property tax_lib tax_lib
+ */
+class Migration_TaxAmount extends Migration
 {
 	const ROUND_UP = 5;
 	const ROUND_DOWN = 6;
 	const HALF_FIVE = 7;
 	const YES = '1';
 	const VAT_TAX = '0';
-	const SALES_TAX = '1';
+	const SALES_TAX = '1';	//TODO: It appears that this constant is never used
 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->load->library('tax_lib');
+
+		$this->appconfig = model('Appconfig');
+		$this->tax_lib = new Tax_lib();
 	}
 
-	public function up()
+	public function up(): void
 	{
-		$CI =& get_instance();
-		$tax_included = $CI->Appconfig->get('tax_included', Migration_TaxAmount::YES) == Migration_TaxAmount::YES;
+		$tax_included = ($this->appconfig->get_value('tax_included', Migration_TaxAmount::YES) == Migration_TaxAmount::YES);
 
 		if($tax_included)
 		{
-			$tax_decimals = $CI->Appconfig->get('tax_decimals', 2);
+			$tax_decimals = $this->appconfig->get_value('tax_decimals', 2);
 			$number_of_unmigrated = $this->get_count_of_unmigrated();
+
 			error_log('Migrating sales tax fixing. The number of sales that will be migrated is ' . $number_of_unmigrated);
+
 			if($number_of_unmigrated > 0)
 			{
-				$unmigrated_invoices = $this->get_unmigrated($number_of_unmigrated)->result_array();
-				$this->db->query('RENAME TABLE ' . $this->db->dbprefix('sales_taxes') . ' TO ' . $this->db->dbprefix('sales_taxes_backup'));
-				$this->db->query('CREATE TABLE ' . $this->db->dbprefix('sales_taxes') . ' LIKE ' . $this->db->dbprefix('sales_taxes_backup'));
-				foreach($unmigrated_invoices as $key=>$unmigrated_invoice)
+				$unmigrated_invoices = $this->get_unmigrated($number_of_unmigrated)->getResultArray();
+				$this->db->query('RENAME TABLE ' . $this->db->prefixTable('sales_taxes') . ' TO ' . $this->db->prefixTable('sales_taxes_backup'));
+				$this->db->query('CREATE TABLE ' . $this->db->prefixTable('sales_taxes') . ' LIKE ' . $this->db->prefixTable('sales_taxes_backup'));
+
+				foreach($unmigrated_invoices as $key => $unmigrated_invoice)
 				{
-					$this->upgrade_tax_history_for_sale($unmigrated_invoice['sale_id'], $tax_decimals, $tax_included);
+					$this->upgrade_tax_history_for_sale($unmigrated_invoice['sale_id'], $tax_decimals, TRUE);
 				}
-				$this->db->query('DROP TABLE ' . $this->db->dbprefix('sales_taxes_backup'));
+				$this->db->query('DROP TABLE ' . $this->db->prefixTable('sales_taxes_backup'));
 			}
+
 			error_log('Migrating sales tax fixing. The number of sales that will be migrated is finished.');
 		}
 	}
 
-	public function down()
+	public function down(): void
 	{
+
 	}
 
-	private function upgrade_tax_history_for_sale($sale_id, $tax_decimals, $tax_included)
+	private function upgrade_tax_history_for_sale(int $sale_id, string $tax_decimals, bool $tax_included): void	//TODO: $tax_included is passed as a parameter but never used in the function body.
 	{
 		$customer_sales_tax_support = FALSE;
 		$tax_type = Migration_TaxAmount::VAT_TAX;
-		$sales_taxes = array();
+		$sales_taxes = [];
 		$tax_group_sequence = 0;
-		$items = $this->get_sale_items_for_migration($sale_id)->result_array();
+		$items = $this->get_sale_items_for_migration($sale_id)->getResultArray();
+
 		foreach($items as $item)
 		{
 			// This computes tax for each line item and adds it to the tax type total
@@ -61,72 +81,79 @@ class Migration_TaxAmount extends CI_Migration
 			$this->update_sales_taxes($sales_taxes, $tax_type, $tax_group, $item['percent'], $tax_basis, $item_tax_amount, $tax_group_sequence, PHP_ROUND_HALF_UP, $sale_id, $item['name']);
 			$tax_group_sequence += 1;
 		}
-		// Not sure when this would ever kick in, but this is technically the correct logic.
-		if($customer_sales_tax_support)
+
+		if($customer_sales_tax_support)	//TODO: This will always evaluate to false.
 		{
 			$this->apply_invoice_taxing($sales_taxes);
 		}
+
 		$this->round_sales_taxes($sales_taxes);
 		$this->save_sales_tax($sales_taxes);
 	}
 
-	private function get_unmigrated($block_count)
+	private function get_unmigrated(int $block_count): ResultInterface
 	{
-		$this->db->select('SIT.sale_id');
-		$this->db->select('ST.sale_id as sales_taxes_sale_id');
-		$this->db->from('sales_items_taxes as SIT');
-		$this->db->join('sales_taxes as ST', 'SIT.sale_id = ST.sale_id', 'left');
-		$this->db->group_by('SIT.sale_id');
-		$this->db->group_by('ST.sale_id');
-		$this->db->order_by('SIT.sale_id');
-		$this->db->limit($block_count);
-		return $this->db->get();
+		$builder = $this->db->table('sales_items_taxes as SIT');
+		$builder->select('SIT.sale_id');
+		$builder->select('ST.sale_id as sales_taxes_sale_id');
+		$builder->join('sales_taxes as ST', 'SIT.sale_id = ST.sale_id', 'left');
+		$builder->groupBy('SIT.sale_id');
+		$builder->groupBy('ST.sale_id');
+		$builder->orderBy('SIT.sale_id');
+		$builder->limit($block_count);
+
+		return $builder->get();
 	}
 
-	private function get_count_of_unmigrated()
+	private function get_count_of_unmigrated(): int
 	{
 		$result = $this->db->query('SELECT COUNT(*) FROM(SELECT SIT.sale_id, ST.sale_id as sales_taxes_sale_id FROM '
-			. $this->db->dbprefix('sales_items_taxes')
+			. $this->db->prefixTable('sales_items_taxes')
 			. ' as SIT LEFT JOIN '
-			. $this->db->dbprefix('sales_taxes')
+			. $this->db->prefixTable('sales_taxes')
 			. ' as ST ON SIT.sale_id = ST.sale_id GROUP BY SIT.sale_id, ST.sale_id'
-			. ' ORDER BY SIT.sale_id) as US')->result_array();
+			. ' ORDER BY SIT.sale_id) as US')->getResultArray();
+
 		return $result[0]['COUNT(*)'];
 	}
 
-	private function get_sale_items_for_migration($sale_id)
+	private function get_sale_items_for_migration(int $sale_id): ResultInterface
 	{
-		$this->db->select('sales_items.sale_id as sale_id');
-		$this->db->select('sales_items.line as line');
-		$this->db->select('item_unit_price');
-		$this->db->select('discount');
-		$this->db->select('quantity_purchased');
-		$this->db->select('percent');
-		$this->db->select('name');
-		$this->db->from('sales_items as sales_items');
-		$this->db->join('sales_items_taxes as sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id and sales_items.line = sales_items_taxes.line');
-		$this->db->where('sales_items.sale_id', $sale_id);
-		return $this->db->get();
+		$builder = $this->db->table('sales_items as sales_items');
+		$builder->select('sales_items.sale_id as sale_id');
+		$builder->select('sales_items.line as line');
+		$builder->select('item_unit_price');
+		$builder->select('discount');
+		$builder->select('quantity_purchased');
+		$builder->select('percent');
+		$builder->select('name');
+		$builder->join('sales_items_taxes as sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id and sales_items.line = sales_items_taxes.line');
+		$builder->where('sales_items.sale_id', $sale_id);
+
+		return $builder->get();
 	}
 
-	private function update_sales_items_taxes_amount($sale_id, $line, $name, $percent, $tax_type, $item_tax_amount)
+	private function update_sales_items_taxes_amount(int $sale_id, int $line, string $name, float $percent, int $tax_type, float $item_tax_amount): void
 	{
-		$this->db->where('sale_id', $sale_id);
-		$this->db->where('line', $line);
-		$this->db->where('name', $name);
-		$this->db->where('percent', $percent);
-		$this->db->update('sales_items_taxes', array('tax_type' => $tax_type, 'item_tax_amount' => $item_tax_amount));
+		$builder = $this->db->table('sales_items_taxes');
+		$builder->where('sale_id', $sale_id);
+		$builder->where('line', $line);
+		$builder->where('name', $name);
+		$builder->where('percent', $percent);
+		$builder->update(['tax_type' => $tax_type, 'item_tax_amount' => $item_tax_amount]);
 	}
 
-	private function save_sales_tax(&$sales_taxes)
+	private function save_sales_tax(array &$sales_taxes): void
 	{
-		foreach($sales_taxes as $line=>$sales_tax)
+		$builder = $this->db->table('sales_taxes');
+
+		foreach($sales_taxes as $line => $sales_tax)
 		{
-			$this->db->insert('sales_taxes', $sales_tax);
+			$builder->insert($sales_tax);
 		}
 	}
 
-	public function get_item_total($quantity, $price, $discount, $include_discount = FALSE)
+	public function get_item_total(string $quantity, string $price, string $discount, bool $include_discount = FALSE): string
 	{
 		$total = bcmul($quantity, $price);
 		
@@ -138,36 +165,36 @@ class Migration_TaxAmount extends CI_Migration
 		return $total;
 	}
 
-	public function get_item_tax($tax_basis, $tax_percentage, $rounding_mode, $decimals)
+	public function get_item_tax(string $tax_basis, string $tax_percentage, int $rounding_mode, int $decimals): float	//TODO: is this currency safe?
 	{
-		$tax_fraction = bcdiv(bcadd(100, $tax_percentage), 100);
+		$tax_fraction = bcdiv(bcadd('100', $tax_percentage), '100');
 		$price_tax_excl = bcdiv($tax_basis, $tax_fraction);
 		$tax_amount = bcsub($tax_basis, $price_tax_excl);
 
 		return $this->round_number($rounding_mode, $tax_amount, $decimals);
 	}
 
-	public function get_sales_tax_for_amount($tax_basis, $tax_percentage, $rounding_mode, $decimals)
+	public function get_sales_tax_for_amount(string $tax_basis, string $tax_percentage, int $rounding_mode, int $decimals): float	//TODO: is this currency safe?
 	{
-		$tax_fraction = bcdiv($tax_percentage, 100);
+		$tax_fraction = bcdiv($tax_percentage, '100');
 		$tax_amount = bcmul($tax_basis, $tax_fraction);
 
 		return $this->round_number($rounding_mode, $tax_amount, $decimals);
 	}
 
-	public function round_number($rounding_mode, $amount, $decimals)
-	{
-		if($rounding_mode == Migration_TaxAmount::ROUND_UP)
+	public function round_number(int $rounding_mode, string $amount, int $decimals): float	//TODO: is this currency safe?
+	{//TODO: This needs to be converted to a switch
+		if($rounding_mode == Migration_TaxAmount::ROUND_UP)	//TODO: === ?
 		{
-			$fig = pow(10,$decimals);
-			$rounded_total = (ceil($fig*$amount) + ceil($fig*$amount - ceil($fig*$amount)))/$fig;
+			$fig = pow(10, $decimals);
+			$rounded_total = (ceil($fig * $amount) + ceil($fig*$amount - ceil($fig * $amount)))/$fig;
 		}
-		elseif($rounding_mode == Migration_TaxAmount::ROUND_DOWN)
+		elseif($rounding_mode == Migration_TaxAmount::ROUND_DOWN)	//TODO: === ?
 		{
-			$fig = pow(10,$decimals);
-			$rounded_total = (floor($fig*$amount) + floor($fig*$amount - floor($fig*$amount)))/$fig;
+			$fig = pow(10, $decimals);
+			$rounded_total = (floor($fig * $amount) + floor($fig * $amount - floor($fig * $amount)))/$fig;
 		}
-		elseif($rounding_mode == Migration_TaxAmount::HALF_FIVE)
+		elseif($rounding_mode == Migration_TaxAmount::HALF_FIVE)	//TODO: === ?
 		{
 			$rounded_total = round($amount / 5) * 5;
 		}
@@ -179,24 +206,28 @@ class Migration_TaxAmount extends CI_Migration
 		return $rounded_total;
 	}
 
-	public function update_sales_taxes(&$sales_taxes, $tax_type, $tax_group, $tax_rate, $tax_basis, $item_tax_amount, $tax_group_sequence, $rounding_code, $sale_id, $name='', $tax_code='')
+	public function update_sales_taxes(array &$sales_taxes, int $tax_type, string $tax_group, float $tax_rate, string $tax_basis, string $item_tax_amount, int $tax_group_sequence, int $rounding_code, int $sale_id, string $name = '', string $tax_code = ''): void
 	{
-		$tax_group_index = $this->clean('X'.$tax_group);
+		$tax_group_index = $this->clean('X' . $tax_group);
+
 		if(!array_key_exists($tax_group_index, $sales_taxes))
 		{
 			$insertkey = $tax_group_index;
-			$sales_tax = array($insertkey => array(
-				'sale_id' => $sale_id,
-				'tax_type' => $tax_type,
-				'tax_group' => $tax_group,
-				'sale_tax_basis' => $tax_basis,
-				'sale_tax_amount' => $item_tax_amount,
-				'print_sequence' => $tax_group_sequence,
-				'name' => $name,
-				'tax_rate' => $tax_rate,
-				'sales_tax_code_id' => $tax_code,
-				'rounding_code' => $rounding_code
-			));
+			$sales_tax = [
+				$insertkey => [
+					'sale_id' => $sale_id,
+					'tax_type' => $tax_type,
+					'tax_group' => $tax_group,
+					'sale_tax_basis' => $tax_basis,
+					'sale_tax_amount' => $item_tax_amount,
+					'print_sequence' => $tax_group_sequence,
+					'name' => $name,
+					'tax_rate' => $tax_rate,
+					'sales_tax_code_id' => $tax_code,
+					'rounding_code' => $rounding_code
+				]
+			];
+
 			//add to existing array
 			$sales_taxes += $sales_tax;
 		}
@@ -209,50 +240,56 @@ class Migration_TaxAmount extends CI_Migration
 		}
 	}
 
-	public function clean($string)
+	public function clean(string $string): string	//TODO: This can probably go into the migration helper as it's used it more than one migration. Also, $string needs to be refactored to a different name.
 	{
 		$string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens.
 
 		return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars.
 	}
 
-	public function apply_invoice_taxing(&$sales_taxes)
+	public function apply_invoice_taxing(array &$sales_taxes): void
 	{
-		if(!empty($sales_taxes))
+		if(!empty($sales_taxes))	//TODO: Duplicated code
 		{
-			$sort = array();
+			$sort = [];
 			foreach($sales_taxes as $k => $v)
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
 			}
 			array_multisort($sort['print_sequence'], SORT_ASC, $sales_taxes);
 		}
+
 		$decimals = totals_decimals();
+
 		foreach($sales_taxes as $row_number => $sales_tax)
 		{
 			$sales_taxes[$row_number]['sale_tax_amount'] = $this->get_sales_tax_for_amount($sales_tax['sale_tax_basis'], $sales_tax['tax_rate'], $sales_tax['rounding_code'], $decimals);
 		}
 	}
 
-	public function round_sales_taxes(&$sales_taxes)
+	public function round_sales_taxes(array &$sales_taxes): void
 	{
 		if(!empty($sales_taxes))
 		{
-			$sort = array();
+			$sort = [];
+
 			foreach($sales_taxes as $k=>$v)
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
 			}
+
 			array_multisort($sort['print_sequence'], SORT_ASC, $sales_taxes);
 		}
+
 		$decimals = totals_decimals();
+
 		foreach($sales_taxes as $row_number => $sales_tax)
 		{
 			$sale_tax_amount = $sales_tax['sale_tax_amount'];
 			$rounding_code = $sales_tax['rounding_code'];
 			$rounded_sale_tax_amount = $sale_tax_amount;
 
-			if ($rounding_code == PHP_ROUND_HALF_UP
+			if ($rounding_code == PHP_ROUND_HALF_UP	//TODO: This block of if/elseif statements can be converted to a switch.
 				|| $rounding_code == PHP_ROUND_HALF_DOWN
 				|| $rounding_code == PHP_ROUND_HALF_EVEN
 				|| $rounding_code == PHP_ROUND_HALF_ODD)
@@ -273,8 +310,8 @@ class Migration_TaxAmount extends CI_Migration
 			{
 				$rounded_sale_tax_amount = round($sale_tax_amount / 5) * 5;
 			}
+
 			$sales_taxes[$row_number]['sale_tax_amount'] = $rounded_sale_tax_amount;
 		}
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20200215100000_taxgroupconstraint.php b/app/Database/Migrations/20200215100000_taxgroupconstraint.php
index b5803ee10..cc4c282e9 100644
--- a/app/Database/Migrations/20200215100000_taxgroupconstraint.php
+++ b/app/Database/Migrations/20200215100000_taxgroupconstraint.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_taxgroupconstraint extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_taxgroupconstraint extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
+		$this->db->query('ALTER TABLE ' . $this->db->prefixTable('tax_jurisdictions') . ' ADD CONSTRAINT tax_jurisdictions_uq1 UNIQUE (tax_group)');
 	}
 
-	public function up()
+	public function down(): void
 	{
-		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('tax_jurisdictions') . ' ADD CONSTRAINT tax_jurisdictions_uq1 UNIQUE (tax_group)');
+		$this->db->query('ALTER TABLE ' . $this->db->prefixTable('tax_jurisdictions') . ' DROP INDEX tax_jurisdictions_uq1');
 	}
-
-	public function down()
-	{
-		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('tax_jurisdictions') . ' DROP INDEX tax_jurisdictions_uq1');
-	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20200508000000_image_upload_defaults.php b/app/Database/Migrations/20200508000000_image_upload_defaults.php
index 4590e285e..f0e58e437 100644
--- a/app/Database/Migrations/20200508000000_image_upload_defaults.php
+++ b/app/Database/Migrations/20200508000000_image_upload_defaults.php
@@ -1,27 +1,28 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_image_upload_defaults extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_image_upload_defaults extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
+		$image_values = [
+			['key' => 'image_allowed_types', 'value' => 'gif|jpg|png'],
+			['key' => 'image_max_height', 'value' => '480'],
+			['key' => 'image_max_size', 'value' => '128'],
+			['key' => 'image_max_width', 'value' => '640']
+		];
+
+		$builder = $this->db->table('app_config');
+		$builder->insertBatch($image_values);
 	}
 
-	public function up()
+	public function down(): void
 	{
-		$image_values = array(
-			array('key' => 'image_allowed_types', 'value' => 'gif|jpg|png'),
-			array('key' => 'image_max_height', 'value' => '480'),
-			array('key' => 'image_max_size', 'value' => '128'),
-			array('key' => 'image_max_width', 'value' => '640'));
-
-		$this->db->insert_batch('app_config', $image_values);
+		$builder = $this->db->table('app_config');
+		$builder->whereIn('key', ['image_allowed_types','image_max_height','image_max_size','image_max_width']);
+		$builder->delete();
 	}
-
-	public function down()
-	{
-		$this->db->where_in('key', array('image_allowed_types','image_max_height','image_max_size','image_max_width'));
-		$this->db->delete('app_config');
-	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
index 35d2844fa..5e42bdd52 100644
--- a/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
+++ b/app/Database/Migrations/20200819000000_modify_attr_links_constraint.php
@@ -1,13 +1,12 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_modify_attr_links_constraint extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_modify_attr_links_constraint extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		error_log('Migrating modify_attr_links_constraint');
 
@@ -17,8 +16,7 @@ class Migration_modify_attr_links_constraint extends CI_Migration
 		error_log('Migrating modify_attr_links_constraint');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20201108100000_cashrounding.php b/app/Database/Migrations/20201108100000_cashrounding.php
index aafc6a155..63dc74b66 100644
--- a/app/Database/Migrations/20201108100000_cashrounding.php
+++ b/app/Database/Migrations/20201108100000_cashrounding.php
@@ -1,20 +1,18 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_cashrounding extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_cashrounding extends Migration
 {
-	public function __construct()
+	public function up(): void
 	{
-		parent::__construct();
+		$this->db->query('ALTER TABLE ' . $this->db->prefixTable('sales_payments') . ' ADD COLUMN `cash_adjustment` tinyint NOT NULL DEFAULT 0 AFTER `cash_refund`');
 	}
 
-	public function up()
+	public function down(): void
 	{
-		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('sales_payments') . ' ADD COLUMN `cash_adjustment` tinyint NOT NULL DEFAULT 0 AFTER `cash_refund`');
+		$this->db->query('ALTER TABLE ' . $this->db->prefixTable('sales_payments') . ' DROP COLUMN `cash_adjustment`');
 	}
-
-	public function down()
-	{
-		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('sales_payments') . ' DROP COLUMN `cash_adjustment`');
-	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20201110000000_add_item_kit_number.php b/app/Database/Migrations/20201110000000_add_item_kit_number.php
index dc66eaf19..9a1732a26 100644
--- a/app/Database/Migrations/20201110000000_add_item_kit_number.php
+++ b/app/Database/Migrations/20201110000000_add_item_kit_number.php
@@ -1,13 +1,12 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_add_item_kit_number extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_add_item_kit_number extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		error_log('Migrating add_item_kit_number');
 
@@ -16,8 +15,7 @@ class Migration_add_item_kit_number extends CI_Migration
 		error_log('Migrating add_item_kit_number');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20210103000000_modify_session_datatype.php b/app/Database/Migrations/20210103000000_modify_session_datatype.php
index b028ea04d..932244fc7 100644
--- a/app/Database/Migrations/20210103000000_modify_session_datatype.php
+++ b/app/Database/Migrations/20210103000000_modify_session_datatype.php
@@ -1,13 +1,12 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_modify_session_datatype extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class Migration_modify_session_datatype extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		error_log('Migrating modify_session_datatype');
 
@@ -16,8 +15,7 @@ class Migration_modify_session_datatype extends CI_Migration
 		error_log('Migrating modify_session_datatype');
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20210422000000_database_optimizations.php b/app/Database/Migrations/20210422000000_database_optimizations.php
index 4ec16544f..9fad4feff 100644
--- a/app/Database/Migrations/20210422000000_database_optimizations.php
+++ b/app/Database/Migrations/20210422000000_database_optimizations.php
@@ -1,49 +1,57 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_database_optimizations extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Database\ResultInterface;
+use app\Models\Attribute;
+use DateTime;
+
+class Migration_database_optimizations extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		error_log('Migrating database_optimizations');
-		$CI =& get_instance();
 
-		$CI->Attribute->delete_orphaned_values();
+		$attribute = model(Attribute::class);
+
+		$attribute->delete_orphaned_values();
 
 		$this->migrate_duplicate_attribute_values(DECIMAL);
 		$this->migrate_duplicate_attribute_values(DATE);
 
 		//Select all attributes that have data in more than one column
-		$this->db->select('attribute_id, attribute_value, attribute_decimal, attribute_date');
-		$this->db->group_start();
-			$this->db->where('attribute_value IS NOT NULL');
-			$this->db->where('attribute_date IS NOT NULL');
-		$this->db->group_end();
-		$this->db->or_group_start();
-			$this->db->where('attribute_value IS NOT NULL');
-			$this->db->where('attribute_decimal IS NOT NULL');
-		$this->db->group_end();
-		$attribute_values = $this->db->get('attribute_values');
+		$builder = $this->db->table('attribute_values');
+		$builder->select('attribute_id, attribute_value, attribute_decimal, attribute_date');
+		$builder->groupStart();
+			$builder->where('attribute_value IS NOT NULL');
+			$builder->where('attribute_date IS NOT NULL');
+		$builder->groupEnd();
+		$builder->orGroupStart();
+			$builder->where('attribute_value IS NOT NULL');
+			$builder->where('attribute_decimal IS NOT NULL');
+		$builder->groupEnd();
+		$attribute_values = $builder->get();
 
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		//Clean up Attribute values table where there is an attribute value and an attribute_date/attribute_decimal
-		foreach($attribute_values->result_array() as $attribute_value)
+		foreach($attribute_values->getResultArray() as $attribute_value)
 		{
-			$attribute_links = $this->db->query('SELECT links.definition_id, links.item_id, links.attribute_id, defs.definition_type FROM ospos_attribute_links links JOIN ospos_attribute_definitions defs ON defs.definition_id = links.definition_id where attribute_id = '. $attribute_value['attribute_id']);
+			$builder = $this->db->table('attribute_values');
+			$builder->delete(['attribute_id' => $attribute_value['attribute_id']]);
 
-			$this->db->where('attribute_id', $attribute_value['attribute_id']);
-			$this->db->delete('attribute_values');
+			$query = 'SELECT links.definition_id, links.item_id, links.attribute_id, defs.definition_type FROM ospos_attribute_links links JOIN ospos_attribute_definitions defs ON defs.definition_id = links.definition_id where attribute_id = ';
+			$query .= $attribute_value['attribute_id'];
+			$attribute_links = $this->db->query($query);
 
-			foreach($attribute_links->result_array() as $attribute_link)
+			$builder = $this->db->table('attribute_links');
+
+			foreach($attribute_links->getResultArray() as $attribute_link)
 			{
-				$this->db->where('attribute_id',$attribute_link['attribute_id']);
-				$this->db->where('item_id',$attribute_link['item_id']);
-				$this->db->delete('attribute_links');
+				$builder->where('attribute_id', $attribute_link['attribute_id']);
+				$builder->where('item_id', $attribute_link['item_id']);
+				$builder->delete();
 
 				switch($attribute_link['definition_type'])
 				{
@@ -51,18 +59,18 @@ class Migration_database_optimizations extends CI_Migration
 						$value = $attribute_value['attribute_decimal'];
 						break;
 					case DATE:
-						$attribute_date	= DateTime::createFromFormat('Y-m-d', $attribute_value['attribute_date']);
-						$value			= $attribute_date->format($CI->Appconfig->get('dateformat'));
+						$attribute_date = DateTime::createFromFormat('Y-m-d', $attribute_value['attribute_date']);
+						$value = $attribute_date->format(config('OSPOS')->dateformat);
 						break;
 					default:
 						$value = $attribute_value['attribute_value'];
 						break;
 				}
 
-				$CI->Attribute->save_value($value, $attribute_link['definition_id'], $attribute_link['item_id'], FALSE, $attribute_link['definition_type']);
+				$attribute->save_value($value, $attribute_link['definition_id'], $attribute_link['item_id'], FALSE, $attribute_link['definition_type']);
 			}
 		}
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
 		execute_script(APPPATH . 'migrations/sqlscripts/3.4.0_database_optimizations.sql');
 		error_log('Migrating database_optimizations completed');
@@ -72,52 +80,54 @@ class Migration_database_optimizations extends CI_Migration
 	 */
 	private function migrate_duplicate_attribute_values($attribute_type)
 	{
-	//Remove duplicate attribute values needed to make attribute_decimals and attribute_dates unique
-		$this->db->trans_start();
+		//Remove duplicate attribute values needed to make attribute_decimals and attribute_dates unique
+		$this->db->transStart();
 
 		$column = 'attribute_' . strtolower($attribute_type);
 
-		$this->db->select("$column, attribute_id");
-		$this->db->group_by($column);
-		$this->db->having("COUNT($column) > 1");
-		$duplicated_values = $this->db->get('attribute_values');
+		$builder = $this->db->table('attribute_values');
+		$builder->select("$column, attribute_id");
+		$builder->groupBy($column);
+		$builder->having("COUNT($column) > 1");
+		$duplicated_values = $builder->get('attribute_values');
 
-		foreach($duplicated_values->result_array() as $duplicated_value)
+		foreach($duplicated_values->getResultArray() as $duplicated_value)
 		{
-			$this->db->select('attribute_id');
-			$this->db->where($column, $duplicated_value[$column]);
-			$attribute_ids_to_fix = $this->db->get('attribute_values');
+			$builder->select('attribute_id');
+			$builder->where($column, $duplicated_value[$column]);
+			$attribute_ids_to_fix = $builder->get();
 
 			$this->reassign_duplicate_attribute_values($attribute_ids_to_fix, $duplicated_value);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 	}
 
 	/**
 	 * Updates the attribute_id in all attribute_link rows with duplicated attribute_ids then deletes unneeded rows from attribute_values
-	 * @param attribute_ids_to_fix
-	 * @param decimal
+	 *
+	 * @param ResultInterface $attribute_ids_to_fix
+	 * @param array $attribute_value
 	 */
-	private function reassign_duplicate_attribute_values($attribute_ids_to_fix, $attribute_value)
+	private function reassign_duplicate_attribute_values(ResultInterface $attribute_ids_to_fix, array $attribute_value)
 	{
-		foreach($attribute_ids_to_fix->result_array() as $attribute_id)
+		foreach($attribute_ids_to_fix->getResultArray() as $attribute_id)
 		{
 			//Update attribute_link with the attribute_id we are keeping
-			$this->db->where('attribute_id', $attribute_id['attribute_id']);
-			$this->db->update('attribute_links', array('attribute_id' => $attribute_value['attribute_id']));
+			$builder = $this->db->table('attribute_links');
+			$builder->where('attribute_id', $attribute_id['attribute_id']);
+			$builder->update(['attribute_id' => $attribute_value['attribute_id']]);
 
 			//Delete the row from attribute_values if it isn't our keeper
 			if($attribute_id['attribute_id'] !== $attribute_value['attribute_id'])
 			{
-				$this->db->where('attribute_id', $attribute_id['attribute_id']);
-				$this->db->delete($this->db->dbprefix('attribute_values'));
+				$builder = $this->db->table('attribute_values');
+				$builder->delete(['attribute_id' => $attribute_id['attribute_id']]);
 			}
 		}
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20210422000001_remove_duplicate_links.php b/app/Database/Migrations/20210422000001_remove_duplicate_links.php
index 3f8c02a17..555a1ab03 100644
--- a/app/Database/Migrations/20210422000001_remove_duplicate_links.php
+++ b/app/Database/Migrations/20210422000001_remove_duplicate_links.php
@@ -1,56 +1,61 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-class Migration_remove_duplicate_links extends CI_Migration
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use app\Models\Attribute;
+
+class Migration_remove_duplicate_links extends Migration
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function up()
+	public function up(): void
 	{
 		error_log('Migrating remove_duplicate_links');
 
-
 		$this->migrate_duplicate_attribute_links();
 
 		error_log('Migrating remove_duplicate_links completed');
 	}
+
 	/**
 	 * Given the type of attribute, deletes any duplicates it finds in the attribute_values table and reassigns those
+	 *
+	 * @property attribute $attribute
 	 */
 	private function migrate_duplicate_attribute_links()
 	{
-		$CI =& get_instance();
-	//Remove duplicate attribute links
-		$this->db->trans_start();
+		$attribute = model(Attribute::class);
 
-		$this->db->where('sale_id', NULL);
-		$this->db->where('receiving_id', NULL);
-		$this->db->group_by('item_id');
-		$this->db->group_by('definition_id');
-		$this->db->group_by('attribute_id');
-		$this->db->having('COUNT(item_id) > 1');
-		$this->db->having('COUNT(definition_id) > 1');
-		$this->db->having('COUNT(attribute_id) > 1');
-		$duplicated_links = $this->db->get('attribute_links');
+		//Remove duplicate attribute links
+		$this->db->transStart();
 
-		foreach($duplicated_links->result_array() as $duplicated_link)
+		$builder = $this->db->table('attribute_links');
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
+		$builder->groupBy('item_id');
+		$builder->groupBy('definition_id');
+		$builder->groupBy('attribute_id');
+		$builder->having('COUNT(item_id) > 1');
+		$builder->having('COUNT(definition_id) > 1');
+		$builder->having('COUNT(attribute_id) > 1');
+		$duplicated_links = $builder->get();
+
+		$builder = $this->db->table('attribute_links');
+
+		foreach($duplicated_links->getResultArray() as $duplicated_link)
 		{
-			$this->db->where('sale_id', NULL);
-			$this->db->where('receiving_id', NULL);
-			$this->db->where('item_id', $duplicated_link['item_id']);
-			$this->db->where('definition_id', $duplicated_link['definition_id']);
-			$this->db->delete('attribute_links');
+			$builder->where('sale_id', null);
+			$builder->where('receiving_id', null);
+			$builder->where('item_id', $duplicated_link['item_id']);
+			$builder->where('definition_id', $duplicated_link['definition_id']);
+			$builder->delete();
 
-			$CI->Attribute->save_link($duplicated_link['item_id'], $duplicated_link['definition_id'], $duplicated_link['attribute_id']);
+			$attribute->save_link($duplicated_link['item_id'], $duplicated_link['definition_id'], $duplicated_link['attribute_id']);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 	}
 
-	public function down()
+	public function down(): void
 	{
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Database/Migrations/20210714140000_move_expenses_categories.php b/app/Database/Migrations/20210714140000_move_expenses_categories.php
index 54b4c4c8a..bd64db8e5 100644
--- a/app/Database/Migrations/20210714140000_move_expenses_categories.php
+++ b/app/Database/Migrations/20210714140000_move_expenses_categories.php
@@ -1,18 +1,22 @@
 <?php
 
-class Migration_move_expenses_categories extends CI_Migration {
+namespace App\Database\Migrations;
 
-	public function __construct()
-	{
-		parent::__construct();
-	}
+use CodeIgniter\Database\Migration;
 
-	public function up()
+class Migration_move_expenses_categories extends Migration
+{
+	public function up(): void
 	{
 		error_log('Migrating expense categories module');
 
-		$this->db->simple_query("UPDATE ospos_grants SET menu_group = 'office' WHERE permission_id = 'expenses_categories'");
+		$this->db->simpleQuery("UPDATE ospos_grants SET menu_group = 'office' WHERE permission_id = 'expenses_categories'");
 
 		error_log('Migrating expense categories module completed');
 	}
+
+	public function down(): void
+	{
+
+	}
 }
diff --git a/application/migrations/sqlscripts/3.0.2_to_3.1.1.sql b/app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.0.2_to_3.1.1.sql
rename to app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql
diff --git a/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql b/app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.1.1_to_3.2.0.sql
rename to app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql
diff --git a/application/migrations/sqlscripts/3.2.0_to_3.2.1.sql b/app/Database/Migrations/sqlscripts/3.2.0_to_3.2.1.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.2.0_to_3.2.1.sql
rename to app/Database/Migrations/sqlscripts/3.2.0_to_3.2.1.sql
diff --git a/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql b/app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.2.1_to_3.3.0.sql
rename to app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql
diff --git a/application/migrations/sqlscripts/3.3.0_add_iso_4217.sql b/app/Database/Migrations/sqlscripts/3.3.0_add_iso_4217.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_add_iso_4217.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_add_iso_4217.sql
diff --git a/application/migrations/sqlscripts/3.3.0_attributes.sql b/app/Database/Migrations/sqlscripts/3.3.0_attributes.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_attributes.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_attributes.sql
diff --git a/application/migrations/sqlscripts/3.3.0_dbfix.sql b/app/Database/Migrations/sqlscripts/3.3.0_dbfix.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_dbfix.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_dbfix.sql
diff --git a/application/migrations/sqlscripts/3.3.0_decimal_attribute_type.sql b/app/Database/Migrations/sqlscripts/3.3.0_decimal_attribute_type.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_decimal_attribute_type.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_decimal_attribute_type.sql
diff --git a/application/migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql b/app/Database/Migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_fix_attribute_datetime.sql
diff --git a/application/migrations/sqlscripts/3.3.0_indiagst.sql b/app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_indiagst.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql
diff --git a/application/migrations/sqlscripts/3.3.0_indiagst1.sql b/app/Database/Migrations/sqlscripts/3.3.0_indiagst1.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_indiagst1.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_indiagst1.sql
diff --git a/application/migrations/sqlscripts/3.3.0_indiagst2.sql b/app/Database/Migrations/sqlscripts/3.3.0_indiagst2.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_indiagst2.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_indiagst2.sql
diff --git a/application/migrations/sqlscripts/3.3.0_paymenttracking.sql b/app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_paymenttracking.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql
diff --git a/application/migrations/sqlscripts/3.3.0_refundtracking.sql b/app/Database/Migrations/sqlscripts/3.3.0_refundtracking.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.0_refundtracking.sql
rename to app/Database/Migrations/sqlscripts/3.3.0_refundtracking.sql
diff --git a/application/migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql b/app/Database/Migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql
rename to app/Database/Migrations/sqlscripts/3.3.2_modify_attr_links_constraint.sql
diff --git a/application/migrations/sqlscripts/3.3.2_paymentdatefix.sql b/app/Database/Migrations/sqlscripts/3.3.2_paymentdatefix.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.2_paymentdatefix.sql
rename to app/Database/Migrations/sqlscripts/3.3.2_paymentdatefix.sql
diff --git a/application/migrations/sqlscripts/3.3.2_saleschangeprice.sql b/app/Database/Migrations/sqlscripts/3.3.2_saleschangeprice.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.2_saleschangeprice.sql
rename to app/Database/Migrations/sqlscripts/3.3.2_saleschangeprice.sql
diff --git a/application/migrations/sqlscripts/3.3.3_add_kits_item_number.sql b/app/Database/Migrations/sqlscripts/3.3.3_add_kits_item_number.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.3_add_kits_item_number.sql
rename to app/Database/Migrations/sqlscripts/3.3.3_add_kits_item_number.sql
diff --git a/application/migrations/sqlscripts/3.3.4_modify_session_datatype.sql b/app/Database/Migrations/sqlscripts/3.3.4_modify_session_datatype.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.3.4_modify_session_datatype.sql
rename to app/Database/Migrations/sqlscripts/3.3.4_modify_session_datatype.sql
diff --git a/application/migrations/sqlscripts/3.4.0_database_optimizations.sql b/app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql
similarity index 100%
rename from application/migrations/sqlscripts/3.4.0_database_optimizations.sql
rename to app/Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql
diff --git a/app/Database/Seeds/.gitkeep b/app/Database/Seeds/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/Events/Db_log.php b/app/Events/Db_log.php
index 2c6d21834..b12cc22e4 100644
--- a/app/Events/Db_log.php
+++ b/app/Events/Db_log.php
@@ -1,33 +1,33 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-/**
- * Name of function same as mentioned in Hooks Config
- */
-function db_log_queries()
+namespace App\Events;
+
+class Db_log
 {
-	$CI = & get_instance();
-
-	// check if database logging is enabled (see config/config.php)
-	if($CI->config->item('db_log_enabled'))
+	public function db_log_queries()
 	{
-		// Creating Query Log file with today's date in application/logs folder
-		$filepath = APPPATH . 'logs/Query-log-' . date('Y-m-d') . '.php';
-		// Opening file with pointer at the end of the file
-		$handle = fopen($filepath, "a+");
+		$config = config('App');
 
-		// Get execution time of all the queries executed by controller
-		$times = $CI->db->query_times;
-		foreach($CI->db->queries as $key => $query)
-		{ 
-			// Generating SQL file alongwith execution time
-			$sql = $query . " \n Execution Time:" . $times[$key];
-			// Writing it in the log file
-			fwrite($handle, $sql . "\n\n");
+		// check if database logging is enabled (see config/config.php)
+		if($config->db_log_enabled)
+		{
+			// Creating Query Log file with today's date in application/logs folder
+			$filepath = WRITEPATH . 'logs/Query-log-' . date('Y-m-d') . '.php';
+			// Opening file with pointer at the end of the file
+			$handle = fopen($filepath, "a+");
+
+			// Get execution time of all the queries executed by controller
+			$times = $config->db->query_times;
+			foreach($config->db->queries as $key => $query)
+			{
+				// Generating SQL file along with execution time
+				$sql = $query . " \n Execution Time:" . $times[$key];
+				// Writing it in the log file
+				fwrite($handle, $sql . "\n\n");
+			}
+
+			// Close the file
+			fclose($handle);
 		}
-
-		// Close the file
-		fclose($handle);
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Events/Load_config.php b/app/Events/Load_config.php
index 07864906d..f5c5c7708 100644
--- a/app/Events/Load_config.php
+++ b/app/Events/Load_config.php
@@ -1,80 +1,60 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Events;
+
+use app\Libraries\MY_Migration;
+use app\Models\Appconfig;
+use CodeIgniter\Session\Session;
+use Config\Services;
 
 /**
- * Loads configuration from database into global CI config
+ * @property my_migration migration;
+ * @property session session;
+ * @property appconfig appconfig;
+ * @property mixed $migration_config
+ * @property mixed $config
  */
-function load_config()
+class Load_config
 {
-    $CI =& get_instance();
-
-    $migration = $CI->load->library('migration');
-    if (!$CI->migration->is_latest())
+    /**
+     * Loads configuration from database into App CI config and then applies those settings
+     */
+    public function load_config()
     {
-        $CI->session->sess_destroy();
-    }
+        //Migrations
+        $migration_config = config('Migrations');
+        $migration = new My_Migration($migration_config);
 
-    foreach($CI->Appconfig->get_all()->result() as $app_config)
-    {	
-        $CI->config->set_item($CI->security->xss_clean($app_config->key), $CI->security->xss_clean($app_config->value));
-    }
+        $this->session = session();
 
-    // fallback to English if language settings are not correct
-    $file_exists = !file_exists('../application/language/' . current_language_code());
-    if(current_language_code() == null || current_language() == null || $file_exists)
-    {
-        $CI->config->set_item('language', 'english');
-        $CI->config->set_item('language_code', 'en-US');
-    }
-
-    _load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language(), FALSE);
-    _load_language_files($CI, '../application/language', current_language_code(), TRUE);
-
-    //Set timezone from config database
-    if($CI->config->item('timezone'))
-    {
-        date_default_timezone_set($CI->config->item('timezone'));
-    }
-    else
-    {
-        date_default_timezone_set('America/New_York');
-    }
-
-    bcscale(max(2, totals_decimals() + tax_decimals()));
-}
-
-/**
- * @param $CI
- * @param $path
- * @param $language
- * @param $fallback
- */
-function _load_language_files($CI, $path, $language, $fallback)
-{
-    $map = directory_map($path . DIRECTORY_SEPARATOR . $language);
-
-    foreach($map as $file)
-	{
-
-        if(!is_array($file) && substr(strrchr($file, '.'), 1) == 'php')
-		{
-            $filename = strtr($file, '', '_lang.php');
-            if ($fallback) {
-                $CI->lang->load($filename, 'en-US');
-
-                $array = $CI->lang->load($filename, $language, TRUE);
-                foreach($array as $lang_key => $lang_value) {
-                    if ($lang_value !== '') {
-                        $CI->lang->language[$lang_key] = $lang_value;
-                    }
-                }
-            }
-            else
-            {
-                $CI->lang->load($filename, $language);
-            }
+        //Database Configuration
+        $config = config('OSPOS');
+        $appconfig = model(Appconfig::class);
 
+        if (!$migration->is_latest())
+        {
+            $this->session->destroy();
         }
+
+        foreach($appconfig->get_all()->getResult() as $app_config)
+        {
+            $config[$app_config->key] = $app_config->value;
+        }
+
+        //Language
+        $language_exists = file_exists('../app/Language/' . current_language_code());
+        if(current_language_code() == null || current_language() == null || !$language_exists)
+        {
+            $config->language = 'english';
+            $config->language_code = 'en-US';
+        }
+
+        $language = Services::language();
+        $language->setLocale($config->language_code);
+
+        //Time Zone
+        date_default_timezone_set($config->timezone ?? 'America/New_York');
+
+        bcscale(max(2, totals_decimals() + tax_decimals()));
     }
 }
-
-?>
diff --git a/app/Events/Save.php b/app/Events/Save.php
index fd20620bf..7ad67929e 100644
--- a/app/Events/Save.php
+++ b/app/Events/Save.php
@@ -1,16 +1,19 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-function validate_method()
+namespace App\Events;
+
+class Save
 {
+	public static function validate_save()
+	{
+		$url = $_SERVER['REQUEST_URI'];
 
-    $url = $_SERVER['REQUEST_URI'];
-
-    $post_required = preg_match('/\/(logout|save|delete*|remove*)\/?\d*?/', $url);
-
-    if($post_required && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
-    {
-        echo "Method not allowed";
-        die;
-    }
+		$post_required = preg_match('/\/(logout|save|delete*|remove*)\/?\d*?/', $url);
 
+		if($post_required && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
+		{
+			echo "Method not allowed";
+			die;
+		}
+	}
 }
diff --git a/app/Filters/.gitkeep b/app/Filters/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/Helpers/dompdf_helper.php b/app/Helpers/dompdf_helper.php
index e72f3e7bb..e7b9debec 100644
--- a/app/Helpers/dompdf_helper.php
+++ b/app/Helpers/dompdf_helper.php
@@ -1,23 +1,23 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
 /**
  * PDF helper
  */
-
-function create_pdf($html, $filename = '')
+function create_pdf(string $html, string $filename = ''): string
 {
     // need to enable magic quotes for the
-    $dompdf = new Dompdf\Dompdf(array("isRemoteEnabled" => TRUE, "isPhpEnabled" => TRUE));
-    $dompdf->loadHtml(str_replace(array("\n", "\r"), '', $html));
+    $dompdf = new Dompdf\Dompdf (['isRemoteEnabled' => TRUE, 'isPhpEnabled' => TRUE]);
+    $dompdf->loadHtml(str_replace (['\n', '\r'], '', $html));
     $dompdf->render();
     
     if($filename != '')
     {
         $dompdf->stream($filename . '.pdf');
     }
-    else
+    else//TODO: Not all paths return a value.
     {
         return $dompdf->output();
     }
+
+    return '';
 }
-?>
diff --git a/app/Helpers/importfile_helper.php b/app/Helpers/importfile_helper.php
index e5e6036f6..8752aa106 100644
--- a/app/Helpers/importfile_helper.php
+++ b/app/Helpers/importfile_helper.php
@@ -1,6 +1,6 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-function generate_import_items_csv($stock_locations,$attributes)
+function generate_import_items_csv(array $stock_locations, array $attributes): string
 {
 	$csv_headers = pack('CCC',0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
 	$csv_headers .= 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN';
@@ -10,7 +10,7 @@ function generate_import_items_csv($stock_locations,$attributes)
 	return $csv_headers;
 }
 
-function generate_stock_location_headers($locations)
+function generate_stock_location_headers(array $locations): string
 {
 	$location_headers = '';
 
@@ -22,7 +22,7 @@ function generate_stock_location_headers($locations)
 	return $location_headers;
 }
 
-function generate_attribute_headers($attribute_names)
+function generate_attribute_headers(array $attribute_names): string
 {
 	$attribute_headers = '';
 	unset($attribute_names[-1]);
@@ -35,7 +35,7 @@ function generate_attribute_headers($attribute_names)
 	return $attribute_headers;
 }
 
-function get_csv_file($file_name)
+function get_csv_file(string $file_name): array
 {
 //TODO: current implementation reads the entire file in.  This is memory intensive for large files.
 //We may want to rework the CSV import feature to read the file in chunks, process it and continue.
@@ -46,8 +46,7 @@ function get_csv_file($file_name)
 
 	if(($csv_file = fopen($file_name,'r')) !== FALSE)
 	{
-		$CI =& get_instance();
-		$CI->load->helper('security');
+		helper('security');
 
 		$csv_rows = [];
 
@@ -62,9 +61,9 @@ function get_csv_file($file_name)
 		while(($row = fgetcsv($csv_file)) !== FALSE)
 		{
 			//Skip empty lines
-			if($row !== array(null))
+			if($row !== [null])
 			{
-				$csv_rows[] = array_combine($headers, $CI->security->xss_clean($row));
+				$csv_rows[] = array_combine($headers, $row);
 			}
 		}
 
@@ -74,7 +73,7 @@ function get_csv_file($file_name)
 	return $csv_rows;
 }
 
-function bom_exists(&$file_handle)
+function bom_exists(&$file_handle): bool
 {
 	$result		= FALSE;
 	$candidate	= fread($file_handle, 3);
@@ -89,5 +88,4 @@ function bom_exists(&$file_handle)
 	}
 
 	return $result;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Helpers/index.html b/app/Helpers/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Helpers/index.html
+++ b/app/Helpers/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php
index 792d66a77..fc3ef6b8d 100644
--- a/app/Helpers/locale_helper.php
+++ b/app/Helpers/locale_helper.php
@@ -1,24 +1,24 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+use app\Models\Employee;
 
-const DEFAULT_LANGUAGE = 'english';
+const DEFAULT_LANGUAGE = 'english';	//TODO: These constants all need to be moved to constants.php
 const DEFAULT_LANGUAGE_CODE = 'en-US';
 
 define('NOW', time());
-define('MAX_PRECISION', 1e14);
-define('DEFAULT_PRECISION', 2);
+const MAX_PRECISION = 1e14;
+const DEFAULT_PRECISION = 2;
 define('DEFAULT_DATE', mktime(0, 0, 0, 1, 1, 2010));
 define('DEFAULT_DATETIME', mktime(0, 0, 0, 1, 1, 2010));
 
 /**
  * Currency locale helper
  */
-
-function current_language_code($load_system_language = FALSE)
+function current_language_code(bool $load_system_language = FALSE): string
 {
-	$employee = get_instance()->Employee;
+	$employee = model(Employee::class);
 
 	// Returns the language code of the employee if set or system language code if not
-	if($employee->is_logged_in() && $load_system_language != TRUE)
+	if($employee->is_logged_in() && $load_system_language != TRUE)	//TODO: !==
 	{
 		$employee_info = $employee->get_logged_in_employee_info();
 
@@ -28,33 +28,34 @@ function current_language_code($load_system_language = FALSE)
 		}
 	}
 
-	$language_code = get_instance()->config->item('language_code');
+	$language_code = get_instance()->config->get('language_code');
 
 	return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code;
 }
 
-function current_language($load_system_language = FALSE)
+function current_language(bool $load_system_language = FALSE): string
 {
-	$employee = get_instance()->Employee;
+	$employee = model(Employee::class);
 
 	// Returns the language of the employee if set or system language if not
-	if($employee->is_logged_in() && $load_system_language != TRUE)
+	if($employee->is_logged_in() && $load_system_language != TRUE)	//TODO: !==
 	{
 		$employee_info = $employee->get_logged_in_employee_info();
+
 		if(property_exists($employee_info, 'language') && !empty($employee_info->language))
 		{
 			return $employee_info->language;
 		}
 	}
 
-	$language = get_instance()->config->item('language');
+	$language = get_instance()->config->get('language');
 
 	return empty($language) ? DEFAULT_LANGUAGE : $language;
 }
 
-function get_languages()
+function get_languages(): array
 {
-	return array(
+	return [
 		'ar-EG:arabic' => 'Arabic (Egypt)',
 		'ar-LB:arabic' => 'Arabic (Lebanon)',
 		'az-AZ:azerbaijani' => 'Azerbaijani (Azerbaijan)',
@@ -97,14 +98,14 @@ function get_languages()
 		'vi:vietnamese' => 'Vietnamese',
 		'zh-Hans:simplified-chinese' => 'Chinese Simplified Script',
 		'zh-Hant:traditional-chinese' => 'Chinese Traditional Script'
-	);
+	];
 }
 
-function load_language($load_system_language = FALSE, array $lang_array)
+function load_language(array $lang_array, bool $load_system_language = FALSE): void	//TODO: this is not called anywhere in the code.
 {
 	$lang = get_instance()->lang;
 
-	if($load_system_language = TRUE)
+	if($load_system_language)
 	{
 		foreach($lang_array as $language_file)
 		{
@@ -120,9 +121,9 @@ function load_language($load_system_language = FALSE, array $lang_array)
 	}
 }
 
-function get_timezones()
+function get_timezones(): array
 {
-	return array(
+	return [
 		'Pacific/Midway' => '(GMT-11:00) Midway Island, Samoa',
 		'America/Adak' => '(GMT-10:00) Hawaii-Aleutian',
 		'Etc/GMT+10' => '(GMT-10:00) Hawaii',
@@ -185,7 +186,6 @@ function get_timezones()
 		'Asia/Kabul' => '(GMT+04:30) Kabul',
 		'Asia/Baku' => '(GMT+04:00) Baku',
 		'Asia/Yekaterinburg' => '(GMT+05:00) Ekaterinburg',
-		'Asia/Karachi' => '(GMT+05:00) Karachi, Islamabad',
 		'Asia/Tashkent' => '(GMT+05:00) Tashkent',
 		'Asia/Kolkata' => '(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi',
 		'Asia/Katmandu' => '(GMT+05:45) Kathmandu',
@@ -216,12 +216,12 @@ function get_timezones()
 		'Pacific/Chatham' => '(GMT+12:45) Chatham Islands',
 		'Pacific/Tongatapu' => '(GMT+13:00) Nuku\'alofa',
 		'Pacific/Kiritimati' => '(GMT+14:00) Kiritimati'
-	);
+	];
 }
 
-function get_dateformats()
+function get_dateformats(): array
 {
-	return array(
+	return [
 		'd/m/Y' => 'dd/mm/yyyy',
 		'd.m.Y' => 'dd.mm.yyyy',
 		'm/d/Y' => 'mm/dd/yyyy',
@@ -229,153 +229,134 @@ function get_dateformats()
 		'd/m/y' => 'dd/mm/yy',
 		'm/d/y' => 'mm/dd/yy',
 		'y/m/d' => 'yy/mm/dd'
-	);
+	];
 }
 
-function get_timeformats()
+function get_timeformats(): array
 {
-	return array(
+	return [
 		'H:i:s' => 'hh:mm:ss (24h)',
 		'h:i:s a' => 'hh:mm:ss am/pm',
 		'h:i:s A' => 'hh:mm:ss AM/PM'
-	);
+	];
 }
 
 
-/*
- Gets the payment options
+/**
+ * Gets the payment options
  */
-function get_payment_options()
+function get_payment_options(): array
 {
-	$config = get_instance()->config;
-	$lang = get_instance()->lang;
-
 	$payments = [];
 
-
-	if($config->item('payment_options_order') == 'debitcreditcash')
+//TODO: This needs to be switched to a switch statement
+	if(config('OSPOS')->payment_options_order == 'debitcreditcash')	//TODO: ===
 	{
-		$payments[$lang->line('sales_debit')] = $lang->line('sales_debit');
-		$payments[$lang->line('sales_credit')] = $lang->line('sales_credit');
-		$payments[$lang->line('sales_cash')] = $lang->line('sales_cash');
+		$payments[lang('Sales.debit')] = lang('Sales.debit');
+		$payments[lang('Sales.credit')] = lang('Sales.credit');
+		$payments[lang('Sales.cash')] = lang('Sales.cash');
 	}
-	elseif($config->item('payment_options_order') == 'debitcashcredit')
+	elseif(config('OSPOS')->payment_options_order == 'debitcashcredit')	//TODO: ===
 	{
-		$payments[$lang->line('sales_debit')] = $lang->line('sales_debit');
-		$payments[$lang->line('sales_cash')] = $lang->line('sales_cash');
-		$payments[$lang->line('sales_credit')] = $lang->line('sales_credit');
+		$payments[lang('Sales.debit')] = lang('Sales.debit');
+		$payments[lang('Sales.cash')] = lang('Sales.cash');
+		$payments[lang('Sales.credit')] = lang('Sales.credit');
 	}
-	elseif($config->item('payment_options_order') == 'creditdebitcash')
+	elseif(config('OSPOS')->payment_options_order == 'creditdebitcash')	//TODO: ===
 	{
-		$payments[$lang->line('sales_credit')] = $lang->line('sales_credit');
-		$payments[$lang->line('sales_debit')] = $lang->line('sales_debit');
-		$payments[$lang->line('sales_cash')] = $lang->line('sales_cash');
+		$payments[lang('Sales.credit')] = lang('Sales.credit');
+		$payments[lang('Sales.debit')] = lang('Sales.debit');
+		$payments[lang('Sales.cash')] = lang('Sales.cash');
 	}
-	elseif($config->item('payment_options_order') == 'creditcashdebit')
+	elseif(config('OSPOS')->payment_options_order == 'creditcashdebit')	//TODO: ===
 	{
-		$payments[$lang->line('sales_credit')] = $lang->line('sales_credit');
-		$payments[$lang->line('sales_cash')] = $lang->line('sales_cash');
-		$payments[$lang->line('sales_debit')] = $lang->line('sales_debit');
+		$payments[lang('Sales.credit')] = lang('Sales.credit');
+		$payments[lang('Sales.cash')] = lang('Sales.cash');
+		$payments[lang('Sales.debit')] = lang('Sales.debit');
 	}
-	else // default: if($config->item('payment_options_order') == 'cashdebitcredit')
+	else // default: if(config('OSPOS')->payment_options_order == 'cashdebitcredit')
 	{
-		$payments[$lang->line('sales_cash')] = $lang->line('sales_cash');
-		$payments[$lang->line('sales_debit')] = $lang->line('sales_debit');
-		$payments[$lang->line('sales_credit')] = $lang->line('sales_credit');
+		$payments[lang('Sales.cash')] = lang('Sales.cash');
+		$payments[lang('Sales.debit')] = lang('Sales.debit');
+		$payments[lang('Sales.credit')] = lang('Sales.credit');
 	}
 
-	$payments[$lang->line('sales_due')] = $lang->line('sales_due');
-	$payments[$lang->line('sales_check')] = $lang->line('sales_check');
+	$payments[lang('Sales.due')] = lang('Sales.due');
+	$payments[lang('Sales.check')] = lang('Sales.check');
 
 	// If India (list of country codes include India) then include Unified Payment Interface
-	if (stripos(get_instance()->config->item('country_codes'), 'IN') !== false)
+	if (stripos(get_instance()->config->get('country_codes'), 'IN') !== false)
 	{
-		$payments[$lang->line('sales_upi')] = $lang->line('sales_upi');
+		$payments[lang('Sales.upi')] = lang('Sales.upi');
 	}
 
 	return $payments;
 }
 
-function currency_side()
+function currency_side(): bool
 {
-	$config = get_instance()->config;
-
-	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::CURRENCY);
-	$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
+	$fmt = new NumberFormatter(config('OSPOS')->number_locale, NumberFormatter::CURRENCY);
+	$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, config('OSPOS')->currency_symbol);
 
 	return !preg_match('/^¤/', $fmt->getPattern());
 }
 
-function quantity_decimals()
+function quantity_decimals(): int
 {
-	$config = get_instance()->config;
-
-	return $config->item('quantity_decimals') ? $config->item('quantity_decimals') : 0;
+	return config('OSPOS')->quantity_decimals ? config('OSPOS')->quantity_decimals : 0;
 }
 
-function totals_decimals()
+function totals_decimals(): int
 {
-	$config = get_instance()->config;
-
-	return $config->item('currency_decimals') ? $config->item('currency_decimals') : 0;
+	return config('OSPOS')->currency_decimals ? (int)config('OSPOS')->currency_decimals : 0;
 }
 
-function cash_decimals()
+function cash_decimals(): int
 {
-	$config = get_instance()->config;
-
-	return $config->item('cash_decimals') ? $config->item('cash_decimals') : 0;
+	return config('OSPOS')->cash_decimals ? config('OSPOS')->cash_decimals : 0;
 }
 
-function tax_decimals()
+function tax_decimals(): int
 {
-	$config = get_instance()->config;
-
-	return $config->item('tax_decimals') ? $config->item('tax_decimals') : 0;
+	return config('OSPOS')->tax_decimals ? config('OSPOS')->tax_decimals : 0;
 }
 
-function to_date($date = DEFAULT_DATE)
+function to_date(int $date = DEFAULT_DATE): string
 {
-	$config = get_instance()->config;
-
-	return date($config->item('dateformat'), $date);
+	return date(config('OSPOS')->dateformat, $date);
 }
 
-function to_datetime($datetime = DEFAULT_DATETIME)
+function to_datetime(int $datetime = DEFAULT_DATETIME): string
 {
-	$config = get_instance()->config;
-
-	return date($config->item('dateformat') . ' ' . $config->item('timeformat'), $datetime);
+	return date(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat, $datetime);
 }
 
-function to_currency($number)
+function to_currency(float $number): string
 {
-	return to_decimals($number, 'currency_decimals', \NumberFormatter::CURRENCY);
+	return to_decimals($number, 'currency_decimals', NumberFormatter::CURRENCY);
 }
 
-function to_currency_no_money($number)
+function to_currency_no_money(float $number): string
 {
 	return to_decimals($number, 'currency_decimals');
 }
 
-function to_currency_tax($number)
+function to_currency_tax(float $number): string
 {
-	$config = get_instance()->config;
-
-	if($config->item('tax_included') == '1')
+	if(config('OSPOS')->tax_included)	//TODO: ternary notation
 	{
-		return to_decimals($number, 'tax_decimals', \NumberFormatter::CURRENCY);
+		return to_decimals($number, 'tax_decimals', NumberFormatter::CURRENCY);
 	}
 	else
 	{
-		return to_decimals($number, 'currency_decimals', \NumberFormatter::CURRENCY);
+		return to_decimals($number, 'currency_decimals', NumberFormatter::CURRENCY);
 	}
 }
 
-function to_tax_decimals($number)
+function to_tax_decimals(float $number): string
 {
 	// taxes that are NULL, '' or 0 don't need to be displayed
-	// NOTE: do not remove this line otherwise the items edit form will show a tax with 0 and it will save it
+	// NOTE: do not remove this line otherwise the items edit form will show a tax with 0, and it will save it
 	if(empty($number))
 	{
 		return $number;
@@ -384,12 +365,12 @@ function to_tax_decimals($number)
 	return to_decimals($number, 'tax_decimals');
 }
 
-function to_quantity_decimals($number)
+function to_quantity_decimals(float $number): string
 {
 	return to_decimals($number, 'quantity_decimals');
 }
 
-function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
+function to_decimals(float $number, string $decimals = NULL, int $type = NumberFormatter::DECIMAL): string
 {
 	// ignore empty strings and return
 	// NOTE: do not change it to empty otherwise tables will show a 0 with no decimal nor currency symbol
@@ -398,31 +379,39 @@ function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
 		return $number;
 	}
 
-	$config = get_instance()->config;
-	$fmt = new \NumberFormatter($config->item('number_locale'), $type);
-	$fmt->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : $config->item($decimals));
-	$fmt->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : $config->item($decimals));
+	$fmt = new NumberFormatter(config('OSPOS')->number_locale, $type);
+	$fmt->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : config('OSPOS')->$decimals);
+	$fmt->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, empty($decimals) ? DEFAULT_PRECISION : config('OSPOS')->$decimals);
 
-	if(empty($config->item('thousands_separator')))
+	if(empty(config('OSPOS')->thousands_separator))
 	{
-		$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
+		$fmt->setAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
 	}
-	$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
+	$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, config('OSPOS')->currency_symbol);
 
 	return $fmt->format($number);
 }
 
-function parse_quantity($number)
+function parse_quantity(string $number): float
 {
 	return parse_decimals($number, quantity_decimals());
 }
 
-function parse_tax($number)
+/**
+ * @param string $number
+ * @return false|float|int|mixed|string
+ */
+function parse_tax(string $number)
 {
 	return parse_decimals($number, tax_decimals());
 }
 
-function parse_decimals($number, $decimals = NULL)
+/**
+ * @param string $number
+ * @param int|NULL $decimals
+ * @return false|float|int|mixed|string
+ */
+function parse_decimals(string $number, int $decimals = NULL)
 {
 	// ignore empty strings and return
 	if(empty($number))
@@ -440,18 +429,16 @@ function parse_decimals($number, $decimals = NULL)
 		return FALSE;
 	}
 
-	$config = get_instance()->config;
-
 	if($decimals === NULL)
 	{
-		$decimals = $config->item('currency_decimals');
+		$decimals = config('OSPOS')->currency_decimals;	//TODO: $decimals is never used.
 	}
 
-	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::DECIMAL);
+	$fmt = new NumberFormatter(config('OSPOS')->number_locale, NumberFormatter::DECIMAL);
 
-	if(empty($config->item('thousands_separator')))
+	if(empty(config('OSPOS')->thousands_separator))
 	{
-		$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
+		$fmt->setAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
 	}
 
 	try
@@ -464,13 +451,12 @@ function parse_decimals($number, $decimals = NULL)
 	}
 }
 
-/*
+/**
  * Time locale conversion utility
  */
-
-function dateformat_momentjs($php_format)
+function dateformat_momentjs(string $php_format): string
 {
-	$SYMBOLS_MATCHING = array(
+	$SYMBOLS_MATCHING = [
 		'd' => 'DD',
 		'D' => 'ddd',
 		'j' => 'D',
@@ -508,17 +494,16 @@ function dateformat_momentjs($php_format)
 		'c' => '', // no equivalent
 		'r' => '', // no equivalent
 		'U' => 'X'
-	);
+	];
 
 	return strtr($php_format, $SYMBOLS_MATCHING);
 }
 
-function dateformat_mysql()
+function dateformat_mysql(): string
 {
-	$config = get_instance()->config;
-	$php_format = $config->item('dateformat');
+	$php_format = config('OSPOS')->dateformat;
 
-	$SYMBOLS_MATCHING = array(
+	$SYMBOLS_MATCHING = [
 		// Day
 		'd' => '%d',
 		'D' => '%a',
@@ -552,14 +537,14 @@ function dateformat_mysql()
 		'i' => '%i',
 		's' => '%S',
 		'u' => '%f'
-	);
+	];
 
 	return strtr($php_format, $SYMBOLS_MATCHING);
 }
 
-function dateformat_bootstrap($php_format)
+function dateformat_bootstrap(string $php_format): string
 {
-	$SYMBOLS_MATCHING = array(
+	$SYMBOLS_MATCHING = [
 		// Day
 		'd' => 'dd',
 		'D' => 'd',
@@ -593,20 +578,17 @@ function dateformat_bootstrap($php_format)
 		'i' => 'ii',
 		's' => 'ss',
 		'u' => ''
-	);
+	];
 
 	return strtr($php_format, $SYMBOLS_MATCHING);
 }
 
-function valid_date($date)
+function valid_date(string $date): bool	//TODO: need a better name for $date.  Perhaps $candidate. Also the function name would be better as is_valid_date()
 {
-	$config = get_instance()->Appconfig;
-	return (DateTime::createFromFormat($config->get('dateformat'), $date));
+	return (DateTime::createFromFormat(config('OSPOS')->dateformat, $date));
 }
 
-function valid_decimal($decimal)
+function valid_decimal(string $decimal): bool	//TODO: need a better name for $decimal.  Perhaps $candidate. Also the function name would be better as is_valid_decimal()
 {
 	return (preg_match('/^(\d*\.)?\d+$/', $decimal) === 1);
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Helpers/migration_helper.php b/app/Helpers/migration_helper.php
index fd7a11176..7b41526fa 100644
--- a/app/Helpers/migration_helper.php
+++ b/app/Helpers/migration_helper.php
@@ -1,13 +1,12 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+use Config\Database;
 
 /**
  * Migration helper
  */
-
-function execute_script($path)
+function execute_script(string $path): void
 {
-	$CI =& get_instance();
-
 	$version = preg_replace("/(.*_)?(.*).sql/", "$2", $path);
 	error_log("Migrating to $version (file: $path)");
 
@@ -21,20 +20,20 @@ function execute_script($path)
 	$sqls = explode(';', $sql);
 	array_pop($sqls);
 
+	$db = Database::connect();
+
 	foreach($sqls as $statement)
 	{
-		$statement = $statement . ';';
+		$statement = $statement . ';';	//TODO: Can use string interpolation here
 
-		if(!$CI->db->simple_query($statement))
+		if(!$db->simpleQuery($statement))
 		{
-			foreach($CI->db->error() as $error)
+			foreach($db->error() as $error)
 			{
-				error_log('error: ' . $error);
+				error_log('error: ' . $error);	//TODO: Can use string interpolation here
 			}
 		}
 	}
 
 	error_log("Migrated to $version");
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Helpers/report_helper.php b/app/Helpers/report_helper.php
index a4cc8bb33..574786c83 100644
--- a/app/Helpers/report_helper.php
+++ b/app/Helpers/report_helper.php
@@ -1,32 +1,39 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+use app\Models\Employee;
 
 /**
  * Report helper
+ *
+ * @param string $report_prefix
+ * @param string $report_name
+ * @param int $person_id
+ * @param string $permission_id
+ *
+ * @property employee $employee
  */
-
-function show_report_if_allowed($report_prefix, $report_name, $person_id, $permission_id = '')
+function show_report_if_allowed(string $report_prefix, string $report_name, int $person_id, string $permission_id = ''): void
 {
-	$CI =& get_instance();
+	$permission_id = empty($permission_id) ? 'reports_' . $report_name : $permission_id;    //TODO: Use String Interpolation here.
+	$employee = model(Employee::class);
 
-	$permission_id = empty($permission_id) ? 'reports_' . $report_name : $permission_id;
-	if($CI->Employee->has_grant($permission_id, $person_id))
+	if($employee->has_grant($permission_id, $person_id))
 	{
 		show_report($report_prefix, $report_name, $permission_id);
 	}
 }
 
-function show_report($report_prefix, $report_name, $lang_key='')
+function show_report(string $report_prefix, string $report_name, string $lang_key = ''): void
 {
-	$CI =& get_instance();
-
 	$lang_key = empty($lang_key) ? $report_name : $lang_key;
-	$report_label = $CI->lang->line($lang_key);
-	$report_prefix = empty($report_prefix) ? '' : $report_prefix . '_';
+	$report_label = lang($lang_key);
+	$report_prefix = empty($report_prefix) ? '' : $report_prefix . '.';
+
 	// no summary nor detailed reports for receivings
-	if(!empty($report_label) && $report_label != $lang_key . ' (TBD)')
-	{
+	if(!empty($report_label) && $report_label != $lang_key . ' (TBD)')	//TODO: String Interpolation.  Also !==
+	{//TODO: Is there a better way to do this?  breaking the php like this makes it more difficult to read.
 		?>
-			<a class="list-group-item" href="<?php echo site_url('reports/' . $report_prefix . preg_replace('/reports_(.*)/', '$1', $report_name));?>"><?php echo $report_label; ?></a>
+			<a class="list-group-item" href="<?php echo site_url('reports/' . $report_prefix . preg_replace('/reports_(.*)/', '$1', $report_name)) ?>"><?php echo $report_label; ?></a>
 		<?php
 	}
 }
diff --git a/app/Helpers/tabular_helper.php b/app/Helpers/tabular_helper.php
index 9e62e73e0..33d2e8b84 100644
--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -1,96 +1,100 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+use app\Models\Attribute;
+use app\Models\Employee;
+use app\Models\Item_taxes;
+use app\Models\Tax_category;
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Session\Session;
 
 /**
  * Tabular views helper
  */
 
-/*
-Basic tabular headers function
-*/
-function transform_headers_readonly($array)
+/**
+ * Basic tabular headers function
+ */
+function transform_headers_readonly(array $array): string	//TODO: $array needs to be refactored to a new name.  Perhaps $headers?
 {
-	$result = array();
+	$result = [];
 
 	foreach($array as $key => $value)
 	{
-		$result[] = array('field' => $key, 'title' => $value, 'sortable' => $value != '', 'switchable' => !preg_match('(^$|&nbsp)', $value));
+		$result[] = ['field' => $key, 'title' => $value, 'sortable' => $value != '', 'switchable' => !preg_match('(^$|&nbsp)', $value)];
 	}
 
 	return json_encode($result);
 }
 
-/*
-Basic tabular headers function
-*/
-function transform_headers($array, $readonly = FALSE, $editable = TRUE)
+/**
+ * Basic tabular headers function
+ */
+function transform_headers(array $array, bool $readonly = FALSE, bool $editable = TRUE): string	//TODO: $array needs to be refactored to a new name.  Perhaps $headers?
 {
-	$result = array();
+	$result = [];
 
 	if(!$readonly)
 	{
-		$array = array_merge(array(array('checkbox' => 'select', 'sortable' => FALSE)), $array);
+		$array = array_merge ([['checkbox' => 'select', 'sortable' => FALSE]], $array);
 	}
 
 	if($editable)
 	{
-		$array[] = array('edit' => '');
+		$array[] = ['edit' => ''];
 	}
 
-	foreach($array as $element)
+	foreach($array as $element)	//TODO: This might be clearer to refactor this to `foreach($headers as $header)`
 	{
 		reset($element);
-		$result[] = array('field' => key($element),
+		$result[] = [
+			'field' => key($element),
 			'title' => current($element),
-			'switchable' => isset($element['switchable']) ? $element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
-			'escape' => !preg_match("/(edit|phone_number|email|messages|item_pic)/", key($element)) && !(isset($element['escape']) && !$element['escape']),
-			'sortable' => isset($element['sortable']) ? $element['sortable'] : current($element) != '',
-			'checkbox' => isset($element['checkbox']) ? $element['checkbox'] : FALSE,
+			'switchable' => $element['switchable'] ?? !preg_match('(^$|&nbsp)', current($element)),
+			'sortable' => $element['sortable'] ?? current($element) != '',
+			'checkbox' => $element['checkbox'] ?? FALSE,
 			'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ? 'print_hide' : '',
-			'sorter' => isset($element['sorter']) ? $element ['sorter'] : '');
+			'sorter' => $element ['sorter'] ?? ''
+		];
 	}
 
 	return json_encode($result);
 }
 
-
-/*
-Get the header for the sales tabular view
-*/
-function get_sales_manage_table_headers()
+/**
+ * Get the header for the sales tabular view
+ */
+function get_sales_manage_table_headers(): string
 {
-	$CI =& get_instance();
+	$headers = [
+		['sale_id' => lang('Common.id')],
+		['sale_time' => lang('Sales.sale_time')],
+		['customer_name' => lang('Customers.customer')],
+		['amount_due' => lang('Sales.amount_due')],
+		['amount_tendered' => lang('Sales.amount_tendered')],
+		['change_due' => lang('Sales.change_due')],
+		['payment_type' => lang('Sales.payment_type')]
+	];
 
-	$headers = array(
-		array('sale_id' => $CI->lang->line('common_id')),
-		array('sale_time' => $CI->lang->line('sales_sale_time')),
-		array('customer_name' => $CI->lang->line('customers_customer')),
-		array('amount_due' => $CI->lang->line('sales_amount_due')),
-		array('amount_tendered' => $CI->lang->line('sales_amount_tendered')),
-		array('change_due' => $CI->lang->line('sales_change_due')),
-		array('payment_type' => $CI->lang->line('sales_payment_type'))
-	);
-
-	if($CI->config->item('invoice_enable') == TRUE)
+	if(config('OSPOS')->invoice_enable)
 	{
-		$headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number'));
-		$headers[] = array('invoice' => '&nbsp', 'sortable' => FALSE, 'escape' => FALSE);
+		$headers[] = ['invoice_number' => lang('Sales.invoice_number')];
+		$headers[] = ['invoice' => '&nbsp', 'sortable' => FALSE];
 	}
 
-	$headers[] = array('receipt' => '&nbsp', 'sortable' => FALSE, 'escape' => FALSE);
+	$headers[] = ['receipt' => '&nbsp', 'sortable' => FALSE];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the sales
-*/
-function get_sale_data_row($sale)
+/**
+ * Get the html data row for the sales
+ */
+function get_sale_data_row(object $sale): array
 {
-	$CI =& get_instance();
+	$uri = current_url(true);
+	$controller_name = $uri->getSegment(1);
 
-	$controller_name = $CI->uri->segment(1);
-
-	$row = array (
+	$row = [
 		'sale_id' => $sale->sale_id,
 		'sale_time' => to_datetime(strtotime($sale->sale_time)),
 		'customer_name' => $sale->customer_name,
@@ -98,206 +102,254 @@ function get_sale_data_row($sale)
 		'amount_tendered' => to_currency($sale->amount_tendered),
 		'change_due' => to_currency($sale->change_due),
 		'payment_type' => $sale->payment_type
-	);
+	];
 
-	if($CI->config->item('invoice_enable'))
+	if(config('OSPOS')->invoice_enable)
 	{
 		$row['invoice_number'] = $sale->invoice_number;
-		$row['invoice'] = empty($sale->invoice_number) ? '' : anchor($controller_name."/invoice/$sale->sale_id", '<span class="glyphicon glyphicon-list-alt"></span>',
-			array('title'=>$CI->lang->line('sales_show_invoice'))
-		);
+		$row['invoice'] = empty($sale->invoice_number)
+			? ''
+			: anchor(
+				$controller_name."/invoice/$sale->sale_id",
+				'<span class="glyphicon glyphicon-list-alt"></span>',
+				['title'=>lang('Sales.show_invoice')]
+			);
 	}
 
-	$row['receipt'] = anchor($controller_name."/receipt/$sale->sale_id", '<span class="glyphicon glyphicon-usd"></span>',
-		array('title' => $CI->lang->line('sales_show_receipt'))
+	$row['receipt'] = anchor(
+		$controller_name."/receipt/$sale->sale_id",
+		'<span class="glyphicon glyphicon-usd"></span>',
+		['title' => lang('Sales.show_receipt')]
 	);
-	$row['edit'] = anchor($controller_name."/edit/$sale->sale_id", '<span class="glyphicon glyphicon-edit"></span>',
-		array('class' => 'modal-dlg print_hide', 'data-btn-delete' => $CI->lang->line('common_delete'), 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_update'))
+	$row['edit'] = anchor(
+		$controller_name."/edit/$sale->sale_id",
+		'<span class="glyphicon glyphicon-edit"></span>',
+		[
+			'class' => 'modal-dlg print_hide',
+			'data-btn-delete' => lang('Common.delete'),
+			'data-btn-submit' => lang('Common.submit'),
+			'title' => lang($controller_name . '.update')
+		]
 	);
 
 	return $row;
 }
 
-/*
-Get the html data last row for the sales
-*/
-function get_sale_data_last_row($sales)
+/**
+ * Get the html data last row for the sales
+ */
+function get_sale_data_last_row(ResultInterface $sales): array
 {
-	$CI =& get_instance();
-
 	$sum_amount_due = 0;
 	$sum_amount_tendered = 0;
 	$sum_change_due = 0;
 
-	foreach($sales->result() as $key=>$sale)
+	foreach($sales->getResult() as $key => $sale)
 	{
 		$sum_amount_due += $sale->amount_due;
 		$sum_amount_tendered += $sale->amount_tendered;
 		$sum_change_due += $sale->change_due;
 	}
 
-	return array(
+	return [
 		'sale_id' => '-',
-		'sale_time' => $CI->lang->line('sales_total'),
-		'amount_due' => to_currency($sum_amount_due),
-		'amount_tendered' => to_currency($sum_amount_tendered),
-		'change_due' => to_currency($sum_change_due)
-	);
+		'sale_time' => '<b>'.lang('Sales.total').'</b>',
+		'amount_due' => '<b>'.to_currency($sum_amount_due).'</b>',
+		'amount_tendered' => '<b>'. to_currency($sum_amount_tendered).'</b>',
+		'change_due' => '<b>'.to_currency($sum_change_due).'</b>'
+	];
 }
 
-/*
-Get the sales payments summary
-*/
-function get_sales_manage_payments_summary($payments)
+/**
+ * Get the sales payments summary
+ */
+function get_sales_manage_payments_summary(array $payments): string
 {
-	$CI =& get_instance();
-
 	$table = '<div id="report_summary">';
 	$total = 0;
 
-	foreach($payments as $key=>$payment)
+	foreach($payments as $key => $payment)
 	{
 		$amount = $payment['payment_amount'];
 		$total = bcadd($total, $amount);
 		$table .= '<div class="summary_row">' . $payment['payment_type'] . ': ' . to_currency($amount) . '</div>';
 	}
-	$table .= '<div class="summary_row">' . $CI->lang->line('sales_total') . ': ' . to_currency($total) . '</div>';
+
+	$table .= '<div class="summary_row">' . lang('Sales.total') . ': ' . to_currency($total) . '</div>';
 	$table .= '</div>';
 
 	return $table;
 }
 
-
-/*
-Get the header for the people tabular view
-*/
-function get_people_manage_table_headers()
+/**
+ * Get the header for the people tabular view
+ *
+ * @property employee $employee
+ * @property session $session
+ */
+function get_people_manage_table_headers(): string
 {
-	$CI =& get_instance();
+	$headers = [
+		['people.person_id' => lang('Common.id')],
+		['last_name' => lang('Common.last_name')],
+		['first_name' => lang('Common.first_name')],
+		['email' => lang('Common.email')],
+		['phone_number' => lang('Common.phone_number')]
+	];
 
-	$headers = array(
-		array('people.person_id' => $CI->lang->line('common_id')),
-		array('last_name' => $CI->lang->line('common_last_name')),
-		array('first_name' => $CI->lang->line('common_first_name')),
-		array('email' => $CI->lang->line('common_email')),
-		array('phone_number' => $CI->lang->line('common_phone_number'))
-	);
+	$employee = model(Employee::class);
+	$session = session();
 
-	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	if($employee->has_grant('messages', $session->get('person_id')))
 	{
-		$headers[] = array('messages' => '', 'sortable' => FALSE);
+		$headers[] = ['messages' => '', 'sortable' => FALSE];
 	}
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the person
-*/
-function get_person_data_row($person)
+/**
+ * Get the html data row for the person
+ */
+function get_person_data_row(object $person): array
 {
-	$CI =& get_instance();
-	$controller_name = strtolower(get_class($CI));
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	return array (
+	return [
 		'people.person_id' => $person->person_id,
 		'last_name' => $person->last_name,
 		'first_name' => $person->first_name,
 		'email' => empty($person->email) ? '' : mailto($person->email, $person->email),
 		'phone_number' => $person->phone_number,
-		'messages' => empty($person->phone_number) ? '' : anchor("Messages/view/$person->person_id", '<span class="glyphicon glyphicon-phone"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line('messages_sms_send'))),
-		'edit' => anchor($controller_name."/view/$person->person_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'messages' => empty($person->phone_number)
+			? ''
+			: anchor(
+				"Messages/view/$person->person_id",
+				'<span class="glyphicon glyphicon-phone"></span>',
+				[
+					'class' => 'modal-dlg',
+					'data-btn-submit' => lang('Common.submit'),
+					'title'=>lang('Messages.sms_send')
+				]
+			),
+		'edit' => anchor(
+			$controller_name."/view/$person->person_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+					'class' => 'modal-dlg',
+					'data-btn-submit' => lang('Common.submit'),
+					'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-
-/*
-Get the header for the customer tabular view
-*/
-function get_customer_manage_table_headers()
+/**
+ * Get the header for the customer tabular view
+ *
+ * @property employee $employee
+ * @property session $session
+ */
+function get_customer_manage_table_headers(): string
 {
-	$CI =& get_instance();
+	$headers = [
+		['people.person_id' => lang('Common.id')],
+		['last_name' => lang('Common.last_name')],
+		['first_name' => lang('Common.first_name')],
+		['email' => lang('Common.email')],
+		['phone_number' => lang('Common.phone_number')],
+		['total' => lang('Common.total_spent'), 'sortable' => FALSE]
+	];
 
-	$headers = array(
-		array('people.person_id' => $CI->lang->line('common_id')),
-		array('last_name' => $CI->lang->line('common_last_name')),
-		array('first_name' => $CI->lang->line('common_first_name')),
-		array('email' => $CI->lang->line('common_email')),
-		array('phone_number' => $CI->lang->line('common_phone_number')),
-		array('total' => $CI->lang->line('common_total_spent'), 'sortable' => FALSE)
-	);
+	$employee = model(Employee::class);
+	$session = session();
 
-	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	if($employee->has_grant('messages', $session->get('person_id')))
 	{
-		$headers[] = array('messages' => '', 'sortable' => FALSE);
+		$headers[] = ['messages' => '', 'sortable' => FALSE];
 	}
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the customer
-*/
-function get_customer_data_row($person, $stats)
+/**
+ * Get the html data row for the customer
+ */
+function get_customer_data_row(object $person, object $stats): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'people.person_id' => $person->person_id,
 		'last_name' => $person->last_name,
 		'first_name' => $person->first_name,
 		'email' => empty($person->email) ? '' : mailto($person->email, $person->email),
 		'phone_number' => $person->phone_number,
 		'total' => to_currency($stats->total),
-		'messages' => empty($person->phone_number) ? '' : anchor("Messages/view/$person->person_id", '<span class="glyphicon glyphicon-phone"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line('messages_sms_send'))),
-		'edit' => anchor($controller_name."/view/$person->person_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
-	));
+		'messages' => empty($person->phone_number)
+			? ''
+			: anchor(
+				"Messages/view/$person->person_id",	//TODO: String interpolation
+				'<span class="glyphicon glyphicon-phone"></span>',
+				[
+					'class' => 'modal-dlg',
+					'data-btn-submit' => lang('Common.submit'),
+					'title'=>lang('Messages.sms_send')
+				]
+			),
+		'edit' => anchor(
+			$controller_name."/view/$person->person_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
+		)
+	];
 }
 
-
-/*
-Get the header for the suppliers tabular view
-*/
-function get_suppliers_manage_table_headers()
+/**
+ * Get the header for the suppliers tabular view
+ *
+ * @property employee $employee
+ * @property session $session
+ */
+function get_suppliers_manage_table_headers(): string
 {
-	$CI =& get_instance();
+	$headers = [
+		['people.person_id' => lang('Common.id')],
+		['company_name' => lang('Suppliers.company_name')],
+		['agency_name' => lang('Suppliers.agency_name')],
+		['category' => lang('Suppliers.category')],
+		['last_name' => lang('Common.last_name')],
+		['first_name' => lang('Common.first_name')],
+		['email' => lang('Common.email')],
+		['phone_number' => lang('Common.phone_number')]
+	];
 
-	$headers = array(
-		array('people.person_id' => $CI->lang->line('common_id')),
-		array('company_name' => $CI->lang->line('suppliers_company_name')),
-		array('agency_name' => $CI->lang->line('suppliers_agency_name')),
-		array('category' => $CI->lang->line('suppliers_category')),
-		array('last_name' => $CI->lang->line('common_last_name')),
-		array('first_name' => $CI->lang->line('common_first_name')),
-		array('email' => $CI->lang->line('common_email')),
-		array('phone_number' => $CI->lang->line('common_phone_number'))
-	);
+	$employee = model(Employee::class);
+	$session = session();
 
-	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	if($employee->has_grant('messages', $session->get('person_id')))
 	{
-		$headers[] = array('messages' => '');
+		$headers[] = ['messages' => ''];
 	}
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the supplier
-*/
-function get_supplier_data_row($supplier)
+/**
+ * Get the html data row for the supplier
+ */
+function get_supplier_data_row(object $supplier): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'people.person_id' => $supplier->person_id,
 		'company_name' => $supplier->company_name,
 		'agency_name' => $supplier->agency_name,
@@ -306,96 +358,120 @@ function get_supplier_data_row($supplier)
 		'first_name' => $supplier->first_name,
 		'email' => empty($supplier->email) ? '' : mailto($supplier->email, $supplier->email),
 		'phone_number' => $supplier->phone_number,
-		'messages' => empty($supplier->phone_number) ? '' : anchor("Messages/view/$supplier->person_id", '<span class="glyphicon glyphicon-phone"></span>',
-			array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line('messages_sms_send'))),
-		'edit' => anchor($controller_name."/view/$supplier->person_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update')))
-	);
+		'messages' => empty($supplier->phone_number)
+			? ''
+			: anchor(
+				"Messages/view/$supplier->person_id",
+				'<span class="glyphicon glyphicon-phone"></span>',
+				[
+					'class'=>"modal-dlg",
+					'data-btn-submit' => lang('Common.submit'),
+					'title'=>lang('Messages.sms_send')
+				]
+			),
+		'edit' => anchor(
+			$controller_name."/view/$supplier->person_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class'=>"modal-dlg",
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
+		)
+	];
 }
 
-
-/*
-Get the header for the items tabular view
-*/
-function get_items_manage_table_headers()
+/**
+ * Get the header for the items tabular view
+ *
+ * @property attribute $attribute
+ */
+function get_items_manage_table_headers(): string
 {
-	$CI =& get_instance();
+	$attribute = model(Attribute::class);
 
-	$definition_names = $CI->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+	$definition_names = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS);	//TODO: this should be made into a constant in constants.php
 
-	$headers = array(
-		array('items.item_id' => $CI->lang->line('common_id')),
-		array('item_number' => $CI->lang->line('items_item_number')),
-		array('name' => $CI->lang->line('items_name')),
-		array('category' => $CI->lang->line('items_category')),
-		array('company_name' => $CI->lang->line('suppliers_company_name')),
-		array('cost_price' => $CI->lang->line('items_cost_price')),
-		array('unit_price' => $CI->lang->line('items_unit_price')),
-		array('quantity' => $CI->lang->line('items_quantity'))
-	);
+	$headers = [
+		['items.item_id' => lang('Common.id')],
+		['item_number' => lang('Items.item_number')],
+		['name' => lang('Items.name')],
+		['category' => lang('Items.category')],
+		['company_name' => lang('Suppliers.company_name')],
+		['cost_price' => lang('Items.cost_price')],
+		['unit_price' => lang('Items.unit_price')],
+		['quantity' => lang('Items.quantity')]
+	];
 
-	if($CI->config->item('use_destination_based_tax') == '1')
+	if(config('OSPOS')->use_destination_based_tax)
 	{
-		$headers[] = array('tax_percents' => $CI->lang->line('items_tax_category'), 'sortable' => FALSE);
+		$headers[] = ['tax_percents' => lang('Items.tax_category'), 'sortable' => FALSE];
 	}
 	else
 	{
-		$headers[] = array('tax_percents' => $CI->lang->line('items_tax_percents'), 'sortable' => FALSE);
+		$headers[] = ['tax_percents' => lang('Items.tax_percents'), 'sortable' => FALSE];
 
 	}
 
-	$headers[] = array('item_pic' => $CI->lang->line('items_image'), 'sortable' => FALSE);
+	$headers[] = ['item_pic' => lang('Items.image'), 'sortable' => FALSE];
 
 	foreach($definition_names as $definition_id => $definition_name)
 	{
-		$headers[] = array($definition_id => $definition_name, 'sortable' => FALSE);
+		$headers[] = [$definition_id => $definition_name, 'sortable' => FALSE];
 	}
 
-	$headers[] = array('inventory' => '', 'escape' => FALSE);
-	$headers[] = array('stock' => '', 'escape' => FALSE);
+	$headers[] = ['inventory' => ''];
+	$headers[] = ['stock' => ''];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the item
-*/
-function get_item_data_row($item)
+/**
+ * Get the html data row for the item
+ *
+ * @property attribute $attribute
+ * @property item_taxes $item_taxes
+ * @property tax_category $tax_category
+ */
+function get_item_data_row(object $item): array
 {
-	$CI =& get_instance();
+	$attribute = model(Attribute::class);
+	$item_taxes = model(Item_taxes::class);
+	$tax_category = model(Tax_category::class);
 
-	if($CI->config->item('use_destination_based_tax') == '1')
+	if(config('OSPOS')->use_destination_based_tax)
 	{
-		if($item->tax_category_id == NULL)
+		if($item->tax_category_id == NULL)	//TODO: === ?
 		{
 			$tax_percents = '-';
 		}
 		else
 		{
-			$tax_category_info = $CI->Tax_category->get_info($item->tax_category_id);
+			$tax_category_info = $tax_category->get_info($item->tax_category_id);
 			$tax_percents = $tax_category_info->tax_category;
 		}
 	}
 	else
 	{
-		$item_tax_info = $CI->Item_taxes->get_info($item->item_id);
+		$item_tax_info = $item_taxes->get_info($item->item_id);
 		$tax_percents = '';
 		foreach($item_tax_info as $tax_info)
 		{
 			$tax_percents .= to_tax_decimals($tax_info['percent']) . '%, ';
 		}
-		// remove ', ' from last item
+		// remove ', ' from last item	//TODO: if this won't be added back into the code then it should be deleted.
 		$tax_percents = substr($tax_percents, 0, -2);
 		$tax_percents = !$tax_percents ? '-' : $tax_percents;
 	}
 
-	$controller_name = strtolower(get_class($CI));
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
 	$image = NULL;
-	if($item->pic_filename != '')
+	if($item->pic_filename != '')	//TODO: !== ?
 	{
 		$ext = pathinfo($item->pic_filename, PATHINFO_EXTENSION);
-		if($ext == '')
+		if($ext == '')	//TODO: Convert to ternary notation. Also === ?
 		{
 			// legacy
 			$images = glob('./uploads/item_pics/' . $item->pic_filename . '.*');
@@ -408,18 +484,18 @@ function get_item_data_row($item)
 
 		if(sizeof($images) > 0)
 		{
-			$image .= '<a class="rollover" href="'. base_url($images[0]) .'"><img src="'.site_url('items/pic_thumb/' . pathinfo($images[0], PATHINFO_BASENAME)) . '"></a>';
+			$image .= '<a class=\'rollover\' href=\''. base_url($images[0]) .'\'><img alt=\'Image thumbnail\' src=\''.site_url('items/pic_thumb/' . pathinfo($images[0], PATHINFO_BASENAME)) . '\'></a>';
 		}
 	}
 
-	if($CI->config->item('multi_pack_enabled') == '1')
+	if(config('OSPOS')->multi_pack_enabled)
 	{
 		$item->name .= NAME_SEPARATOR . $item->pack_name;
 	}
 
-	$definition_names = $CI->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+	$definition_names = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS);
 
-	$columns = array (
+	$columns = [
 		'items.item_id' => $item->item_id,
 		'item_number' => $item->item_number,
 		'name' => $item->name,
@@ -430,108 +506,133 @@ function get_item_data_row($item)
 		'quantity' => to_quantity_decimals($item->quantity),
 		'tax_percents' => !$tax_percents ? '-' : $tax_percents,
 		'item_pic' => $image
-	);
+	];
 
-	$icons = array(
-		'inventory' => anchor($controller_name."/inventory/$item->item_id", '<span class="glyphicon glyphicon-pushpin"></span>',
-			array('class' => 'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_count'))
+	$icons = [
+		'inventory' => anchor(
+			$controller_name."/inventory/$item->item_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-pushpin"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title' => lang($controller_name . '.count')	//TODO: String interpolation
+			]
 		),
-		'stock' => anchor($controller_name."/count_details/$item->item_id", '<span class="glyphicon glyphicon-list-alt"></span>',
-			array('class' => 'modal-dlg', 'title' => $CI->lang->line($controller_name.'_details_count'))
+		'stock' => anchor(
+			$controller_name."/count_details/$item->item_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-list-alt"></span>',
+			[
+				'class' => 'modal-dlg',
+				'title' => lang($controller_name . '.details_count')	//TODO: String interpolation
+			]
 		),
-		'edit' => anchor($controller_name."/view/$item->item_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class' => 'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$item->item_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title' => lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 
 	return $columns + expand_attribute_values($definition_names, (array) $item) + $icons;
-
 }
 
-
-/*
-Get the header for the giftcard tabular view
-*/
-function get_giftcards_manage_table_headers()
+/**
+ * Get the header for the giftcard tabular view
+ */
+function get_giftcards_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('giftcard_id' => $CI->lang->line('common_id')),
-		array('last_name' => $CI->lang->line('common_last_name')),
-		array('first_name' => $CI->lang->line('common_first_name')),
-		array('giftcard_number' => $CI->lang->line('giftcards_giftcard_number')),
-		array('value' => $CI->lang->line('giftcards_card_value'))
-	);
+	$headers = [
+		['giftcard_id' => lang('Common.id')],
+		['last_name' => lang('Common.last_name')],
+		['first_name' => lang('Common.first_name')],
+		['giftcard_number' => lang('Giftcards.giftcard_number')],
+		['value' => lang('Giftcards.card_value')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the giftcard
-*/
-function get_giftcard_data_row($giftcard)
+/**
+ * Get the html data row for the giftcard
+ */
+function get_giftcard_data_row(object $giftcard): array
 {
-	$CI =& get_instance();
 
-	$controller_name=strtolower(get_class($CI));
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	return array (
+	return [
 		'giftcard_id' => $giftcard->giftcard_id,
 		'last_name' => $giftcard->last_name,
 		'first_name' => $giftcard->first_name,
 		'giftcard_number' => $giftcard->giftcard_number,
 		'value' => to_currency($giftcard->value),
-		'edit' => anchor($controller_name."/view/$giftcard->giftcard_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$giftcard->giftcard_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the header for the item kits tabular view
-*/
-function get_item_kits_manage_table_headers()
+/**
+ * Get the header for the item kits tabular view
+ */
+function get_item_kits_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('item_kit_id' => $CI->lang->line('item_kits_kit')),
-		array('item_kit_number' => $CI->lang->line('item_kits_item_kit_number')),
-		array('name' => $CI->lang->line('item_kits_name')),
-		array('description' => $CI->lang->line('item_kits_description')),
-		array('total_cost_price' => $CI->lang->line('items_cost_price'), 'sortable' => FALSE),
-		array('total_unit_price' => $CI->lang->line('items_unit_price'), 'sortable' => FALSE)
-	);
+	$headers = [
+		['item_kit_id' => lang('Item_kits.kit')],
+		['item_kit_number' => lang('Item_kits.item_kit_number')],
+		['name' => lang('Item_kits.name')],
+		['description' => lang('Item_kits.description')],
+		['total_cost_price' => lang('Items.cost_price'), 'sortable' => FALSE],
+		['total_unit_price' => lang('Items.unit_price'), 'sortable' => FALSE]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the item kit
-*/
-function get_item_kit_data_row($item_kit)
+/**
+ * Get the html data row for the item kit
+ */
+function get_item_kit_data_row(object $item_kit): array
 {
-	$CI =& get_instance();
 
-	$controller_name = strtolower(get_class($CI));
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	return array (
+	return [
 		'item_kit_id' => $item_kit->item_kit_id,
 		'item_kit_number' => $item_kit->item_kit_number,
 		'name' => $item_kit->name,
 		'description' => $item_kit->description,
 		'total_cost_price' => to_currency($item_kit->total_cost_price),
 		'total_unit_price' => to_currency($item_kit->total_unit_price),
-		'edit' => anchor($controller_name."/view/$item_kit->item_kit_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$item_kit->item_kit_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-function parse_attribute_values($columns, $row) {
-	$attribute_values = array();
-	foreach($columns as $column) {
+function parse_attribute_values(array $columns, array $row): array
+{
+	$attribute_values = [];
+	foreach($columns as $column)
+	{
 		if (array_key_exists($column, $row))
 		{
 			$attribute_value = explode('|', $row[$column]);
@@ -541,11 +642,11 @@ function parse_attribute_values($columns, $row) {
 	return $attribute_values;
 }
 
-function expand_attribute_values($definition_names, $row)
+function expand_attribute_values(array $definition_names, array $row): array
 {
-	$values = parse_attribute_values(array('attribute_values', 'attribute_dtvalues', 'attribute_dvalues'), $row);
+	$values = parse_attribute_values(['attribute_values', 'attribute_dtvalues', 'attribute_dvalues'], $row);
 
-	$indexed_values = array();
+	$indexed_values = [];
 	foreach($values as $attribute_value)
 	{
 		$exploded_value = explode('_', $attribute_value);
@@ -555,7 +656,7 @@ function expand_attribute_values($definition_names, $row)
 		}
 	}
 
-	$attribute_values = array();
+	$attribute_values = [];
 	foreach($definition_names as $definition_id => $definition_name)
 	{
 		if(isset($indexed_values[$definition_id]))
@@ -568,30 +669,29 @@ function expand_attribute_values($definition_names, $row)
 	return $attribute_values;
 }
 
-function get_attribute_definition_manage_table_headers()
+function get_attribute_definition_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('definition_id' => $CI->lang->line('attributes_definition_id')),
-		array('definition_name' => $CI->lang->line('attributes_definition_name')),
-		array('definition_type' => $CI->lang->line('attributes_definition_type')),
-		array('definition_flags' => $CI->lang->line('attributes_definition_flags')),
-		array('definition_group' => $CI->lang->line('attributes_definition_group')),
-	);
+	$headers = [
+		['definition_id' => lang('Attributes.definition_id')],
+		['definition_name' => lang('Attributes.definition_name')],
+		['definition_type' => lang('Attributes.definition_type')],
+		['definition_flags' => lang('Attributes.definition_flags')],
+		['definition_group' => lang('Attributes.definition_group')],
+	];
 
 	return transform_headers($headers);
 }
 
-function get_attribute_definition_data_row($attribute)
+function get_attribute_definition_data_row(object $attribute): array
 {
-	$CI =& get_instance();
 
-	$controller_name = strtolower(get_class($CI));
+	$attribute = model('Attribute');
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	if(count($attribute->definition_flags) == 0)
+	if(count($attribute->definition_flags) == 0)	//TODO: === ?
 	{
-		$definition_flags = $CI->lang->line('common_none_selected_text');
+		$definition_flags = lang('Common.none_selected_text');
 	}
 	else if($attribute->definition_type == GROUP)
 	{
@@ -602,87 +702,93 @@ function get_attribute_definition_data_row($attribute)
 		$definition_flags = implode(', ', $attribute->definition_flags);
 	}
 
-	return array (
+	return [
 		'definition_id' => $attribute->definition_id,
 		'definition_name' => $attribute->definition_name,
 		'definition_type' => $attribute->definition_type,
 		'definition_group' => $attribute->definition_group,
 		'definition_flags' => $definition_flags,
-		'edit' => anchor("$controller_name/view/$attribute->definition_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			"$controller_name/view/$attribute->definition_id",
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the header for the expense categories tabular view
-*/
-function get_expense_category_manage_table_headers()
+/**
+ * Get the header for the expense categories tabular view
+ */
+function get_expense_category_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('expense_category_id' => $CI->lang->line('expenses_categories_category_id')),
-		array('category_name' => $CI->lang->line('expenses_categories_name')),
-		array('category_description' => $CI->lang->line('expenses_categories_description'))
-	);
+	$headers = [
+		['expense_category_id' => lang('Expenses_categories.category_id')],
+		['category_name' => lang('Expenses_categories.name')],
+		['category_description' => lang('Expenses_categories.description')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Gets the html data row for the expenses category
-*/
-function get_expense_category_data_row($expense_category)
+/**
+ * Gets the html data row for the expenses category
+ */
+function get_expense_category_data_row(object $expense_category): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'expense_category_id' => $expense_category->expense_category_id,
 		'category_name' => $expense_category->category_name,
 		'category_description' => $expense_category->category_description,
-		'edit' => anchor($controller_name."/view/$expense_category->expense_category_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$expense_category->expense_category_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
 
-/*
-Get the header for the expenses tabular view
-*/
-function get_expenses_manage_table_headers()
+/**
+ * Get the header for the expenses tabular view
+ */
+function get_expenses_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('expense_id' => $CI->lang->line('expenses_expense_id')),
-		array('date' => $CI->lang->line('expenses_date')),
-		array('supplier_name' => $CI->lang->line('expenses_supplier_name')),
-		array('supplier_tax_code' => $CI->lang->line('expenses_supplier_tax_code')),
-		array('amount' => $CI->lang->line('expenses_amount')),
-		array('tax_amount' => $CI->lang->line('expenses_tax_amount')),
-		array('payment_type' => $CI->lang->line('expenses_payment')),
-		array('category_name' => $CI->lang->line('expenses_categories_name')),
-		array('description' => $CI->lang->line('expenses_description')),
-		array('created_by' => $CI->lang->line('expenses_employee'))
-	);
+	$headers = [
+		['expense_id' => lang('Expenses.expense_id')],
+		['date' => lang('Expenses.date')],
+		['supplier_name' => lang('Expenses.supplier_name')],
+		['supplier_tax_code' => lang('Expenses.supplier_tax_code')],
+		['amount' => lang('Expenses.amount')],
+		['tax_amount' => lang('Expenses.tax_amount')],
+		['payment_type' => lang('Expenses.payment')],
+		['category_name' => lang('Expenses_categories.name')],
+		['description' => lang('Expenses.description')],
+		['created_by' => lang('Expenses.employee')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Gets the html data row for the expenses
-*/
-function get_expenses_data_row($expense)
+/**
+ * Gets the html data row for the expenses
+ */
+function get_expenses_data_row(object $expense): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'expense_id' => $expense->expense_id,
 		'date' => to_datetime(strtotime($expense->date)),
 		'supplier_name' => $expense->supplier_name,
@@ -693,47 +799,49 @@ function get_expenses_data_row($expense)
 		'category_name' => $expense->category_name,
 		'description' => $expense->description,
 		'created_by' => $expense->first_name.' '. $expense->last_name,
-		'edit' => anchor($controller_name."/view/$expense->expense_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$expense->expense_id",
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the html data last row for the expenses
-*/
-function get_expenses_data_last_row($expense)
+/**
+ * Get the html data last row for the expenses
+ */
+function get_expenses_data_last_row(object $expense): array
 {
-	$CI =& get_instance();
-
-	$table_data_rows = '';
+	$table_data_rows = '';	//TODO: This variable is never used
 	$sum_amount_expense = 0;
 	$sum_tax_amount_expense = 0;
 
-	foreach($expense->result() as $key=>$expense)
+	foreach($expense->getResult() as $key => $expense)
 	{
 		$sum_amount_expense += $expense->amount;
 		$sum_tax_amount_expense += $expense->tax_amount;
 	}
 
-	return array(
+	return [
 		'expense_id' => '-',
-		'date' => $CI->lang->line('sales_total'),
-		'amount' => to_currency($sum_amount_expense),
-		'tax_amount' => to_currency($sum_tax_amount_expense)
-	);
+		'date' => '<b>'.lang('Sales.total').'</b>',
+		'amount' => '<b>'. to_currency($sum_amount_expense).'</b>',
+		'tax_amount' => '<b>'. to_currency($sum_tax_amount_expense).'</b>'
+	];
 }
 
-/*
-Get the expenses payments summary
-*/
-function get_expenses_manage_payments_summary($payments, $expenses)
+/**
+ * Get the expenses payments summary
+ */
+function get_expenses_manage_payments_summary(array $payments, ResultInterface $expenses): string	//TODO: $expenses is passed but never used.
 {
-	$CI =& get_instance();
-
 	$table = '<div id="report_summary">';
 
-	foreach($payments as $key=>$payment)
+	foreach($payments as $key => $payment)
 	{
 		$amount = $payment['amount'];
 		$table .= '<div class="summary_row">' . $payment['payment_type'] . ': ' . to_currency($amount) . '</div>';
@@ -745,42 +853,39 @@ function get_expenses_manage_payments_summary($payments, $expenses)
 }
 
 
-/*
-Get the header for the cashup tabular view
-*/
-function get_cashups_manage_table_headers()
+/**
+ * Get the header for the cashup tabular view
+ */
+function get_cashups_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('cashup_id' => $CI->lang->line('cashups_id')),
-		array('open_date' => $CI->lang->line('cashups_opened_date')),
-		array('open_employee_id' => $CI->lang->line('cashups_open_employee')),
-		array('open_amount_cash' => $CI->lang->line('cashups_open_amount_cash')),
-		array('transfer_amount_cash' => $CI->lang->line('cashups_transfer_amount_cash')),
-		array('close_date' => $CI->lang->line('cashups_closed_date')),
-		array('close_employee_id' => $CI->lang->line('cashups_close_employee')),
-		array('closed_amount_cash' => $CI->lang->line('cashups_closed_amount_cash')),
-		array('note' => $CI->lang->line('cashups_note')),
-		array('closed_amount_due' => $CI->lang->line('cashups_closed_amount_due')),
-		array('closed_amount_card' => $CI->lang->line('cashups_closed_amount_card')),
-		array('closed_amount_check' => $CI->lang->line('cashups_closed_amount_check')),
-		array('closed_amount_total' => $CI->lang->line('cashups_closed_amount_total'))
-	);
+	$headers = [
+		['cashup_id' => lang('Cashups.id')],
+		['open_date' => lang('Cashups.opened_date')],
+		['open_employee_id' => lang('Cashups.open_employee')],
+		['open_amount_cash' => lang('Cashups.open_amount_cash')],
+		['transfer_amount_cash' => lang('Cashups.transfer_amount_cash')],
+		['close_date' => lang('Cashups.closed_date')],
+		['close_employee_id' => lang('Cashups.close_employee')],
+		['closed_amount_cash' => lang('Cashups.closed_amount_cash')],
+		['note' => lang('Cashups.note')],
+		['closed_amount_due' => lang('Cashups.closed_amount_due')],
+		['closed_amount_card' => lang('Cashups.closed_amount_card')],
+		['closed_amount_check' => lang('Cashups.closed_amount_check')],
+		['closed_amount_total' => lang('Cashups.closed_amount_total')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Gets the html data row for the cashups
-*/
-function get_cash_up_data_row($cash_up)
+/**
+ * Gets the html data row for the cashups
+ */
+function get_cash_up_data_row(object $cash_up): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'cashup_id' => $cash_up->cashup_id,
 		'open_date' => to_datetime(strtotime($cash_up->open_date)),
 		'open_employee_id' => $cash_up->open_first_name . ' ' . $cash_up->open_last_name,
@@ -794,9 +899,14 @@ function get_cash_up_data_row($cash_up)
 		'closed_amount_card' => to_currency($cash_up->closed_amount_card),
 		'closed_amount_check' => to_currency($cash_up->closed_amount_check),
 		'closed_amount_total' => to_currency($cash_up->closed_amount_total),
-		'edit' => anchor($controller_name."/view/$cash_up->cashup_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$cash_up->cashup_id",
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')
+			]
 		)
-	);
-}
-?>
+	];
+}
\ No newline at end of file
diff --git a/app/Helpers/tax_helper.php b/app/Helpers/tax_helper.php
index 6f95a1c71..2aac284ef 100644
--- a/app/Helpers/tax_helper.php
+++ b/app/Helpers/tax_helper.php
@@ -1,146 +1,152 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+use app\Models\Enums\Rounding_mode;
 
 /**
  * Tax Configuration tabular helpers
  */
 
-/*
-Get the header for the taxes tabular view
-*/
-function get_tax_code_table_headers()
+/**
+ * Get the header for the taxes tabular view
+ */
+function get_tax_code_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('tax_code' => $CI->lang->line('taxes_tax_code')),
-		array('tax_code_name' => $CI->lang->line('taxes_tax_code_name')),
-		array('city' => $CI->lang->line('common_city')),
-		array('state' => $CI->lang->line('common_state'))
-	);
+	$headers = [
+		['tax_code' => lang('Taxes.tax_code')],
+		['tax_code_name' => lang('Taxes.tax_code_name')],
+		['city' => lang('Common.city')],
+		['state' => lang('Common.state')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the tax
-*/
-function get_tax_code_data_row($tax_code_row)
+/**
+ * Get the html data row for the tax
+ */
+function get_tax_code_data_row($tax_code_row): array
 {
-	$CI =& get_instance();
-
 	$controller_name = 'tax_codes';
 
-	return array (
+	return [
 		'tax_code' => $tax_code_row->tax_code,
 		'tax_code_name' => $tax_code_row->tax_code_name,
 		'tax_code_type' => $tax_code_row->tax_code_type,
 		'city' => $tax_code_row->city,
 		'state' => $tax_code_row->state,
-		'edit' => anchor($controller_name."/view_tax_codes/$tax_code_row->tax_code", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update_tax_codes'))
+		'edit' => anchor(
+			$controller_name."/view_tax_codes/$tax_code_row->tax_code",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update_tax_codes')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the header for the taxes tabular view
-*/
-function get_tax_categories_table_headers()
+/**
+ * Get the header for the taxes tabular view
+ */
+function get_tax_categories_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('tax_category' => $CI->lang->line('taxes_tax_category_name')),
-		array('tax_category_code' => $CI->lang->line('taxes_tax_category_code')),
-		array('tax_group_sequence' => $CI->lang->line('taxes_tax_group_sequence')),
-	);
+	$headers = [
+		['tax_category' => lang('Taxes.tax_category_name')],
+		['tax_category_code' => lang('Taxes.tax_category_code')],
+		['tax_group_sequence' => lang('Taxes.tax_group_sequence')],
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the tax
-*/
-function get_tax_categories_data_row($tax_categories_row)
+/**
+ * Get the html data row for the tax
+ */
+function get_tax_categories_data_row($tax_categories_row): array
 {
-	$CI =& get_instance();
-
 	$controller_name = 'tax_categories';
 
-	return array (
+	return [
 		'tax_category_id' => $tax_categories_row->tax_category_id,
 		'tax_category' => $tax_categories_row->tax_category,
 		'tax_category_code' => $tax_categories_row->tax_category_code,
 		'tax_group_sequence' => $tax_categories_row->tax_group_sequence,
-		'edit' => anchor($controller_name."/view/$tax_categories_row->tax_category_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$tax_categories_row->tax_category_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the header for the taxes tabular view
-*/
-function get_tax_jurisdictions_table_headers()
+/**
+ * Get the header for the taxes tabular view
+ */
+function get_tax_jurisdictions_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('jurisdiction_id' => $CI->lang->line('taxes_jurisdiction_id')),
-		array('jurisdiction_name' => $CI->lang->line('taxes_jurisdiction_name')),
-		array('reporting_authority' => $CI->lang->line('taxes_reporting_authority'))
-	);
+	$headers = [
+		['jurisdiction_id' => lang('Taxes.jurisdiction_id')],
+		['jurisdiction_name' => lang('Taxes.jurisdiction_name')],
+		['reporting_authority' => lang('Taxes.reporting_authority')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the tax
-*/
-function get_tax_jurisdictions_data_row($tax_jurisdiction_row)
+/**
+ * Get the html data row for the tax
+ */
+function get_tax_jurisdictions_data_row($tax_jurisdiction_row): array
 {
-	$CI =& get_instance();
 	$controller_name='tax_jurisdictions';
 
-	return array (
+	return [
 		'jurisdiction_id' => $tax_jurisdiction_row->jurisdiction_id,
 		'jurisdiction_name' => $tax_jurisdiction_row->jurisdiction_name,
 		'reporting_authority' => $tax_jurisdiction_row->reporting_authority,
-		'edit' => anchor($controller_name."/view/$tax_jurisdiction_row->jurisdiction_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$tax_jurisdiction_row->jurisdiction_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
+	];
 }
 
-/*
-Get the header for the taxes tabular view
-*/
-function get_tax_rates_manage_table_headers()
+/**
+ * Get the header for the taxes tabular view
+ */
+function get_tax_rates_manage_table_headers(): string
 {
-	$CI =& get_instance();
-
-	$headers = array(
-		array('tax_code' => $CI->lang->line('taxes_tax_code')),
-		array('tax_code_name' => $CI->lang->line('taxes_tax_code_name')),
-		array('jurisdiction_name' => $CI->lang->line('taxes_jurisdiction_name')),
-		array('tax_category' => $CI->lang->line('taxes_tax_category')),
-		array('tax_rate' => $CI->lang->line('taxes_tax_rate')),
-		array('rounding_code_name' => $CI->lang->line('taxes_rounding_code'))
-	);
+	$headers = [
+		['tax_code' => lang('Taxes.tax_code')],
+		['tax_code_name' => lang('Taxes.tax_code_name')],
+		['jurisdiction_name' => lang('Taxes.jurisdiction_name')],
+		['tax_category' => lang('Taxes.tax_category')],
+		['tax_rate' => lang('Taxes.tax_rate')],
+		['rounding_code_name' => lang('Taxes.rounding_code')]
+	];
 
 	return transform_headers($headers);
 }
 
-/*
-Get the html data row for the tax
-*/
-function get_tax_rates_data_row($tax_rates_row)
+/**
+ * Get the html data row for the tax
+ */
+function get_tax_rates_data_row($tax_rates_row): array
 {
-	$CI =& get_instance();
+	$router = service('router');
+	$controller_name = strtolower($router->controllerName());
 
-	$controller_name = strtolower(get_class($CI));
-
-	return array (
+	return [
 		'tax_rate_id' => $tax_rates_row->tax_rate_id,
 		'tax_code' => $tax_rates_row->tax_code,
 		'tax_code_name' => $tax_rates_row->tax_code_name,
@@ -149,10 +155,14 @@ function get_tax_rates_data_row($tax_rates_row)
 		'jurisdiction_name' => $tax_rates_row->jurisdiction_name,
 		'tax_rounding_code' =>$tax_rates_row->tax_rounding_code,
 		'rounding_code_name' => Rounding_mode::get_rounding_code_name($tax_rates_row->tax_rounding_code),
-		'edit' => anchor($controller_name."/view/$tax_rates_row->tax_rate_id", '<span class="glyphicon glyphicon-edit"></span>',
-			array('class'=>'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
+		'edit' => anchor(
+			$controller_name."/view/$tax_rates_row->tax_rate_id",	//TODO: String interpolation
+			'<span class="glyphicon glyphicon-edit"></span>',
+			[
+				'class' => 'modal-dlg',
+				'data-btn-submit' => lang('Common.submit'),
+				'title'=>lang($controller_name . '.update')	//TODO: String interpolation
+			]
 		)
-	);
-}
-
-?>
+	];
+}
\ No newline at end of file
diff --git a/app/Language/bs-BA/attributes_lang.php b/app/Language/bs-BA/attributes_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/bootstrap_tables_lang.php b/app/Language/bs-BA/bootstrap_tables_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/cashups_lang.php b/app/Language/bs-BA/cashups_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/datepicker_lang.php b/app/Language/bs-BA/datepicker_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/error_lang.php b/app/Language/bs-BA/error_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/expenses_categories_lang.php b/app/Language/bs-BA/expenses_categories_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/index.html b/app/Language/bs-BA/index.html
old mode 100755
new mode 100644
diff --git a/app/Language/bs-BA/messages_lang.php b/app/Language/bs-BA/messages_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/en-US/attributes_lang.php b/app/Language/en-US/Attributes.php
similarity index 100%
rename from app/Language/en-US/attributes_lang.php
rename to app/Language/en-US/Attributes.php
diff --git a/app/Language/en-US/bootstrap_tables_lang.php b/app/Language/en-US/Bootstrap_tables.php
similarity index 100%
rename from app/Language/en-US/bootstrap_tables_lang.php
rename to app/Language/en-US/Bootstrap_tables.php
diff --git a/app/Language/en-US/cashups_lang.php b/app/Language/en-US/Cashups.php
similarity index 100%
rename from app/Language/en-US/cashups_lang.php
rename to app/Language/en-US/Cashups.php
diff --git a/app/Language/en-US/common_lang.php b/app/Language/en-US/Common.php
similarity index 100%
rename from app/Language/en-US/common_lang.php
rename to app/Language/en-US/Common.php
diff --git a/app/Language/en-US/config_lang.php b/app/Language/en-US/Config.php
similarity index 100%
rename from app/Language/en-US/config_lang.php
rename to app/Language/en-US/Config.php
diff --git a/app/Language/en-US/customers_lang.php b/app/Language/en-US/Customers.php
similarity index 100%
rename from app/Language/en-US/customers_lang.php
rename to app/Language/en-US/Customers.php
diff --git a/app/Language/en-US/datepicker_lang.php b/app/Language/en-US/Datepicker.php
similarity index 100%
rename from app/Language/en-US/datepicker_lang.php
rename to app/Language/en-US/Datepicker.php
diff --git a/app/Language/en-US/employees_lang.php b/app/Language/en-US/Employees.php
similarity index 100%
rename from app/Language/en-US/employees_lang.php
rename to app/Language/en-US/Employees.php
diff --git a/app/Language/en-US/enum_lang.php b/app/Language/en-US/Enum.php
similarity index 100%
rename from app/Language/en-US/enum_lang.php
rename to app/Language/en-US/Enum.php
diff --git a/app/Language/en-US/error_lang.php b/app/Language/en-US/Error.php
similarity index 100%
rename from app/Language/en-US/error_lang.php
rename to app/Language/en-US/Error.php
diff --git a/app/Language/en-US/expenses_lang.php b/app/Language/en-US/Expenses.php
similarity index 100%
rename from app/Language/en-US/expenses_lang.php
rename to app/Language/en-US/Expenses.php
diff --git a/app/Language/en-US/expenses_categories_lang.php b/app/Language/en-US/Expenses_categories.php
similarity index 100%
rename from app/Language/en-US/expenses_categories_lang.php
rename to app/Language/en-US/Expenses_categories.php
diff --git a/app/Language/en-US/giftcards_lang.php b/app/Language/en-US/Giftcards.php
similarity index 100%
rename from app/Language/en-US/giftcards_lang.php
rename to app/Language/en-US/Giftcards.php
diff --git a/app/Language/en-US/item_kits_lang.php b/app/Language/en-US/Item_kits.php
similarity index 100%
rename from app/Language/en-US/item_kits_lang.php
rename to app/Language/en-US/Item_kits.php
diff --git a/app/Language/en-US/items_lang.php b/app/Language/en-US/Items.php
similarity index 100%
rename from app/Language/en-US/items_lang.php
rename to app/Language/en-US/Items.php
diff --git a/app/Language/en-US/login_lang.php b/app/Language/en-US/Login.php
similarity index 100%
rename from app/Language/en-US/login_lang.php
rename to app/Language/en-US/Login.php
diff --git a/app/Language/en-US/messages_lang.php b/app/Language/en-US/Messages.php
similarity index 100%
rename from app/Language/en-US/messages_lang.php
rename to app/Language/en-US/Messages.php
diff --git a/app/Language/en-US/module_lang.php b/app/Language/en-US/Module.php
similarity index 100%
rename from app/Language/en-US/module_lang.php
rename to app/Language/en-US/Module.php
diff --git a/app/Language/en-US/receivings_lang.php b/app/Language/en-US/Receivings.php
similarity index 100%
rename from app/Language/en-US/receivings_lang.php
rename to app/Language/en-US/Receivings.php
diff --git a/app/Language/en-US/reports_lang.php b/app/Language/en-US/Reports.php
similarity index 100%
rename from app/Language/en-US/reports_lang.php
rename to app/Language/en-US/Reports.php
diff --git a/app/Language/en-US/sales_lang.php b/app/Language/en-US/Sales.php
similarity index 100%
rename from app/Language/en-US/sales_lang.php
rename to app/Language/en-US/Sales.php
diff --git a/app/Language/en-US/suppliers_lang.php b/app/Language/en-US/Suppliers.php
similarity index 100%
rename from app/Language/en-US/suppliers_lang.php
rename to app/Language/en-US/Suppliers.php
diff --git a/app/Language/en-US/taxes_lang.php b/app/Language/en-US/Taxes.php
similarity index 100%
rename from app/Language/en-US/taxes_lang.php
rename to app/Language/en-US/Taxes.php
diff --git a/app/Language/nl-BE/receivings_lang.php b/app/Language/nl-BE/receivings_lang.php
old mode 100755
new mode 100644
diff --git a/app/Language/tr/index.html b/app/Language/tr/index.html
old mode 100755
new mode 100644
diff --git a/app/Libraries/Barcode_lib.php b/app/Libraries/Barcode_lib.php
index e28d63002..e9a102167 100644
--- a/app/Libraries/Barcode_lib.php
+++ b/app/Libraries/Barcode_lib.php
@@ -1,11 +1,9 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-use emberlabs\Barcode\BarcodeBase;
-require APPPATH.'/views/barcodes/BarcodeBase.php';
-require APPPATH.'/views/barcodes/Code39.php';
-require APPPATH.'/views/barcodes/Code128.php';
-require APPPATH.'/views/barcodes/Ean13.php';
-require APPPATH.'/views/barcodes/Ean8.php';
+namespace app\Libraries;
+
+use Exception;
+use Picqer\Barcode\BarcodeGeneratorPNG;
 
 /**
  * Barcode library
@@ -15,92 +13,84 @@ require APPPATH.'/views/barcodes/Ean8.php';
 
 class Barcode_lib
 {
-	private $CI;
-	private $supported_barcodes = array('Code39' => 'Code 39', 'Code128' => 'Code 128', 'Ean8' => 'EAN 8', 'Ean13' => 'EAN 13');
+	private $supported_barcodes = [
+		'Code39' => 'Code 39',
+		'Code128' => 'Code 128',
+		'Ean8' => 'EAN 8',
+		'Ean13' => 'EAN 13'
+	];
 
-	public function __construct()
-	{
-		$this->CI =& get_instance();
-	}
-
-	public function get_list_barcodes()
+	public function get_list_barcodes(): array
 	{
 		return $this->supported_barcodes;
 	}
 
-	public function get_barcode_config()
+	public function get_barcode_config(): array
 	{
-		$data['company'] = $this->CI->config->item('company');
-		$data['barcode_content'] = $this->CI->config->item('barcode_content');
-		$data['barcode_type'] = $this->CI->config->item('barcode_type');
-		$data['barcode_font'] = $this->CI->config->item('barcode_font');
-		$data['barcode_font_size'] = $this->CI->config->item('barcode_font_size');
-		$data['barcode_height'] = $this->CI->config->item('barcode_height');
-		$data['barcode_width'] = $this->CI->config->item('barcode_width');
-		$data['barcode_first_row'] = $this->CI->config->item('barcode_first_row');
-		$data['barcode_second_row'] = $this->CI->config->item('barcode_second_row');
-		$data['barcode_third_row'] = $this->CI->config->item('barcode_third_row');
-		$data['barcode_num_in_row'] = $this->CI->config->item('barcode_num_in_row');
-		$data['barcode_page_width'] = $this->CI->config->item('barcode_page_width');
-		$data['barcode_page_cellspacing'] = $this->CI->config->item('barcode_page_cellspacing');
-		$data['barcode_generate_if_empty'] = $this->CI->config->item('barcode_generate_if_empty');
-		$data['barcode_formats'] = $this->CI->config->item('barcode_formats');
+		$data['company'] = config('OSPOS')->company;
+		$data['barcode_content'] = config('OSPOS')->barcode_content;
+		$data['barcode_type'] = config('OSPOS')->barcode_type;
+		$data['barcode_font'] = config('OSPOS')->barcode_font;
+		$data['barcode_font_size'] = config('OSPOS')->barcode_font_size;
+		$data['barcode_height'] = config('OSPOS')->barcode_height;
+		$data['barcode_width'] = config('OSPOS')->barcode_width;
+		$data['barcode_first_row'] = config('OSPOS')->barcode_first_row;
+		$data['barcode_second_row'] = config('OSPOS')->barcode_second_row;
+		$data['barcode_third_row'] = config('OSPOS')->barcode_third_row;
+		$data['barcode_num_in_row'] = config('OSPOS')->barcode_num_in_row;
+		$data['barcode_page_width'] = config('OSPOS')->barcode_page_width;
+		$data['barcode_page_cellspacing'] = config('OSPOS')->barcode_page_cellspacing;
+		$data['barcode_generate_if_empty'] = config('OSPOS')->barcode_generate_if_empty;
+		$data['barcode_formats'] = config('OSPOS')->barcode_formats;
 
 		return $data;
 	}
 
-	public function validate_barcode($barcode)
-	{
-		$barcode_type = $this->CI->config->item('barcode_type');
-		$barcode_instance = $this->get_barcode_instance($barcode_type);
-
-		return $barcode_instance->validate($barcode);
-	}
-
-	public static function barcode_instance($item, $barcode_config)
+	public static function barcode_instance(array $item, array $barcode_config): object
 	{
 		$barcode_instance = Barcode_lib::get_barcode_instance($barcode_config['barcode_type']);
-		$is_valid = empty($item['item_number']) && $barcode_config['barcode_generate_if_empty'] || $barcode_instance->validate($item['item_number']);
+		$is_valid = empty($item['item_number'])
+			&& $barcode_config['barcode_generate_if_empty']
+			|| $barcode_instance->validate($item['item_number']);
 
 		// if barcode validation does not succeed,
 		if(!$is_valid)
 		{
 			$barcode_instance = Barcode_lib::get_barcode_instance();
 		}
+
 		$seed = Barcode_lib::barcode_seed($item, $barcode_instance, $barcode_config);
 		$barcode_instance->setData($seed);
 
 		return $barcode_instance;
 	}
 
-	private static function get_barcode_instance($barcode_type='Code128')
+	private static function get_barcode_instance(string $barcode_type = 'Code128'): object
 	{
 		switch($barcode_type)
 		{
 			case 'Code39':
-				return new emberlabs\Barcode\Code39();
-				break;
+				return new Code39();
 
 			case 'Code128':
 			default:
-				return new emberlabs\Barcode\Code128();
-				break;
+				return new Code128();
 
 			case 'Ean8':
-				return new emberlabs\Barcode\Ean8();
-				break;
+				return new Ean8();
 
 			case 'Ean13':
-				return new emberlabs\Barcode\Ean13();
-				break;
+				return new Ean13();
 		}
 	}
 
-	private static function barcode_seed($item, $barcode_instance, $barcode_config)
+	private static function barcode_seed(array $item, object $barcode_instance, array $barcode_config)
 	{
-		$seed = $barcode_config['barcode_content'] !== "id" && !empty($item['item_number']) ? $item['item_number'] : $item['item_id'];
+		$seed = $barcode_config['barcode_content'] !== "id" && !empty($item['item_number'])
+			? $item['item_number']
+			: $item['item_id'];
 
-		if($barcode_config['barcode_content'] !== "id" && !empty($item['item_number']))
+		if($barcode_config['barcode_content'] !== "id" && !empty($item['item_number']))	//TODO: === ?
 		{
 			$seed = $item['item_number'];
 		}
@@ -119,10 +109,11 @@ class Barcode_lib
 		return $seed;
 	}
 
-	private function generate_barcode($item, $barcode_config)
+	private function generate_barcode(array $item, array $barcode_config): string
 	{
 		try
 		{
+			$generator = new BarcodeGeneratorPNG();
 			$barcode_instance = Barcode_lib::barcode_instance($item, $barcode_config);
 			$barcode_instance->setDimensions($barcode_config['barcode_width'], $barcode_config['barcode_height']);
 
@@ -133,14 +124,17 @@ class Barcode_lib
 		catch(Exception $e)
 		{
 			echo 'Caught exception: ', $e->getMessage(), "\n";
+			return '';
 		}
 	}
 
-	public function generate_receipt_barcode($barcode_content)
+	public function generate_receipt_barcode($barcode_content): string
 	{
 		try
 		{
-			// Code128 is the default and used in this case for the receipts
+			$generator = new BarcodeGeneratorPNG();
+
+			//Code128 is the default and used in this case for the receipts
 			$barcode = $this->get_barcode_instance();
 
 			// set the receipt number to generate the barcode for
@@ -157,41 +151,50 @@ class Barcode_lib
 		catch(Exception $e)
 		{
 			echo 'Caught exception: ', $e->getMessage(), "\n";
+			return '';
 		}
 	}
 
-	public function display_barcode($item, $barcode_config)
+	/**
+	 * Displays the barcode.  Called in a View.
+	 *
+	 * @param array $item
+	 * @param array $barcode_config
+	 * @return string
+	 */
+	public function display_barcode(array $item, array $barcode_config): string
 	{
-		$display_table = "<table>";
-		$display_table .= "<tr><td align='center'>" . $this->manage_display_layout($barcode_config['barcode_first_row'], $item, $barcode_config) . "</td></tr>";
+		$display_table = '<table>';
+		$display_table .= "<tr><td style=\"text-align=center;\">" . $this->manage_display_layout($barcode_config['barcode_first_row'], $item, $barcode_config) . '</td></tr>';
 		$barcode = $this->generate_barcode($item, $barcode_config);
-		$display_table .= "<tr><td align='center'><img src='data:image/png;base64,$barcode' /></td></tr>";
-		$display_table .= "<tr><td align='center'>" . $this->manage_display_layout($barcode_config['barcode_second_row'], $item, $barcode_config) . "</td></tr>";
-		$display_table .= "<tr><td align='center'>" . $this->manage_display_layout($barcode_config['barcode_third_row'], $item, $barcode_config) . "</td></tr>";
-		$display_table .= "</table>";
+		$display_table .= "<tr><td style=\"text-align=center;\"><img src='data:image/png;base64,$barcode' /></td></tr>";
+		$display_table .= "<tr><td style=\"text-align=center;\">" . $this->manage_display_layout($barcode_config['barcode_second_row'], $item, $barcode_config) . '</td></tr>';
+		$display_table .= "<tr><td style=\"text-align=center;\">" . $this->manage_display_layout($barcode_config['barcode_third_row'], $item, $barcode_config) . '</td></tr>';
+		$display_table .= '</table>';
 
 		return $display_table;
 	}
 
-	private function manage_display_layout($layout_type, $item, $barcode_config)
+	private function manage_display_layout($layout_type, array $item, array $barcode_config): string
 	{
 		$result = '';
 
+		//TODO: this needs to be converted to a switch statement.
 		if($layout_type == 'name')
 		{
-			$result = $this->CI->lang->line('items_name') . " " . $item['name'];
+			$result = lang('Items.name') . " " . $item['name'];
 		}
 		elseif($layout_type == 'category' && isset($item['category']))
 		{
-			$result = $this->CI->lang->line('items_category') . " " . $item['category'];
+			$result = lang('Items.category') . " " . $item['category'];
 		}
 		elseif($layout_type == 'cost_price' && isset($item['cost_price']))
 		{
-			$result = $this->CI->lang->line('items_cost_price') . " " . to_currency($item['cost_price']);
+			$result = lang('Items.cost_price') . " " . to_currency($item['cost_price']);
 		}
 		elseif($layout_type == 'unit_price' && isset($item['unit_price']))
 		{
-			$result = $this->CI->lang->line('items_unit_price') . " " . to_currency($item['unit_price']);
+			$result = lang('Items.unit_price') . " " . to_currency($item['unit_price']);
 		}
 		elseif($layout_type == 'company_name')
 		{
@@ -205,9 +208,15 @@ class Barcode_lib
 		return character_limiter($result, 40);
 	}
 
-	public function listfonts($folder)
+	/**
+	 * Finds all acceptable fonts to be used. Called in a View.
+	 *
+	 * @param string $folder
+	 * @return array
+	 */
+	public function listfonts(string $folder): array	//TODO: This function does not follow naming conventions.
 	{
-		$array = array();
+		$array = [];	//TODO: Naming of this variable should be changed.  The variable should never be named the data type.  $fonts would be a better name.
 
 		if(($handle = opendir($folder)) !== FALSE)
 		{
@@ -222,15 +231,19 @@ class Barcode_lib
 
 		closedir($handle);
 
-		array_unshift($array, $this->CI->lang->line('config_none'));
+		array_unshift($array, lang('Config.none'));
 
 		return $array;
 	}
 
-	public function get_font_name($font_file_name)
+	/**
+	 * Returns the name of the font from the file name.  Called in a View.
+	 *
+	 * @param string $font_file_name
+	 * @return string
+	 */
+	public function get_font_name(string $font_file_name): string
 	{
 		return substr($font_file_name, 0, -4);
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Email_lib.php b/app/Libraries/Email_lib.php
index 45b7df1e9..23f5a32ae 100644
--- a/app/Libraries/Email_lib.php
+++ b/app/Libraries/Email_lib.php
@@ -1,50 +1,61 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\EncrypterInterface;
+
 
 /**
  * Email library
  *
  * Library with utilities to configure and send emails
+ *
+ * @property email email
+ * @property encryption encryption
+ * @property encrypterinterface encrypter
  */
 
 class Email_lib
 {
-	private $CI;
-
   	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->email = new Email();
+		$this->encryption = new Encryption();
+		$this->encrypter = $this->encryption->initialize();
 
-		$this->CI->load->library('email');
 
-		$config = array(
+		$config = [
 			'mailtype' => 'html',
 			'useragent' => 'OSPOS',
 			'validate' => TRUE,
-			'protocol' => $this->CI->config->item('protocol'),
-			'mailpath' => $this->CI->config->item('mailpath'),
-			'smtp_host' => $this->CI->config->item('smtp_host'),
-			'smtp_user' => $this->CI->config->item('smtp_user'),
-			'smtp_pass' => $this->CI->encryption->decrypt($this->CI->config->item('smtp_pass')),
-			'smtp_port' => $this->CI->config->item('smtp_port'),
-			'smtp_timeout' => $this->CI->config->item('smtp_timeout'),
-			'smtp_crypto' => $this->CI->config->item('smtp_crypto')
-		);
+			'protocol' => config('OSPOS')->protocol,
+			'mailpath' => config('OSPOS')->mailpath,
+			'smtp_host' => config('OSPOS')->smtp_host,
+			'smtp_user' => config('OSPOS')->smtp_user,
+			'smtp_pass' => $this->encrypter->decrypt(config('OSPOS')->smtp_pass),
+			'smtp_port' => config('OSPOS')->smtp_port,
+			'smtp_timeout' => config('OSPOS')->smtp_timeout,
+			'smtp_crypto' => config('OSPOS')->smtp_crypto
+		];
 
-		$this->CI->email->initialize($config);
+		$this->email->initialize($config);
 	}
 
 	/**
 	 * Email sending function
 	 * Example of use: $response = sendEmail('john@doe.com', 'Hello', 'This is a message', $filename);
 	 */
-	public function sendEmail($to, $subject, $message, $attachment = NULL)
+	public function sendEmail(string $to, string $subject, string $message, string $attachment = NULL): bool
 	{
-		$email = $this->CI->email;
+		$email = $this->email;
+
+		$email->setFrom(config('OSPOS')->email, config('OSPOS')->company);
+		$email->setTo($to);
+		$email->setSubject($subject);
+		$email->setMessage($message);
 
-		$email->from($this->CI->config->item('email'), $this->CI->config->item('company'));
-		$email->to($to);
-		$email->subject($subject);
-		$email->message($message);
 		if(!empty($attachment))
 		{
 			$email->attach($attachment);
@@ -54,11 +65,9 @@ class Email_lib
 
 		if(!$result)
 		{
-			error_log($email->print_debugger());
+			error_log($email->printDebugger());
 		}
 
 		return $result;
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Item_lib.php b/app/Libraries/Item_lib.php
index 8ea8ee563..675c6ebc2 100644
--- a/app/Libraries/Item_lib.php
+++ b/app/Libraries/Item_lib.php
@@ -1,40 +1,45 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use CodeIgniter\Session\Session;
+use app\Models\Stock_location;
 
 /**
  * Item library
  *
  * Library with utilities to manage items
+ *
+ * @property session session
+ * @property stock_location stock_location
  */
 
 class Item_lib
 {
-	private $CI;
-
   	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->session = Session();
+		$this->stock_location = model('Stock_location');
 	}
 
-	public function get_item_location()
+	public function get_item_location(): string
 	{
-		if(!$this->CI->session->userdata('item_location'))
+		if(!$this->session->get('item_location'))
 		{
-			$location_id = $this->CI->Stock_location->get_default_location_id();
+			$location_id = $this->stock_location->get_default_location_id();
 			$this->set_item_location($location_id);
 		}
 
-		return $this->CI->session->userdata('item_location');
+		return $this->session->get('item_location');
 	}
 
-	public function set_item_location($location)
+	public function set_item_location(string $location): void
 	{
-		$this->CI->session->set_userdata('item_location',$location);
+		$this->session->set('item_location',$location);
 	}
 
-	public function clear_item_location()
+	public function clear_item_location(): void	//TODO: This isn't called from anywhere in the code.
 	{
-		$this->CI->session->unset_userdata('item_location');
+		$this->session->remove('item_location');
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/MY_Email.php b/app/Libraries/MY_Email.php
old mode 100755
new mode 100644
index 2f3b6855d..21c5452b6
--- a/app/Libraries/MY_Email.php
+++ b/app/Libraries/MY_Email.php
@@ -1,35 +1,36 @@
-<?php 
-
-class MY_Email extends CI_Email {
-	
-	var $default_cc_address 	= "";
-	var $default_email_address 	= "";
-	var $default_sender_name 	= "";
-	var $default_sender_address = "";
-	var $default_bounce_address = "";
-
-	function __construct($config = array())
-	{
-		parent::__construct($config);
-	}
-
-	function send_mail($subject, $body, $to = NULL, $reply_name = NULL, $reply_mail = NULL, $attachment = NULL) {
-		$this->reply_to($reply_mail, $reply_name);
-		$this->from($this->default_sender_address, $this->default_sender_name, $this->default_bounce_address);
-		$this->set_mailtype('html');
-		$this->subject($subject);
-		$this->message($body);
-		if ($to == NULL) {
-			$to = $this->default_email_address;
-			$this->cc($this->default_cc_address); 
-		}
-		if ($attachment) {
-			$this->attach($attachment);
-		}
-		$this->to($to);
-		return $this->send();
-	}
-    
-}
-
-?>
+<?php
+
+namespace app\Libraries;
+use CodeIgniter\Email\Email;
+
+class MY_Email extends Email
+{
+	var $default_cc_address = "";
+	var $default_email_address = "";
+	var $default_sender_name = "";
+	var $default_sender_address = "";
+	var $default_bounce_address = "";
+
+	function __construct($config = [])
+	{
+		parent::__construct($config);
+	}
+
+	function sendMail(string $subject, string $body, string $to = NULL, string $reply_name = NULL, string $reply_mail = NULL, string $attachment = NULL): bool
+	{
+		$this->setReplyTo($reply_mail, $reply_name);
+		$this->setFrom($this->default_sender_address, $this->default_sender_name, $this->default_bounce_address);
+		$this->setMailtype('html');
+		$this->setSubject($subject);
+		$this->setMessage($body);
+		if ($to == NULL) {
+			$to = $this->default_email_address;
+			$this->setCc($this->default_cc_address);
+		}
+		if ($attachment) {
+			$this->attach($attachment);
+		}
+		$this->setTo($to);
+		return $this->send();
+	}
+}
\ No newline at end of file
diff --git a/app/Libraries/MY_Migration.php b/app/Libraries/MY_Migration.php
index b2f7a9969..ed9940187 100644
--- a/app/Libraries/MY_Migration.php
+++ b/app/Libraries/MY_Migration.php
@@ -1,22 +1,40 @@
 <?php
 
-defined('BASEPATH') OR exit('No direct script access allowed');
+namespace app\Libraries;
 
-class MY_Migration extends CI_Migration {
+use CodeIgniter\Database\MigrationRunner;
 
-	public function get_last_migration()
+class MY_Migration extends MigrationRunner {
+
+	public function get_last_migration(): string
 	{
-		$migrations = $this->find_migrations();
+		$migrations = $this->findMigrations();
 		return basename(end($migrations));
 	}
 
-	public function is_latest()
+	public function get_current_version(): string
+	{
+		$builder = $this->db->table('migrations');
+		$builder->select('version');
+		return $builder->get()->getRow()->version;
+	}
+
+	public function is_latest(): bool
 	{
 		$last_migration = $this->get_last_migration();
-		$last_version = $this->_get_migration_number($last_migration);
-		$current_version = $this->_get_version();
+		$last_version = $this->getMigrationNumber($last_migration);
+		$current_version = $this->get_current_version();
 
 		return $last_version == $current_version;
 	}
 
+	public function up(): void
+	{
+		// TODO: Implement up() method.
+	}
+
+	public function down(): void
+	{
+		// TODO: Implement down() method.
+	}
 }
\ No newline at end of file
diff --git a/app/Libraries/MY_Validation.php b/app/Libraries/MY_Validation.php
new file mode 100644
index 000000000..a3f3e714b
--- /dev/null
+++ b/app/Libraries/MY_Validation.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace app\Libraries;
+
+use CodeIgniter\Database\Migration;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use app\Models\Employee;
+
+/**
+ * @property migration migration
+ * @property employee employee
+ */
+class MY_Validation extends Validation
+{
+	/**
+	 * Checks to make sure that the user is logged in or not.  Called as a validator rule.
+	 *
+	 * @param string $username
+	 * @param string|null $error
+	 * @return bool
+	 */
+	public function login_check(string $username, string &$error = null): bool
+	{
+		$migration = Services::migrations();
+		$employee = model(Employee::class);
+
+		$password = $this->request->getPost('password');	//TODO: This needs to get passed as a parameter in some way
+
+		if(!$this->_installation_check())	//TODO: Hungarian notation
+		{
+			$error = lang('Login.invalid_installation');
+
+			return FALSE;
+		}
+
+		set_time_limit(3600);
+		$migration->latest();
+
+		if(!$employee->login($username, $password))
+		{
+			$error = lang('Login.invalid_username_and_password');
+
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	private function _installation_check()	//TODO: Hungarian Notation
+	{
+		// get PHP extensions and check that the required ones are installed
+		$extensions = implode(', ', get_loaded_extensions());
+		$keys = [
+			'bcmath',
+			'intl',
+			'gd',
+			'openssl',
+			'mbstring',
+			'curl'
+		];
+
+		$pattern = '/';
+		foreach($keys as $key)
+		{
+			$pattern .= '(?=.*\b' . preg_quote($key, '/') . '\b)';
+		}
+		$pattern .= '/i';
+		$result = preg_match($pattern, $extensions);
+
+		if(!$result)
+		{
+			error_log('Check your php.ini');
+			error_log('PHP installed extensions: ' . $extensions);
+			error_log('PHP required extensions: ' . implode(', ', $keys));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Processes gCaptcha response and returns result. Called as a validator rule.
+	 *
+	 * @param string $recaptchaResponse
+	 * @param null $error
+	 * @return bool
+	 */
+	public function gcaptcha_check(string $recaptchaResponse, &$error = null): bool
+	{
+		$url = 'https://www.google.com/recaptcha/api/siteverify?secret=' . config('OSPOS')->gcaptcha_secret_key . '&response=' . $recaptchaResponse . '&remoteip=' . $this->request->getIPAddress();
+
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_setopt($ch, CURLOPT_URL, $url);
+		$result = curl_exec($ch);
+		curl_close($ch);
+
+		$status = json_decode($result, TRUE);
+
+		if(empty($status['success']))
+		{
+			$error = lang('Login.invalid_gcaptcha');
+
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Validation function used in controllers.
+	 * @param string $str
+	 * @return float|bool Returns a float if numeric or FALSE if not numeric
+	 */
+	public function numeric(string $str)
+	{
+		return parse_decimals($str);
+	}
+}
\ No newline at end of file
diff --git a/app/Libraries/Mailchimp_lib.php b/app/Libraries/Mailchimp_lib.php
index 3346ce0dc..8a3e4c887 100644
--- a/app/Libraries/Mailchimp_lib.php
+++ b/app/Libraries/Mailchimp_lib.php
@@ -1,4 +1,9 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Encryption\Encryption;
 
 /**
  * MailChimp API v3 REST client Connector
@@ -8,8 +13,10 @@
  * 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 encryption encryption
+ * @property encrypterinterface encrypter
  */
-
 class MailchimpConnector
 {
 	/**
@@ -17,54 +24,54 @@ class MailchimpConnector
 	 *
 	 * @var	string[]
 	 */
-	private $_api_key = '';
+	private $_api_key = '';	//TODO: Hungarian notation
 
 	/**
 	 * API Endpoint
 	 *
 	 * @var	string[]
 	 */
-	private $_api_endpoint = 'https://<dc>.api.mailchimp.com/3.0/';
+	private $_api_endpoint = 'https://<dc>.api.mailchimp.com/3.0/';	//TODO: Hungarian notation
 
 	/**
 	 * Constructor
 	 */
-	public function __construct($api_key = '')
+	public function __construct(string $api_key = '')
 	{
-		$CI =& get_instance();
+		$this->encryption = new Encryption();
 
 		if(empty($api_key))
 		{
-			$this->_api_key = $CI->encryption->decrypt($CI->Appconfig->get('mailchimp_api_key'));
+			$this->_api_key = $this->encrypter->decrypt(config('OSPOS')->mailchimp_api_key);	//TODO: Hungarian notation
 		}
 		else
 		{
-			$this->_api_key = $api_key;
+			$this->_api_key = $api_key;	//TODO: Hungarian notation
 		}
 
-		if(!empty($this->_api_key))
+		if(!empty($this->_api_key))	//TODO: Hungarian notation
 		{
 			// Replace <dc> with correct datacenter obtained from the last part of the api key
-			$strings = explode('-', $this->_api_key);
+			$strings = explode('-', $this->_api_key);	//TODO: Hungarian notation
 			if(is_array($strings) && !empty($strings[1]))
 			{
-				$this->_api_endpoint = str_replace('<dc>', $strings[1], $this->_api_endpoint);
+				$this->_api_endpoint = str_replace('<dc>', $strings[1], $this->_api_endpoint);	//TODO: Hungarian notation
 			}
 		}
 	}
 
 	/**
 	 * Call an API method. Every request needs the API key
-	 * @param  string $httpVerb The HTTP method to be used
-	 * @param  string $method   The API method to call, e.g. 'lists/list'
-	 * @param  array  $args     An array of arguments to pass to the method. Will be json-encoded for you.
-	 * @return array            Associative array of json decoded API response.
+	 * @param string $httpVerb The HTTP method to be used
+	 * @param string $method The API method to call, e.g. 'lists/list'
+	 * @param array $args An array of arguments to pass to the method. Will be json-encoded for you.
+	 * @return array|bool Associative array of json decoded API response or false on error.
 	 */
-	public function call($httpVerb = 'POST', $method, $args = array())
+	public function call(string $method, string $httpVerb = 'POST', array $args = [])
 	{
-		if(!empty($this->_api_key))
+		if(!empty($this->_api_key))	//TODO: Hungarian notation
 		{
-			return $this->_request($httpVerb, $method, $args);
+			return $this->_request($httpVerb, $method, $args);	//TODO: Hungarian notation
 		}
 
 		return FALSE;
@@ -77,31 +84,31 @@ class MailchimpConnector
 	 * @param  array  $args     Assoc array of parameters to be passed
 	 * @return string           Request URL
 	 */
-	private function _build_request_url($httpVerb = 'POST', $method, $args = array())
+	private function _build_request_url(string $method, string $httpVerb = 'POST', array $args = []): string	//TODO: Hungarian notation.
 	{
 		if($httpVerb == 'GET')
 		{
-			return $this->_api_endpoint . $method . '?' . http_build_query($args);
+			return $this->_api_endpoint . $method . '?' . http_build_query($args);	//TODO: Hungarian notation
 		}
 
-		return $this->_api_endpoint . $method;
+		return $this->_api_endpoint . $method;	//TODO: Hungarian notation
 	}
 
 	/**
 	 * Performs the underlying HTTP request.
-	 * @param  string $httpVerb The HTTP method to be used
-	 * @param  string $method   The API method to be called
-	 * @param  array  $args     Assoc array of parameters to be passed
-	 * @return array            Assoc array of decoded result
+	 * @param string $httpVerb The HTTP method to be used
+	 * @param string $method The API method to be called
+	 * @param array $args Assoc array of parameters to be passed
+	 * @return bool|array Assoc array of decoded result or False
 	 */
-	private function _request($httpVerb, $method, $args = array())
+	private function _request(string $httpVerb, string $method, array $args = [])	//TODO: Hungarian notation
 	{
 		$result = FALSE;
 
 		if(($ch = curl_init()) !== FALSE)
 		{
-			curl_setopt($ch, CURLOPT_URL, $this->_build_request_url($httpVerb, $method, $args));
-			curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+			curl_setopt($ch, CURLOPT_URL, $this->_build_request_url($method, $httpVerb, $args));
+			curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
 			curl_setopt($ch, CURLOPT_USERPWD, "user:" . $this->_api_key);
 			curl_setopt($ch, CURLOPT_USERAGENT, 'PHP-MCAPI/3.0');
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
@@ -129,229 +136,203 @@ class MailchimpConnector
  * Inspired by the work of ThinkShout: https://github.com/thinkshout/mailchimp-api-php
  */
 
-class Mailchimp_lib
+class Mailchimp_lib	//TODO: IMO We need to stick to the one class per file principle.
 {
-	private $_connector;
+	private $_connector;	//TODO: Hungarian notation
 
-	public function __construct(array $params = array())
+	public function __construct(array $params = [])
 	{
 		$api_key = (count($params) > 0 && !empty($params['api_key'])) ? $params['api_key'] : '';
 		$this->_connector = new MailchimpConnector($api_key);
 	}
 
 	/**
-	* Gets information about all lists owned by the authenticated account.
-	*
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*   By the default it places a simple query to list name & id and count of members & merge_fields
-	*   NOTE: no space between , and next word is allowed. You will not get the filter to work in full but just the first tag
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/#read-get_lists
-	*/
-	public function getLists(array $parameters = array('fields' => 'lists.id,lists.name,lists.stats.member_count,lists.stats.merge_field_count'))
+	 * Gets information about all lists owned by the authenticated account.
+	 *
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 *   By the default it places a simple query to list name & id and count of members & merge_fields
+	 *   NOTE: no space between , and next word is allowed. You will not get the filter to work in full but just the first tag
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/#read-get_lists
+	 */
+	public function getLists(array $parameters = ['fields' => 'lists.id,lists.name,lists.stats.member_count,lists.stats.merge_field_count'])
 	{
-		return $this->_connector->call('GET', '/lists', $parameters);
+		return $this->_connector->call('/lists', 'GET', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Gets a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/#read-get_lists_list_id
-	*/
-	public function getList($list_id, $parameters = array('fields' => 'id,name,stats.member_count,stats.merge_field_count'))
+	 * Gets a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param array $parameters Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/#read-get_lists_list_id
+	 */
+	public function getList(string $list_id, array $parameters = ['fields' => 'id,name,stats.member_count,stats.merge_field_count'])
 	{
-		return $this->_connector->call('GET', '/lists/' . $list_id, $parameters);
+		return $this->_connector->call("/lists/$list_id", 'GET', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Gets information about all members of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members
-	*/
-	public function getMembers($list_id, $count, $offset, $parameters = array('fields' => 'members.id,members.email_address,members.unique_email_id,members.status,members.merge_fields'))
+	 * Gets information about all members of a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members
+	 */
+	public function getMembers(string $list_id, int $count, int $offset, array $parameters = ['fields' => 'members.id,members.email_address,members.unique_email_id,members.status,members.merge_fields'])
 	{
 		$parameters += [
 			'count' => $count,
 			'offset' => $offset
 		];
 
-		return $this->_connector->call('GET', '/lists/' . $list_id . '/members', $parameters);
+		return $this->_connector->call("/lists/$list_id/members", 'GET', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Gets information about a member of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $md5id
-	*   The member's email address md5 hash which is the id.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members_subscriber_hash
-	*/
-	public function getMemberInfoById($list_id, $md5id, $parameters = array('fields' => 'email_address,status,merge_fields'))
+	 * Gets information about a member of a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $md5id
+	 *   The member's email address md5 hash which is the id.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members_subscriber_hash
+	 */
+	public function getMemberInfoById(string $list_id, string $md5id, array $parameters = ['fields' => 'email_address,status,merge_fields'])
 	{
-		return $this->_connector->call('GET', '/lists/' . $list_id . '/members/' . $md5id, $parameters);
+		return $this->_connector->call("/lists/$list_id/members/$md5id", 'GET', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Gets information about a member of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The member's email address.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members_subscriber_hash
-	*/
-	public function getMemberInfo($list_id, $email, $parameters = array())
+	 * Gets information about a member of a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $email
+	 *   The member's email address.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#read-get_lists_list_id_members_subscriber_hash
+	 */
+	public function getMemberInfo(string $list_id, string $email, array $parameters = [])
 	{
-		return $this->_connector->call('GET', '/lists/' . $list_id . '/members/' . md5(strtolower($email)), $parameters);
+		return $this->_connector->call("/lists/$list_id/members/" . md5(strtolower($email)), 'GET', $parameters);
 	}
 
 	/**
-	* Gets activity related to a member of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The member's email address.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/activity/#read-get_lists_list_id_members_subscriber_hash_activity
-	*/
-	public function getMemberActivity($list_id, $email, $parameters = array())
+	 * Gets activity related to a member of a MailChimp list.
+	 *
+	 * @param string $list_id The ID of the list.
+	 * @param string $email The member's email address.
+	 * @param array $parameters Associative array of optional request parameters.
+	 * @return array|bool Associative array of results or false.
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/activity/#read-get_lists_list_id_members_subscriber_hash_activity
+	 */
+	public function getMemberActivity(string $list_id, string $email, array $parameters = [])
 	{
-		return $this->_connector->call('GET', '/lists/' . $list_id . '/members/' . md5(strtolower($email)) . '/activity', $parameters);
+		return $this->_connector->call("/lists/$list_id/members/" . md5(strtolower($email)) . '/activity', 'GET', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Adds a new member to a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The email address to add.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#create-post_lists_list_id_members
-	*/
-	public function addMember($list_id, $email, $first_name, $last_name, $parameters = array())
+	 * Adds a new member to a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $email
+	 *   The email address to add.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#create-post_lists_list_id_members
+	 */
+	public function addMember(string $list_id, string $email, string $first_name, string $last_name, array $parameters = [])
 	{
 		$parameters += [
 			'email_address' => $email,
 			'status' => 'subscribed',
-			'merge_fields' => array(
+			'merge_fields' => [
 				'FNAME' => $first_name,
 				'LNAME' => $last_name
-			)
+			]
 		];
 
-		return $this->_connector->call('POST', '/lists/' . $list_id . '/members/', $parameters);
+		return $this->_connector->call("/lists/$list_id/members/", 'POST', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Removes a member from a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The member's email address.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#delete-delete_lists_list_id_members_subscriber_hash
-	*/
-	public function removeMember($list_id, $email)
+	 * Removes a member from a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $email
+	 *   The member's email address.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#delete-delete_lists_list_id_members_subscriber_hash
+	 */
+	public function removeMember(string $list_id, string $email)
 	{
-		return $this->_connector->call('DELETE', '/lists/' . $list_id . '/members/' . md5(strtolower($email)));
+		return $this->_connector->call("/lists/$list_id/members/" . md5(strtolower($email)), 'DELETE');	//TODO: Hungarian notation
 	}
 
 	/**
-	* Updates a member of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The member's email address.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#edit-patch_lists_list_id_members_subscriber_hash
-	*/
-	public function updateMember($list_id, $email, $first_name, $last_name, $parameters = array())
+	 * Updates a member of a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $email
+	 *   The member's email address.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#edit-patch_lists_list_id_members_subscriber_hash
+	 */
+	public function updateMember(string $list_id, string $email, string $first_name, string $last_name, array $parameters = [])
 	{
 		$parameters += [
 			'status' => 'subscribed',
-			'merge_fields' => array(
+			'merge_fields' => [
 				'FNAME' => $first_name,
 				'LNAME' => $last_name
-			)
+			]
 		];
 
-		return $this->_connector->call('PATCH', '/lists/' . $list_id . '/members/' . md5(strtolower($email)), $parameters);
+		return $this->_connector->call("/lists/$list_id/members/" . md5(strtolower($email)), 'PATCH', $parameters);	//TODO: Hungarian notation
 	}
 
 	/**
-	* Adds a new or update an existing member of a MailChimp list.
-	*
-	* @param string $list_id
-	*   The ID of the list.
-	* @param string $email
-	*   The member's email address.
-	* @param array $parameters
-	*   Associative array of optional request parameters.
-	*
-	* @return object
-	*
-	* @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#edit-put_lists_list_id_members_subscriber_hash
-	*/
-	public function addOrUpdateMember($list_id, $email, $first_name, $last_name, $status, $parameters = array())
+	 * Adds a new or update an existing member of a MailChimp list.
+	 *
+	 * @param string $list_id
+	 *   The ID of the list.
+	 * @param string $email
+	 *   The member's email address.
+	 * @param array $parameters
+	 *   Associative array of optional request parameters.
+	 * @return array|bool
+	 * @see http://developer.mailchimp.com/documentation/mailchimp/reference/lists/members/#edit-put_lists_list_id_members_subscriber_hash
+	 */
+	public function addOrUpdateMember(string $list_id, string $email, string $first_name, string $last_name, string $status, array $parameters = [])
 	{
 		$parameters += [
 			'email_address' => $email,
 			'status' => $status,
 			'status_if_new' => 'subscribed',
-			'merge_fields' => array(
+			'merge_fields' => [
 				'FNAME' => $first_name,
 				'LNAME' => $last_name
-			)
+			]
 		];
 
-		return $this->_connector->call('PUT', '/lists/' . $list_id . '/members/' . md5(strtolower($email)), $parameters);
+		return $this->_connector->call("/lists/$list_id/members/" . md5(strtolower($email)), 'PUT', $parameters);	//TODO: Hungarian notation
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Receiving_lib.php b/app/Libraries/Receiving_lib.php
index b3a262dbd..c23a9bb08 100644
--- a/app/Libraries/Receiving_lib.php
+++ b/app/Libraries/Receiving_lib.php
@@ -1,393 +1,426 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Receiving library
- *
- * Library with utilities to manage receivings
- */
-
-class Receiving_lib
-{
-	private $CI;
-
-	public function __construct()
-	{
-		$this->CI =& get_instance();
-	}
-
-	public function get_cart()
-	{
-		if(!$this->CI->session->userdata('recv_cart'))
-		{
-			$this->set_cart(array());
-		}
-
-		return $this->CI->session->userdata('recv_cart');
-	}
-
-	public function set_cart($cart_data)
-	{
-		$this->CI->session->set_userdata('recv_cart', $cart_data);
-	}
-
-	public function empty_cart()
-	{
-		$this->CI->session->unset_userdata('recv_cart');
-	}
-
-	public function get_supplier()
-	{
-		if(!$this->CI->session->userdata('recv_supplier'))
-		{
-			$this->set_supplier(-1);
-		}
-
-		return $this->CI->session->userdata('recv_supplier');
-	}
-
-	public function set_supplier($supplier_id)
-	{
-		$this->CI->session->set_userdata('recv_supplier', $supplier_id);
-	}
-
-	public function remove_supplier()
-	{
-		$this->CI->session->unset_userdata('recv_supplier');
-	}
-
-	public function get_mode()
-	{
-		if(!$this->CI->session->userdata('recv_mode'))
-		{
-			$this->set_mode('receive');
-		}
-
-		return $this->CI->session->userdata('recv_mode');
-	}
-
-	public function set_mode($mode)
-	{
-		$this->CI->session->set_userdata('recv_mode', $mode);
-	}
-	
-	public function clear_mode()
-	{
-		$this->CI->session->unset_userdata('recv_mode');
-	}
-
-	public function get_stock_source()
-	{
-		if(!$this->CI->session->userdata('recv_stock_source'))
-		{
-			$this->set_stock_source($this->CI->Stock_location->get_default_location_id('receivings'));
-		}
-
-		return $this->CI->session->userdata('recv_stock_source');
-	}
-	
-	public function get_comment()
-	{
-		// avoid returning a NULL that results in a 0 in the comment if nothing is set/available
-		$comment = $this->CI->session->userdata('recv_comment');
-
-		return empty($comment) ? '' : $comment;
-	}
-	
-	public function set_comment($comment)
-	{
-		$this->CI->session->set_userdata('recv_comment', $comment);
-	}
-	
-	public function clear_comment()
-	{
-		$this->CI->session->unset_userdata('recv_comment');
-	}
-   
-	public function get_reference()
-	{
-		return $this->CI->session->userdata('recv_reference');
-	}
-	
-	public function set_reference($reference)
-	{
-		$this->CI->session->set_userdata('recv_reference', $reference);
-	}
-	
-	public function clear_reference()
-	{
-		$this->CI->session->unset_userdata('recv_reference');
-	}
-	
-	public function is_print_after_sale()
-	{
-		return $this->CI->session->userdata('recv_print_after_sale') == 'true' ||
-				$this->CI->session->userdata('recv_print_after_sale') == '1';
-	}
-	
-	public function set_print_after_sale($print_after_sale)
-	{
-		return $this->CI->session->set_userdata('recv_print_after_sale', $print_after_sale);
-	}
-	
-	public function set_stock_source($stock_source)
-	{
-		$this->CI->session->set_userdata('recv_stock_source', $stock_source);
-	}
-	
-	public function clear_stock_source()
-	{
-		$this->CI->session->unset_userdata('recv_stock_source');
-	}
-	
-	public function get_stock_destination()
-	{
-		if(!$this->CI->session->userdata('recv_stock_destination'))
-		{
-			$this->set_stock_destination($this->CI->Stock_location->get_default_location_id('receivings'));
-		}
-
-		return $this->CI->session->userdata('recv_stock_destination');
-	}
-
-	public function set_stock_destination($stock_destination)
-	{
-		$this->CI->session->set_userdata('recv_stock_destination', $stock_destination);
-	}
-	
-	public function clear_stock_destination()
-	{
-		$this->CI->session->unset_userdata('recv_stock_destination');
-	}
-
-	public function add_item($item_id, $quantity = 1, $item_location = NULL, $discount = 0, $discount_type = 0, $price = NULL, $description = NULL, $serialnumber = NULL, $receiving_quantity = NULL, $receiving_id = NULL, $include_deleted = FALSE)
-	{
-		//make sure item exists in database.
-		if(!$this->CI->Item->exists($item_id, $include_deleted))
-		{
-			//try to get item id given an item_number
-			$item_id = $this->CI->Item->get_item_id($item_id, $include_deleted);
-
-			if(!$item_id)
-			{
-				return FALSE;
-			}
-		}
-
-		//Get items in the receiving so far.
-		$items = $this->get_cart();
-
-		//We need to loop through all items in the cart.
-		//If the item is already there, get it's key($updatekey).
-		//We also need to get the next key that we are going to use in case we need to add the
-		//item to the list. Since items can be deleted, we can't use a count. we use the highest key + 1.
-
-		$maxkey = 0;					//Highest key so far
-		$itemalreadyinsale = FALSE;		//We did not find the item yet.
-		$insertkey = 0;					//Key to use for new entry.
-		$updatekey = 0;					//Key to use to update(quantity)
-
-		foreach($items as $item)
-		{
-			//We primed the loop so maxkey is 0 the first time.
-			//Also, we have stored the key in the element itself so we can compare.
-			//There is an array public function to get the associated key for an element, but I like it better
-			//like that!
-
-			if($maxkey <= $item['line'])
-			{
-				$maxkey = $item['line'];
-			}
-
-			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)
-			{
-				$itemalreadyinsale = TRUE;
-				$updatekey = $item['line'];
-			}
-		}
-
-		$insertkey = $maxkey+1;
-		$item_info = $this->CI->Item->get_info($item_id,$item_location);
-		//array records are identified by $insertkey and item_id is just another field.
-		$price = $price != NULL ? $price : $item_info->cost_price;
-
-		if($this->CI->config->item('multi_pack_enabled') == '1')
-		{
-			$item_info->name .= NAME_SEPARATOR . $item_info->pack_name;
-		}
-
-		if ($item_info->receiving_quantity == 0 || $item_info->receiving_quantity == 1)
-		{
-			$receiving_quantity_choices = array(1  => 'x1');
-		}
-		else
-		{
-			$receiving_quantity_choices = array(
-				to_quantity_decimals($item_info->receiving_quantity) => 'x' . to_quantity_decimals($item_info->receiving_quantity),
-				1  => 'x1');
-		}
-
-		if(is_null($receiving_quantity))
-		{
-			$receiving_quantity = $item_info->receiving_quantity;
-		}
-
-		$attribute_links = $this->CI->Attribute->get_link_values($item_id, 'receiving_id', $receiving_id, Attribute::SHOW_IN_RECEIVINGS)->row_object();
-
-		$item = array($insertkey => array(
-				'item_id' => $item_id,
-				'item_location' => $item_location,
-				'item_number' => $item_info->item_number,
-				'stock_name' => $this->CI->Stock_location->get_location_name($item_location),
-				'line' => $insertkey,
-				'name' => $item_info->name,
-				'description' => $description != NULL ? $description: $item_info->description,
-				'serialnumber' => $serialnumber != NULL ? $serialnumber: '',
-				'attribute_values' => $attribute_links->attribute_values,
-				'attribute_dtvalues' => $attribute_links->attribute_dtvalues,
-				'allow_alt_description' => $item_info->allow_alt_description,
-				'is_serialized' => $item_info->is_serialized,
-				'quantity' => $quantity,
-				'discount' => $discount,
-				'discount_type' => $discount_type,
-				'in_stock' => $this->CI->Item_quantity->get_item_quantity($item_id, $item_location)->quantity,
-				'price' => $price,
-				'receiving_quantity' => $receiving_quantity,
-				'receiving_quantity_choices' => $receiving_quantity_choices,
-				'total' => $this->get_item_total($quantity, $price, $discount, $discount_type, $receiving_quantity)
-			)
-		);
-
-		//Item already exists
-		if($itemalreadyinsale)
-		{
-			$items[$updatekey]['quantity'] += $quantity;
-			$items[$updatekey]['total'] = $this->get_item_total($items[$updatekey]['quantity'], $price, $discount, $discount_type, $items[$updatekey]['receiving_quantity']);
-		}
-		else
-		{
-			//add to existing array
-			$items += $item;
-		}
-
-		$this->set_cart($items);
-
-		return TRUE;
-	}
-
-	public function edit_item($line, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $receiving_quantity)
-	{
-		$items = $this->get_cart();
-		if(isset($items[$line]))
-		{
-			$line = &$items[$line];
-			$line['description'] = $description;
-			$line['serialnumber'] = $serialnumber;
-			$line['quantity'] = $quantity;
-			$line['receiving_quantity'] = $receiving_quantity;
-			$line['discount'] = $discount;
-			if(!is_null($discount_type))
-			{
-				$line['discount_type'] = $discount_type;
-			}
-			$line['price'] = $price;
-			$line['total'] = $this->get_item_total($quantity, $price, $discount, $discount_type, $receiving_quantity);
-			$this->set_cart($items);
-		}
-
-		return FALSE;
-	}
-
-	public function delete_item($line)
-	{
-		$items = $this->get_cart();
-		unset($items[$line]);
-		$this->set_cart($items);
-	}
-
-	public function return_entire_receiving($receipt_receiving_id)
-	{
-		//RECV #
-		$pieces = explode(' ', $receipt_receiving_id);
-		if(preg_match("/(RECV|KIT)/", $pieces[0]))
-		{
-			$receiving_id = $pieces[1];
-		} 
-		else 
-		{
-			$receiving_id = $this->CI->Receiving->get_receiving_by_reference($receipt_receiving_id)->row()->receiving_id;
-		}
-
-		$this->empty_cart();
-		$this->remove_supplier();
-		$this->clear_comment();
-
-		foreach($this->CI->Receiving->get_receiving_items($receiving_id)->result() as $row)
-		{
-			$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, $receiving_id, TRUE);
-		}
-
-		$this->set_supplier($this->CI->Receiving->get_supplier($receiving_id)->person_id);
-	}
-
-	public function add_item_kit($external_item_kit_id, $item_location, $discount, $discount_type)
-	{
-		//KIT #
-		$pieces = explode(' ',$external_item_kit_id);
-		$item_kit_id = count($pieces) > 1 ? $pieces[1] : $external_item_kit_id;
-		
-		foreach($this->CI->Item_kit_items->get_info($item_kit_id) as $item_kit_item)
-		{
-			$this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $discount_type);
-		}
-	}
-
-	public function copy_entire_receiving($receiving_id)
-	{
-		$this->empty_cart();
-		$this->remove_supplier();
-
-		foreach($this->CI->Receiving->get_receiving_items($receiving_id)->result() as $row)
-		{
-			$this->add_item($row->item_id, $row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, $receiving_id, TRUE);
-		}
-
-		$this->set_supplier($this->CI->Receiving->get_supplier($receiving_id)->person_id);
-		//$this->set_reference($this->CI->Receiving->get_info($receiving_id)->row()->reference);
-	}
-
-	public function clear_all()
-	{
-		$this->clear_mode();
-		$this->empty_cart();
-		$this->remove_supplier();
-		$this->clear_comment();
-		$this->clear_reference();
-	}
-
-	public function get_item_total($quantity, $price, $discount, $discount_type, $receiving_quantity)
-	{
-		$extended_quantity = bcmul($quantity, $receiving_quantity);
-		$total = bcmul($extended_quantity, $price);
-		$discount_amount = $discount;
-		if($discount_type == PERCENT)
-		{
-			$discount_fraction = bcdiv($discount, 100);
-			$discount_amount = bcmul($total, $discount_fraction);
-		}
-
-		return bcsub($total, $discount_amount);
-	}
-
-	public function get_total()
-	{
-		$total = 0;
-		foreach($this->get_cart() as $item)
-		{
-			$total = bcadd($total, $this->get_item_total(($item['quantity']), $item['price'], $item['discount'], $item['discount_type'], $item['receiving_quantity']));
-		}
-		
-		return $total;
-	}
-}
-
-?>
+<?php
+
+namespace app\Libraries;
+
+use App\Models\Attribute;
+use App\Models\Item;
+use App\Models\Item_kit_items;
+use App\Models\Item_quantity;
+use App\Models\Receiving;
+use App\Models\Stock_location;
+
+use CodeIgniter\Session\Session;
+
+/**
+ * Receiving library
+ *
+ * Library with utilities to manage receivings
+ *
+ * @property attribute attribute
+ * @property item item
+ * @property item_kit_items item_kit_items
+ * @property item_quantity item_quantity
+ * @property receiving receiving
+ * @property stock_location stock_location
+ * 
+ * @property session session
+ *
+ */
+class Receiving_lib
+{
+	public function __construct()
+	{
+		$this->attribute = model('Attribute');
+		$this->item = model('Item');
+		$this->item_kit_items = model('Item_kit_items');
+		$this->item_quantity = model('Item_quantity');
+		$this->receiving = model('Receiving');
+		$this->stock_location = model('Stock_location');
+		
+		$this->session = session();
+	}
+
+	public function get_cart(): array
+	{
+		if(!$this->session->get('recv_cart'))
+		{
+			$this->set_cart ([]);
+		}
+
+		return $this->session->get('recv_cart');
+	}
+
+	public function set_cart(array $cart_data): void
+	{
+		$this->session->set('recv_cart', $cart_data);
+	}
+
+	public function empty_cart(): void
+	{
+		$this->session->remove('recv_cart');
+	}
+
+	public function get_supplier(): int
+	{
+		if(!$this->session->get('recv_supplier'))
+		{
+			$this->set_supplier(-1);	//TODO: Replace -1 with a constant.
+		}
+
+		return $this->session->get('recv_supplier');
+	}
+
+	public function set_supplier(int $supplier_id): void
+	{
+		$this->session->set('recv_supplier', $supplier_id);
+	}
+
+	public function remove_supplier(): void
+	{
+		$this->session->remove('recv_supplier');
+	}
+
+	public function get_mode(): string
+	{
+		if(!$this->session->get('recv_mode'))
+		{
+			$this->set_mode('receive');
+		}
+
+		return $this->session->get('recv_mode');
+	}
+
+	public function set_mode(string $mode): void
+	{
+		$this->session->set('recv_mode', $mode);
+	}
+	
+	public function clear_mode(): void	//TODO: This function verb is inconsistent from the others.  Consider refactoring to remove_mode()
+	{
+		$this->session->remove('recv_mode');
+	}
+
+	public function get_stock_source(): int
+	{
+		if(!$this->session->get('recv_stock_source'))
+		{
+			$this->set_stock_source($this->stock_location->get_default_location_id('receivings'));
+		}
+
+		return $this->session->get('recv_stock_source');
+	}
+	
+	public function get_comment(): string
+	{
+		$comment = $this->session->get('recv_comment');
+
+		return empty($comment) ? '' : $comment;
+	}
+	
+	public function set_comment(string $comment): void
+	{
+		$this->session->set('recv_comment', $comment);
+	}
+	
+	public function clear_comment(): void	//TODO: This function verb is inconsistent from the others.  Consider refactoring to remove_comment()
+	{
+		$this->session->remove('recv_comment');
+	}
+   
+	public function get_reference(): string
+	{
+		return $this->session->get('recv_reference');
+	}
+	
+	public function set_reference(string $reference): void
+	{
+		$this->session->set('recv_reference', $reference);
+	}
+	
+	public function clear_reference(): void	//TODO: This function verb is inconsistent from the others.  Consider refactoring to remove_reference()
+	{
+		$this->session->remove('recv_reference');
+	}
+	
+	public function is_print_after_sale(): bool
+	{
+		return $this->session->get('recv_print_after_sale') == 'true'
+			|| $this->session->get('recv_print_after_sale') == '1';
+	}
+	
+	public function set_print_after_sale(bool $print_after_sale): void
+	{
+		$this->session->set('recv_print_after_sale', $print_after_sale);
+	}
+	
+	public function set_stock_source(int $stock_source): void
+	{
+		$this->session->set('recv_stock_source', $stock_source);
+	}
+	
+	public function clear_stock_source(): void
+	{
+		$this->session->remove('recv_stock_source');
+	}
+	
+	public function get_stock_destination(): string
+	{
+		if(!$this->session->get('recv_stock_destination'))
+		{
+			$this->set_stock_destination($this->stock_location->get_default_location_id('receivings'));
+		}
+
+		return $this->session->get('recv_stock_destination');
+	}
+
+	public function set_stock_destination(string $stock_destination): void
+	{
+		$this->session->set('recv_stock_destination', $stock_destination);
+	}
+	
+	public function clear_stock_destination(): void
+	{
+		$this->session->remove('recv_stock_destination');
+	}
+	//TODO: This array signature needs to be reworked.  It's way too long. Perhaps an object needs to be passed rather than these?
+	public function add_item(int $item_id, int $quantity = 1, int $item_location = NULL, float $discount = 0, int $discount_type = 0, float $price = NULL, string $description = NULL, string $serialnumber = NULL, float $receiving_quantity = NULL, int $receiving_id = NULL, bool $include_deleted = FALSE): bool
+	{
+		//make sure item exists in database.
+		if(!$this->item->exists($item_id, $include_deleted))
+		{
+			//try to get item id given an item_number
+			$item_id = $this->item->get_item_id($item_id, $include_deleted);
+
+			if(!$item_id)
+			{
+				return FALSE;
+			}
+		}
+
+		//Get items in the receiving so far.
+		$items = $this->get_cart();
+
+		//We need to loop through all items in the cart.
+		//If the item is already there, get it's key($updatekey).
+		//We also need to get the next key that we are going to use in case we need to add the
+		//item to the list. Since items can be deleted, we can't use a count. we use the highest key + 1.
+
+		$maxkey = 0;					//Highest key so far
+		$itemalreadyinsale = FALSE;		//We did not find the item yet.
+		$updatekey = 0;					//Key to use to update(quantity)
+
+		foreach($items as $item)
+		{
+			//We primed the loop so maxkey is 0 the first time.
+			//Also, we have stored the key in the element itself, so we can compare.
+			//There is an array public function to get the associated key for an element, but I like it better
+			//like that!
+
+			if($maxkey <= $item['line'])
+			{
+				$maxkey = $item['line'];
+			}
+
+			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)
+			{
+				$itemalreadyinsale = TRUE;
+				$updatekey = $item['line'];
+			}
+		}
+
+		$insertkey = $maxkey + 1;
+		$item_info = $this->item->get_info($item_id);
+
+		//array records are identified by $insertkey and item_id is just another field.
+		$price = $price != NULL ? $price : $item_info->cost_price;
+
+		if(config('OSPOS')->multi_pack_enabled)
+		{
+			$item_info->name .= NAME_SEPARATOR . $item_info->pack_name;
+		}
+
+		if ($item_info->receiving_quantity == 0 || $item_info->receiving_quantity == 1)
+		{
+			$receiving_quantity_choices = [1  => 'x1'];
+		}
+		else
+		{
+			$receiving_quantity_choices = [
+				to_quantity_decimals($item_info->receiving_quantity) => 'x' . to_quantity_decimals($item_info->receiving_quantity),
+				1  => 'x1'
+			];
+		}
+
+		if(is_null($receiving_quantity))
+		{
+			$receiving_quantity = $item_info->receiving_quantity;
+		}
+
+		$attribute_links = $this->attribute->get_link_values($item_id, 'receiving_id', $receiving_id, Attribute::SHOW_IN_RECEIVINGS)->getRowObject();
+
+		$item_quantity = model(Item_quantity::class);
+
+		$item = [
+			$insertkey => [
+				'item_id' => $item_id,
+				'item_location' => $item_location,
+				'item_number' => $item_info->item_number,
+				'stock_name' => $this->stock_location->get_location_name($item_location),
+				'line' => $insertkey,
+				'name' => $item_info->name,
+				'description' => $description != NULL ? $description: $item_info->description,
+				'serialnumber' => $serialnumber != NULL ? $serialnumber: '',
+				'attribute_values' => $attribute_links->attribute_values,
+				'attribute_dtvalues' => $attribute_links->attribute_dtvalues,
+				'allow_alt_description' => $item_info->allow_alt_description,
+				'is_serialized' => $item_info->is_serialized,
+				'quantity' => $quantity,
+				'discount' => $discount,
+				'discount_type' => $discount_type,
+				'in_stock' => $item_quantity->get_item_quantity($item_id, $item_location)->quantity,
+				'price' => $price,
+				'receiving_quantity' => $receiving_quantity,
+				'receiving_quantity_choices' => $receiving_quantity_choices,
+				'total' => $this->get_item_total($quantity, $price, $discount, $discount_type, $receiving_quantity)
+			]
+		];
+
+		//Item already exists
+		if($itemalreadyinsale)	//TODO: This variable does not adhere to naming conventions.
+		{
+			$items[$updatekey]['quantity'] += $quantity;
+			$items[$updatekey]['total'] = $this->get_item_total($items[$updatekey]['quantity'], $price, $discount, $discount_type, $items[$updatekey]['receiving_quantity']);
+		}
+		else
+		{
+			//add to existing array
+			$items += $item;
+		}
+
+		$this->set_cart($items);
+
+		return TRUE;
+	}
+
+	public function edit_item($line, string $description, string $serialnumber, float $quantity, float $discount, int $discount_type, float $price, float $receiving_quantity): bool
+	{
+		$items = $this->get_cart();
+		if(isset($items[$line]))
+		{
+			$line = &$items[$line];
+			$line['description'] = $description;
+			$line['serialnumber'] = $serialnumber;
+			$line['quantity'] = $quantity;
+			$line['receiving_quantity'] = $receiving_quantity;
+			$line['discount'] = $discount;
+
+			if(!is_null($discount_type))	//TODO: $discount_type is an int which means it will never be null and this if statement will always evaluate to true.
+			{
+				$line['discount_type'] = $discount_type;
+			}
+
+			$line['price'] = $price;
+			$line['total'] = $this->get_item_total($quantity, $price, $discount, $discount_type, $receiving_quantity);
+			$this->set_cart($items);
+		}
+
+		return FALSE;	//TODO: This function will always return false.
+	}
+
+	/**
+	 * @param $line int|string The item_number or item_id of the item to be removed from the receiving.
+	 */
+	public function delete_item($line): void
+	{
+		$items = $this->get_cart();
+		unset($items[$line]);
+		$this->set_cart($items);
+	}
+
+	public function return_entire_receiving(int $receipt_receiving_id): void
+	{
+		//RECV #
+		$pieces = explode(' ', $receipt_receiving_id);
+
+		if(preg_match("/(RECV|KIT)/", $pieces[0]))	//TODO: this needs to be converted to ternary notation.
+		{
+			$receiving_id = $pieces[1];
+		} 
+		else 
+		{
+			$receiving_id = $this->receiving->get_receiving_by_reference($receipt_receiving_id)->getRow()->receiving_id;
+		}
+
+		$this->empty_cart();
+		$this->remove_supplier();
+		$this->clear_comment();
+
+		foreach($this->receiving->get_receiving_items($receiving_id)->getResult() as $row)
+		{
+			$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, $receiving_id, TRUE);
+		}
+
+		$this->set_supplier($this->receiving->get_supplier($receiving_id)->person_id);
+	}
+
+	public function add_item_kit(string $external_item_kit_id, int $item_location, float $discount, int $discount_type): void
+	{
+		//KIT #
+		$pieces = explode(' ',$external_item_kit_id);
+		$item_kit_id = count($pieces) > 1 ? $pieces[1] : $external_item_kit_id;
+		
+		foreach($this->item_kit_items->get_info($item_kit_id) as $item_kit_item)
+		{
+			$this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $discount_type);
+		}
+	}
+
+	public function copy_entire_receiving(int $receiving_id): void
+	{
+		$this->empty_cart();
+		$this->remove_supplier();
+
+		foreach($this->receiving->get_receiving_items($receiving_id)->getResult() as $row)
+		{
+			$this->add_item($row->item_id, $row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, $row->item_unit_price, $row->description, $row->serialnumber, $row->receiving_quantity, $receiving_id, TRUE);
+		}
+
+		$this->set_supplier($this->receiving->get_supplier($receiving_id)->person_id);
+		//$this->set_reference($this->receiving->get_info($receiving_id)->getRow()->reference);	//TODO: If this code won't be added back in, then let's delete it.
+	}
+
+	public function clear_all(): void
+	{
+		$this->clear_mode();
+		$this->empty_cart();
+		$this->remove_supplier();
+		$this->clear_comment();
+		$this->clear_reference();
+	}
+
+	public function get_item_total(float $quantity, float $price, float $discount, int $discount_type, float $receiving_quantity): string
+	{
+		$extended_quantity = bcmul($quantity, $receiving_quantity);
+		$total = bcmul($extended_quantity, $price);
+		$discount_amount = $discount;
+
+		if($discount_type == PERCENT)	//TODO: === ?
+		{
+			$discount_fraction = bcdiv($discount, 100);
+			$discount_amount = bcmul($total, $discount_fraction);
+		}
+
+		return bcsub($total, $discount_amount);
+	}
+
+	public function get_total(): string
+	{
+		$total = 0;
+		foreach($this->get_cart() as $item)
+		{
+			$total = bcadd($total, $this->get_item_total(($item['quantity']), $item['price'], $item['discount'], $item['discount_type'], $item['receiving_quantity']));
+		}
+		
+		return $total;
+	}
+}
\ No newline at end of file
diff --git a/app/Libraries/Sale_lib.php b/app/Libraries/Sale_lib.php
index 6a273df0a..42b088d95 100644
--- a/app/Libraries/Sale_lib.php
+++ b/app/Libraries/Sale_lib.php
@@ -1,82 +1,123 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use app\Models\Attribute;
+use app\Models\Customer;
+use app\Models\Dinner_table;
+use app\Models\Item;
+use app\Models\Item_kit_items;
+use app\Models\Item_quantity;
+use app\Models\Item_taxes;
+use app\Models\Enums\Rounding_mode;
+use app\Models\Sale;
+use CodeIgniter\Session\Session;
+use app\Models\Stock_location;
+use ReflectionException;
 
 /**
  * Sale library
  *
  * Library with utilities to manage sales
+ *
+ * @property attribute attribute
+ * @property customer customer
+ * @property dinner_table dinner_table
+ * @property item item
+ * @property item_kit_items item_kit_items
+ * @property item_quantity item_quantity
+ * @property item_taxes item_taxes
+ * @property rounding_mode rounding_mode
+ * @property sale sale
+ * @property stock_location stock_location
+ *
+ * @property tax_lib tax_lib
+ * @property session session
  */
-
 class Sale_lib
 {
-	private $CI;
-
 	public function __construct()
 	{
-		$this->CI =& get_instance();
-		$this->CI->load->library('tax_lib');
-		$this->CI->load->model('enums/Rounding_mode');
+		$this->tax_lib = new Tax_lib();
+		$this->session = Session();
+
+		$this->attribute = model('Attribute');
+		$this->customer = model('Customer');
+		$this->dinner_table = model('Dinner_table');
+		$this->item = model('Item');
+		$this->item_kit_items = model('Item_kit_items');
+		$this->item_quantity = model('Item_quantity');
+		$this->item_taxes = model('Item_taxes');
+		$this->rounding_mode = model('enums/Rounding_mode');
+		$this->sale = model('Sale');
+		$this->stock_location = model('Stock_location');
 	}
 
-	public function get_line_sequence_options()
+	public function get_line_sequence_options(): array
 	{
-		return array(
-			'0' => $this->CI->lang->line('sales_entry'),
-			'1' => $this->CI->lang->line('sales_group_by_type'),
-			'2' => $this->CI->lang->line('sales_group_by_category')
-		);
+		return [
+			'0' => lang('Sales.entry'),
+			'1' => lang('Sales.group_by_type'),
+			'2' => lang('Sales.group_by_category')
+		];
 	}
 
-	public function get_register_mode_options()
+	public function get_register_mode_options(): array
 	{
-		$register_modes = array();
-		if($this->CI->config->item('invoice_enable') == '0')
+		$register_modes = [];
+
+		if(!config('OSPOS')->invoice_enable)
 		{
-			$register_modes['sale'] = $this->CI->lang->line('sales_sale');
+			$register_modes['sale'] = lang('Sales.sale');
 		}
 		else
 		{
-			$register_modes['sale'] = $this->CI->lang->line('sales_receipt');
-			$register_modes['sale_quote'] = $this->CI->lang->line('sales_quote');
-			if($this->CI->config->item('work_order_enable') == '1')
+			$register_modes['sale'] = lang('Sales.receipt');
+			$register_modes['sale_quote'] = lang('Sales.quote');
+
+			if(config('OSPOS')->work_order_enable)
 			{
-				$register_modes['sale_work_order'] = $this->CI->lang->line('sales_work_order');
+				$register_modes['sale_work_order'] = lang('Sales.work_order');
 			}
-			$register_modes['sale_invoice'] = $this->CI->lang->line('sales_invoice');
+
+			$register_modes['sale_invoice'] = lang('Sales.invoice');
 		}
-		$register_modes['return'] = $this->CI->lang->line('sales_return');
+
+		$register_modes['return'] = lang('Sales.return');
+
 		return $register_modes;
 	}
 
-	public function get_invoice_type_options()
+	public function get_invoice_type_options(): array
 	{
-		$invoice_types = array();
-		$invoice_types['invoice'] = $this->CI->lang->line('sales_invoice_type_invoice');
-		$invoice_types['tax_invoice'] = $this->CI->lang->line('sales_invoice_type_tax_invoice');
-		$invoice_types['custom_invoice'] = $this->CI->lang->line('sales_invoice_type_custom_invoice');
-		$invoice_types['custom_tax_invoice'] = $this->CI->lang->line('sales_invoice_type_custom_tax_invoice');
+		$invoice_types = [];
+		$invoice_types['invoice'] = lang('Sales.invoice_type_invoice');
+		$invoice_types['tax_invoice'] = lang('Sales.invoice_type_tax_invoice');
+		$invoice_types['custom_invoice'] = lang('Sales.invoice_type_custom_invoice');
+		$invoice_types['custom_tax_invoice'] = lang('Sales.invoice_type_custom_tax_invoice');
 		return $invoice_types;
 	}
 
-	public function get_cart()
+	public function get_cart(): array
 	{
-		if(!$this->CI->session->userdata('sales_cart'))
+		if(!$this->session->get('sales_cart'))
 		{
-			$this->set_cart(array());
+			$this->set_cart ([]);
 		}
 
-		return $this->CI->session->userdata('sales_cart');
+		return $this->session->get('sales_cart');
 	}
 
-	public function sort_and_filter_cart($cart)
+	public function sort_and_filter_cart(array $cart): array
 	{
 		if(empty($cart))
 		{
 			return $cart;
 		}
 
-		$filtered_cart = array();
+		$filtered_cart = [];
 
-		foreach($cart as $k => $v)
+		foreach($cart as $k => $v)	//TODO: We should not be using single-letter variable names for readability.  Several of these foreach loops should be refactored.
 		{
 			if($v['print_option'] == PRINT_YES)
 			{
@@ -88,10 +129,11 @@ class Sale_lib
 			}
 		}
 
+		//TODO: This set of if/elseif/else needs to be converted to a switch statement
 		// Entry sequence (this will render kits in the expected sequence)
-		if($this->CI->config->item('line_sequence') == '0')
+		if(config('OSPOS')->line_sequence == '0')
 		{
-			$sort = array();
+			$sort = [];
 			foreach($filtered_cart as $k => $v)
 			{
 				$sort['line'][$k] = $v['line'];
@@ -99,21 +141,21 @@ class Sale_lib
 			array_multisort($sort['line'], SORT_ASC, $filtered_cart);
 		}
 		// Group by Stock Type (nonstock first - type 1, stock next - type 0)
-		elseif($this->CI->config->item('line_sequence') == '1')
+		elseif(config('OSPOS')->line_sequence == '1')	//TODO: Need to change these to constants
 		{
-			$sort = array();
+			$sort = [];
 			foreach($filtered_cart as $k => $v)
 			{
 				$sort['stock_type'][$k] = $v['stock_type'];
 				$sort['description'][$k] = $v['description'];
 				$sort['name'][$k] = $v['name'];
 			}
-			array_multisort($sort['stock_type'], SORT_DESC, $sort['description'], SORT_ASC, $sort['name'], SORT_ASC . $filtered_cart);
+			array_multisort($sort['stock_type'], SORT_DESC, $sort['description'], SORT_ASC, $sort['name'], SORT_ASC, $filtered_cart);
 		}
 		// Group by Item Category
-		elseif($this->CI->config->item('line_sequence') == '2')
+		elseif(config('OSPOS')->line_sequence == '2')	//TODO: Need to change these to constants
 		{
-			$sort = array();
+			$sort = [];
 			foreach($filtered_cart as $k => $v)
 			{
 				$sort['category'][$k] = $v['stock_type'];
@@ -125,7 +167,7 @@ class Sale_lib
 		// Group by entry sequence in descending sequence (the Standard)
 		else
 		{
-			$sort = array();
+			$sort = [];
 			foreach($filtered_cart as $k => $v)
 			{
 				$sort['line'][$k] = $v['line'];
@@ -136,245 +178,247 @@ class Sale_lib
 		return $filtered_cart;
 	}
 
-	public function set_cart($cart_data)
+	public function set_cart(array $cart_data): void
 	{
-		$this->CI->session->set_userdata('sales_cart', $cart_data);
+		$this->session->set('sales_cart', $cart_data);
 	}
 
-	public function empty_cart()
+	public function empty_cart(): void
 	{
-		$this->CI->session->unset_userdata('sales_cart');
+		$this->session->remove('sales_cart');
 	}
 
-	public function remove_temp_items()
+	public function remove_temp_items(): void
 	{
 		// Loop through the cart items and delete temporary items specific to this sale
 		$cart = $this->get_cart();
 		foreach($cart as $line=>$item)
 		{
-			if($item['item_type'] == ITEM_TEMP)
+			if($item['item_type'] == ITEM_TEMP)	//TODO: === ?
 			{
-				$this->CI->Item->delete($item['item_id']);
+				$this->item->delete($item['item_id']);
 			}
 		}
 	}
 
-	public function get_comment()
+	public function get_comment(): string
 	{
 		// avoid returning a NULL that results in a 0 in the comment if nothing is set/available
-		$comment = $this->CI->session->userdata('sales_comment');
+		$comment = $this->session->get('sales_comment');
 
 		return empty($comment) ? '' : $comment;
 	}
 
-	public function set_comment($comment)
+	public function set_comment(string $comment): void
 	{
-		$this->CI->session->set_userdata('sales_comment', $comment);
+		$this->session->set('sales_comment', $comment);
 	}
 
-	public function clear_comment()
+	public function clear_comment(): void
 	{
-		$this->CI->session->unset_userdata('sales_comment');
+		$this->session->remove('sales_comment');
 	}
 
-	public function get_invoice_number()
+	public function get_invoice_number(): string
 	{
-		return $this->CI->session->userdata('sales_invoice_number');
+		return $this->session->get('sales_invoice_number');
 	}
 
-	public function get_quote_number()
+	public function get_quote_number(): string
 	{
-		return $this->CI->session->userdata('sales_quote_number');
+		return $this->session->get('sales_quote_number');
 	}
 
-	public function get_work_order_number()
+	public function get_work_order_number(): string
 	{
-		return $this->CI->session->userdata('sales_work_order_number');
+		return $this->session->get('sales_work_order_number');
 	}
 
-	public function get_sale_type()
+	public function get_sale_type(): int
 	{
-		return $this->CI->session->userdata('sale_type');
+		return $this->session->get('sale_type');
 	}
 
-	public function set_invoice_number($invoice_number, $keep_custom = FALSE)
+	public function set_invoice_number(int $invoice_number, bool $keep_custom = FALSE): void
 	{
-		$current_invoice_number = $this->CI->session->userdata('sales_invoice_number');
+		$current_invoice_number = $this->session->get('sales_invoice_number');
+
 		if(!$keep_custom || empty($current_invoice_number))
 		{
-			$this->CI->session->set_userdata('sales_invoice_number', $invoice_number);
-
+			$this->session->set('sales_invoice_number', $invoice_number);
 		}
 	}
 
-	public function set_quote_number($quote_number, $keep_custom = FALSE)
+	public function set_quote_number(string $quote_number, bool $keep_custom = FALSE): void
 	{
-		$current_quote_number = $this->CI->session->userdata('sales_quote_number');
+		$current_quote_number = $this->session->get('sales_quote_number');
+
 		if(!$keep_custom || empty($current_quote_number))
 		{
-			$this->CI->session->set_userdata('sales_quote_number', $quote_number);
+			$this->session->set('sales_quote_number', $quote_number);
 		}
 	}
 
-	public function set_work_order_number($work_order_number, $keep_custom = FALSE)
+	public function set_work_order_number(string $work_order_number, bool $keep_custom = FALSE): void
 	{
-		$current_work_order_number = $this->CI->session->userdata('sales_work_order_number');
+		$current_work_order_number = $this->session->get('sales_work_order_number');
+
 		if(!$keep_custom || empty($current_work_order_number))
 		{
-			$this->CI->session->set_userdata('sales_work_order_number', $work_order_number);
+			$this->session->set('sales_work_order_number', $work_order_number);
 		}
 	}
 
-	public function set_sale_type($sale_type, $keep_custom = FALSE)
+	public function set_sale_type(int $sale_type, bool $keep_custom = FALSE): void
 	{
-		$current_sale_type = $this->CI->session->userdata('sale_type');
+		$current_sale_type = $this->session->get('sale_type');
+
 		if(!$keep_custom || empty($current_sale_type))
 		{
-			$this->CI->session->set_userdata('sale_type', $sale_type);
+			$this->session->set('sale_type', $sale_type);
 		}
 	}
 
-	public function clear_invoice_number()
+	public function clear_invoice_number(): void
 	{
-		$this->CI->session->unset_userdata('sales_invoice_number');
+		$this->session->remove('sales_invoice_number');
 	}
 
-	public function clear_quote_number()
+	public function clear_quote_number(): void
 	{
-		$this->CI->session->unset_userdata('sales_quote_number');
+		$this->session->remove('sales_quote_number');
 	}
 
-	public function clear_work_order_number()
+	public function clear_work_order_number(): void
 	{
-		$this->CI->session->unset_userdata('sales_work_order_number');
+		$this->session->remove('sales_work_order_number');
 	}
 
-	public function clear_sale_type()
+	public function clear_sale_type(): void
 	{
-		$this->CI->session->unset_userdata('sale_type');
+		$this->session->remove('sale_type');
 	}
 
-	public function set_suspended_id($suspended_id)
+	public function set_suspended_id(int $suspended_id): void
 	{
-		$this->CI->session->set_userdata('suspended_id', $suspended_id);
+		$this->session->set('suspended_id', $suspended_id);
 	}
 
-	public function get_suspended_id()
+	public function get_suspended_id(): int
 	{
-		return $this->CI->session->userdata('suspended_id');
+		return $this->session->get('suspended_id');
 	}
 
-	public function is_invoice_mode()
+	public function is_invoice_mode(): bool
 	{
-		return ($this->CI->session->userdata('sales_mode') == 'sale_invoice' &&
-					$this->CI->config->item('invoice_enable') == TRUE);
+		return ($this->session->get('sales_mode') == 'sale_invoice'	&& config('OSPOS')->invoice_enable);
 	}
 
-	public function is_sale_by_receipt_mode()
+	public function is_sale_by_receipt_mode(): bool	//TODO: This function is not called anywhere in the code.
 	{
-		return ($this->CI->session->userdata('sales_mode') == 'sale');
+		return ($this->session->get('sales_mode') == 'sale');	//TODO: === ?
 	}
 
-	public function is_quote_mode()
+	public function is_quote_mode(): bool
 	{
-		return ($this->CI->session->userdata('sales_mode') == 'sale_quote');
+		return ($this->session->get('sales_mode') == 'sale_quote');	//TODO: === ?
 	}
 
-	public function is_return_mode()
+	public function is_return_mode(): bool
 	{
-		return ($this->CI->session->userdata('sales_mode') == 'return');
+		return ($this->session->get('sales_mode') == 'return');	//TODO: === ?
 	}
 
-	public function is_work_order_mode()
+	public function is_work_order_mode(): bool
 	{
-		return ($this->CI->session->userdata('sales_mode') == 'sale_work_order');
+		return ($this->session->get('sales_mode') == 'sale_work_order');	//TODO: === ?
 	}
 
-	public function set_price_work_orders($price_work_orders)
+	public function set_price_work_orders(string $price_work_orders): void
 	{
-		return $this->CI->session->set_userdata('sales_price_work_orders', $price_work_orders);
+		$this->session->set('sales_price_work_orders', $price_work_orders);
 	}
 
-	public function is_price_work_orders()
+	public function is_price_work_orders(): bool
 	{
-		return ($this->CI->session->userdata('sales_price_work_orders') == 'true' ||
-				$this->CI->session->userdata('sales_price_work_orders') == '1');
+		return ($this->session->get('sales_price_work_orders') == 'true'	//TODO: === ?
+			|| $this->session->get('sales_price_work_orders') == '1');	//TODO: === ?
 	}
 
-	public function set_print_after_sale($print_after_sale)
+	public function set_print_after_sale(bool $print_after_sale): void
 	{
-		return $this->CI->session->set_userdata('sales_print_after_sale', $print_after_sale);
+		$this->session->set('sales_print_after_sale', $print_after_sale);
 	}
 
-	public function is_print_after_sale()
-	{
-		if($this->CI->config->item('print_receipt_check_behaviour') == 'always')
+	public function is_print_after_sale(): bool
+	{//TODO: this needs to be converted to a switch statement
+		if(config('OSPOS')->print_receipt_check_behaviour == 'always')	//TODO: 'behaviour' is the british spelling, but the rest of the code is in American English.  Not a big deal, but noticed. Also ===
 		{
 			return TRUE;
 		}
-		elseif($this->CI->config->item('print_receipt_check_behaviour') == 'never')
+		elseif(config('OSPOS')->print_receipt_check_behaviour == 'never')	//TODO: === ?
 		{
 			return FALSE;
 		}
 		else // remember last setting, session based though
 		{
-			return ($this->CI->session->userdata('sales_print_after_sale') == 'true' ||
-					$this->CI->session->userdata('sales_print_after_sale') == '1');
+			return ($this->session->get('sales_print_after_sale') == 'true'	//TODO: === ?
+				|| $this->session->get('sales_print_after_sale') == '1');	//TODO: === ?
 		}
 	}
 
-	public function set_email_receipt($email_receipt)
+	public function set_email_receipt(string $email_receipt): void
 	{
-		$this->CI->session->set_userdata('sales_email_receipt', $email_receipt);
+		$this->session->set('sales_email_receipt', $email_receipt);
 	}
 
-	public function clear_email_receipt()
+	public function clear_email_receipt(): void
 	{
-		$this->CI->session->unset_userdata('sales_email_receipt');
+		$this->session->remove('sales_email_receipt');
 	}
 
-	public function is_email_receipt()
-	{
-		if($this->CI->config->item('email_receipt_check_behaviour') == 'always')
+	public function is_email_receipt(): bool
+	{//TODO: this needs to be converted to a switch statement
+		if(config('OSPOS')->email_receipt_check_behaviour == 'always')	//TODO: 'behaviour' is the british spelling, but the rest of the code is in American English.  Not a big deal, but noticed. Also ===
 		{
 			return TRUE;
 		}
-		elseif($this->CI->config->item('email_receipt_check_behaviour') == 'never')
+		elseif(config('OSPOS')->email_receipt_check_behaviour == 'never')	//TODO: === ?
 		{
 			return FALSE;
 		}
 		else // remember last setting, session based though
 		{
-			return ($this->CI->session->userdata('sales_email_receipt') == 'true' ||
-					$this->CI->session->userdata('sales_email_receipt') == '1');
+			return ($this->session->get('sales_email_receipt') == 'true'	//TODO: === ?
+				|| $this->session->get('sales_email_receipt') == '1');	//TODO: === ?
 		}
 	}
 
 	// Multiple Payments
-	public function get_payments()
+	public function get_payments(): array
 	{
-		if(!$this->CI->session->userdata('sales_payments'))
+		if(!$this->session->get('sales_payments'))
 		{
-			$this->set_payments(array());
+			$this->set_payments ([]);
 		}
 
-		return $this->CI->session->userdata('sales_payments');
+		return $this->session->get('sales_payments');
 	}
 
 	// Multiple Payments
-	public function set_payments($payments_data)
+	public function set_payments(array $payments_data): void
 	{
-		$this->CI->session->set_userdata('sales_payments', $payments_data);
+		$this->session->set('sales_payments', $payments_data);
 	}
 
 	/**
 	 * Adds a new payment to the payments array or updates an existing one.
-	 * It will also disable cash_mode if an non-qualifying payment type is added.
-	 * @param $payment_id
-	 * @param $payment_amount
+	 * It will also disable cash_mode if a non-qualifying payment type is added.
+	 * @param int $payment_id
+	 * @param string $payment_amount
 	 * @param int $cash_adjustment
 	 */
-	public function add_payment($payment_id, $payment_amount, $cash_adjustment = CASH_ADJUSTMENT_FALSE)
+	public function add_payment(int $payment_id, string $payment_amount, int $cash_adjustment = CASH_ADJUSTMENT_FALSE): void
 	{
 		$payments = $this->get_payments();
 		if(isset($payments[$payment_id]))
@@ -385,17 +429,23 @@ class Sale_lib
 		else
 		{
 			//add to existing array
-			$payment = array($payment_id => array('payment_type' => $payment_id, 'payment_amount' => $payment_amount,
-				'cash_refund' => 0, 'cash_adjustment' => $cash_adjustment));
+			$payment = [
+				$payment_id => [
+				'payment_type' => $payment_id,
+				'payment_amount' => $payment_amount,
+				'cash_refund' => 0,
+				'cash_adjustment' => $cash_adjustment
+				]
+			];
 
 			$payments += $payment;
 		}
 
-		if($this->CI->session->userdata('cash_mode'))
+		if($this->session->get('cash_mode'))
 		{
-			if($this->CI->session->userdata('cash_rounding') && $payment_id != $this->CI->lang->line('sales_cash') && $payment_id != $this->CI->lang->line('sales_cash_adjustment'))
+			if($this->session->get('cash_rounding') && $payment_id != lang('Sales.cash') && $payment_id != lang('Sales.cash_adjustment'))
 			{
-				$this->CI->session->set_userdata('cash_mode', CASH_MODE_FALSE);
+				$this->session->set('cash_mode', CASH_MODE_FALSE);
 			}
 		}
 
@@ -403,7 +453,7 @@ class Sale_lib
 	}
 
 	// Multiple Payments
-	public function edit_payment($payment_id, $payment_amount)
+	public function edit_payment(string $payment_id, float $payment_amount): bool
 	{
 		$payments = $this->get_payments();
 		if(isset($payments[$payment_id]))
@@ -421,41 +471,45 @@ class Sale_lib
 	/**
 	 * Delete the selected payment from the payment array and if cash rounding is enabled
 	 * and the payment type is one of the cash types then automatically delete the other
-	 * @param $payment_id
+	 * @param string $payment_id
 	 */
-	public function delete_payment($payment_id)
+	public function delete_payment(string $payment_id): void
 	{
 		$payments = $this->get_payments();
 		$decoded_payment_id = urldecode($payment_id);
+
 		unset($payments[$decoded_payment_id]);
+
 		$cash_rounding = $this->reset_cash_rounding();
+
 		if($cash_rounding)
 		{
-			if($decoded_payment_id == $this->CI->lang->line('sales_cash'))
+			if($decoded_payment_id == lang('Sales.cash'))	//TODO: === ?
 			{
-				unset($payments[$this->CI->lang->line('sales_cash_adjustment')]);
+				unset($payments[lang('Sales.cash_adjustment')]);
 			}
-			if($decoded_payment_id == $this->CI->lang->line('sales_cash_adjustment'))
+
+			if($decoded_payment_id == lang('Sales.cash_adjustment'))	//TODO: === ?
 			{
-				unset($payments[$this->CI->lang->line('sales_cash')]);
+				unset($payments[lang('Sales.cash')]);
 			}
 		}
 		$this->set_payments($payments);
 	}
 
 	// Multiple Payments
-	public function empty_payments()
+	public function empty_payments(): void	//TODO: function verbs are very inconsistent in these libraries.
 	{
-		$this->CI->session->unset_userdata('sales_payments');
+		$this->session->remove('sales_payments');
 	}
 
 	/**
 	 * Retrieve the total payments made, excluding any cash adjustments
 	 * and establish if cash_mode is in play
 	 */
-	public function get_payments_total()
+	public function get_payments_total(): string
 	{
-		$subtotal = 0.0;
+		$subtotal = '0.0';
 		$cash_mode_eligible = CASH_MODE_TRUE;
 
 		foreach($this->get_payments() as $payments)
@@ -464,15 +518,15 @@ class Sale_lib
 			{
 				$subtotal = bcadd($payments['payment_amount'], $subtotal);
 			}
-			if($this->CI->lang->line('sales_cash') != $payments['payment_type'] && $this->CI->lang->line('sales_cash_adjustment') != $payments['payment_type'])
+			if(lang('Sales.cash') != $payments['payment_type'] && lang('Sales.cash_adjustment') != $payments['payment_type'])
 			{
 				$cash_mode_eligible = CASH_MODE_FALSE;
 			}
 		}
 
-		if($cash_mode_eligible && $this->CI->session->userdata('cash_rounding'))
+		if($cash_mode_eligible && $this->session->get('cash_rounding'))	//TODO: $cache_mode_eligible will always evaluate to true
 		{
-			$this->CI->session->set_userdata('cash_mode', CASH_MODE_TRUE);
+			$this->session->set('cash_mode', CASH_MODE_TRUE);
 		}
 
 		return $subtotal;
@@ -482,14 +536,14 @@ class Sale_lib
 	 * Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'paid_in_full'
 	 * 'subtotal', 'discounted_subtotal', 'tax_exclusive_subtotal', 'item_count', 'total_units', 'cash_adjustment_amount'
 	 */
-	public function get_totals($taxes)
+	public function get_totals(array $taxes): array
 	{
-		$totals = array();
+		$totals = [];
 
-		$prediscount_subtotal = 0.0;
-		$subtotal = 0.0;
-		$total = 0.0;
-		$total_discount = 0.0;
+		$prediscount_subtotal = '0.0';
+		$subtotal = '0.0';
+		$total = '0.0';
+		$total_discount = '0.0';
 		$item_count = 0;
 		$total_units = 0.0;
 
@@ -505,7 +559,7 @@ class Sale_lib
 
 			$extended_amount = $this->get_extended_amount($item['quantity'], $item['price']);
 			$extended_discounted_amount = $this->get_extended_amount($item['quantity'], $item['price'], $discount_amount);
-			$prediscount_subtotal= bcadd($prediscount_subtotal, $extended_amount);
+			$prediscount_subtotal = bcadd($prediscount_subtotal, $extended_amount);
 			$total = bcadd($total, $extended_discounted_amount);
 
 			$subtotal = bcadd($subtotal, $extended_discounted_amount);
@@ -513,7 +567,7 @@ class Sale_lib
 
 		$totals['prediscount_subtotal'] = $prediscount_subtotal;
 		$totals['total_discount'] = $total_discount;
-		$sales_tax = 0;
+		$sales_tax = '0';
 
 		foreach($taxes as $tax)
 		{
@@ -534,8 +588,8 @@ class Sale_lib
 
 		$payment_total = $this->get_payments_total();
 		$totals['payment_total'] = $payment_total;
-		$cash_rounding = $this->CI->session->userdata('cash_rounding');
-		$cash_mode = $this->CI->session->userdata('cash_mode');
+		$cash_rounding = $this->session->get('cash_rounding');
+		$cash_mode = $this->session->get('cash_mode');
 
 		if($cash_rounding)
 		{
@@ -554,7 +608,7 @@ class Sale_lib
 		$cash_amount_due = bcsub($cash_total, $payment_total);
 		$totals['cash_amount_due'] = $cash_amount_due;
 
-		if($cash_mode)
+		if($cash_mode)	//TODO: Convert to ternary notation
 		{
 			$current_due = $cash_amount_due;
 		}
@@ -564,9 +618,9 @@ class Sale_lib
 		}
 
 		// 0 decimal -> 1 / 2 = 0.5, 1 decimals -> 0.1 / 2 = 0.05, 2 decimals -> 0.01 / 2 = 0.005
-		$threshold = bcpow(10, -totals_decimals()) / 2;
+		$threshold = bcpow('10', (string)-totals_decimals()) / 2;
 
-		if($this->get_mode() == 'return')
+		if($this->get_mode() == 'return')	//TODO: Convert to ternary notation.
 		{
 			$totals['payments_cover_total'] = $current_due > -$threshold;
 		}
@@ -577,180 +631,183 @@ class Sale_lib
 
 		$totals['item_count'] = $item_count;
 		$totals['total_units'] = $total_units;
-		$totals['cash_adjustment_amount'] = 0;
+		$totals['cash_adjustment_amount'] = 0.0;
 
 		if($totals['payments_cover_total'])
 		{
 			$totals['cash_adjustment_amount'] = round($cash_total - $totals['total'], totals_decimals(), PHP_ROUND_HALF_UP);
 		}
 
-		$cash_mode = $this->CI->session->userdata('cash_mode');
+		$cash_mode = $this->session->get('cash_mode');	//TODO: This variable is never used.
 
 		return $totals;
 	}
 
 	// Multiple Payments
-	public function get_amount_due()
+	public function get_amount_due(): string
 	{
 		// Payment totals need to be identified first so that we know whether or not there is a non-cash payment involved
 		$payment_total = $this->get_payments_total();
 		$sales_total = $this->get_total();
 		$amount_due = bcsub($sales_total, $payment_total);
 		$precision = totals_decimals();
-		$rounded_due = bccomp(round($amount_due, $precision, PHP_ROUND_HALF_UP), 0, $precision);
+		$rounded_due = bccomp((string)round((float)$amount_due, $precision, PHP_ROUND_HALF_UP), '0', $precision);	//TODO: Is round() currency safe?
+
 		// take care of rounding error introduced by round tripping payment amount to the browser
-		return $rounded_due == 0.0 ? 0.0 : $amount_due;
+		return $rounded_due == 0 ? '0' : $amount_due;	//TODO: ===
 	}
 
-	public function get_customer()
+	public function get_customer(): int
 	{
-		if(!$this->CI->session->userdata('sales_customer'))
+		if(!$this->session->get('sales_customer'))
 		{
-			$this->set_customer(-1);
+			$this->set_customer(-1);	//TODO: Replace -1 with a constant
 		}
 
-		return $this->CI->session->userdata('sales_customer');
+		return $this->session->get('sales_customer');
 	}
 
-	public function set_customer($customer_id)
+	public function set_customer(int $customer_id): void
 	{
-		$this->CI->session->set_userdata('sales_customer', $customer_id);
+		$this->session->set('sales_customer', $customer_id);
 	}
 
-	public function remove_customer()
+	public function remove_customer(): void
 	{
-		$this->CI->session->unset_userdata('sales_customer');
+		$this->session->remove('sales_customer');
 	}
 
-	public function get_employee()
+	public function get_employee(): int
 	{
-		if(!$this->CI->session->userdata('sales_employee'))
+		if(!$this->session->get('sales_employee'))
 		{
-			$this->set_employee(-1);
+			$this->set_employee(-1);	//TODO: Replace -1 with a constant
 		}
 
-		return $this->CI->session->userdata('sales_employee');
+		return $this->session->get('sales_employee');
 	}
 
-	public function set_employee($employee_id)
+	public function set_employee(int $employee_id): void
 	{
-		$this->CI->session->set_userdata('sales_employee', $employee_id);
+		$this->session->set('sales_employee', $employee_id);
 	}
 
-	public function remove_employee()
+	public function remove_employee(): void
 	{
-		$this->CI->session->unset_userdata('sales_employee');
+		$this->session->remove('sales_employee');
 	}
 
-	public function get_mode()
+	public function get_mode(): string
 	{
-		if(!$this->CI->session->userdata('sales_mode'))                                                                                                                                                                                                                     
+		if(!$this->session->get('sales_mode'))                                                                                                                                                                                                                     
 		{                                                                                                                                                                                                                                                                   
 			$this->set_mode('sale');                                                                                                                                                                                                                            
 		}      
-		return $this->CI->session->userdata('sales_mode');
+		return $this->session->get('sales_mode');
 	}
 
-	public function set_mode($mode)
+	public function set_mode(string $mode): void
 	{
-		$this->CI->session->set_userdata('sales_mode', $mode);
+		$this->session->set('sales_mode', $mode);
 	}
 
-	public function clear_mode()
+	public function clear_mode(): void
 	{
-		$this->CI->session->unset_userdata('sales_mode');
+		$this->session->remove('sales_mode');
 	}
 
-	public function get_dinner_table()
+	public function get_dinner_table(): int
 	{
-		if(!$this->CI->session->userdata('dinner_table'))
+		if(!$this->session->get('dinner_table'))
 		{
-			if($this->CI->config->item('dinner_table_enable') == TRUE)
+			if(config('OSPOS')->dinner_table_enable)
 			{
-				$this->set_dinner_table(1);
+				$this->set_dinner_table(1);	//TODO: Replace 1 with constant
 			}
 		}
 
-		return $this->CI->session->userdata('dinner_table');
+		return $this->session->get('dinner_table');
 	}
 
-	public function set_dinner_table($dinner_table)
+	public function set_dinner_table(int $dinner_table): void
 	{
-		$this->CI->session->set_userdata('dinner_table', $dinner_table);
+		$this->session->set('dinner_table', $dinner_table);
 	}
 
-	public function clear_table()
+	public function clear_table(): void
 	{
-		$this->CI->session->unset_userdata('dinner_table');
+		$this->session->remove('dinner_table');
 	}
 
-	public function get_sale_location()
+	public function get_sale_location(): int
 	{
-		if(!$this->CI->session->userdata('sales_location'))
+		if(!$this->session->get('sales_location'))
 		{
-			$this->set_sale_location($this->CI->Stock_location->get_default_location_id('sales'));
+			$this->set_sale_location($this->stock_location->get_default_location_id('sales'));
 		}
 
-		return $this->CI->session->userdata('sales_location');
+		return $this->session->get('sales_location');
 	}
 
-	public function set_sale_location($location)
+	public function set_sale_location(int $location): void
 	{
-		$this->CI->session->set_userdata('sales_location', $location);
+		$this->session->set('sales_location', $location);
 	}
 
-	public function set_payment_type($payment_type)
+	public function set_payment_type(string $payment_type): void
 	{
-		$this->CI->session->set_userdata('payment_type', $payment_type);
+		$this->session->set('payment_type', $payment_type);
 	}
 
-	public function get_payment_type()
+	public function get_payment_type(): string
 	{
-		return $this->CI->session->userdata('payment_type');
+		return $this->session->get('payment_type');
 	}
 
-	public function clear_sale_location()
+	public function clear_sale_location(): void
 	{
-		$this->CI->session->unset_userdata('sales_location');
+		$this->session->remove('sales_location');
 	}
 
-	public function set_giftcard_remainder($value)
+	public function set_giftcard_remainder(string $value): void
 	{
-		$this->CI->session->set_userdata('sales_giftcard_remainder', $value);
+		$this->session->set('sales_giftcard_remainder', $value);
 	}
 
-	public function get_giftcard_remainder()
+	public function get_giftcard_remainder(): string
 	{
-		return $this->CI->session->userdata('sales_giftcard_remainder');
+		return $this->session->get('sales_giftcard_remainder');
 	}
 
-	public function clear_giftcard_remainder()
+	public function clear_giftcard_remainder(): void
 	{
-		$this->CI->session->unset_userdata('sales_giftcard_remainder');
+		$this->session->remove('sales_giftcard_remainder');
 	}
 
-	public function set_rewards_remainder($value)
+	public function set_rewards_remainder(string $value): void
 	{
-		$this->CI->session->set_userdata('sales_rewards_remainder', $value);
+		$this->session->set('sales_rewards_remainder', $value);
 	}
 
-	public function get_rewards_remainder()
+	public function get_rewards_remainder(): string
 	{
-		return $this->CI->session->userdata('sales_rewards_remainder');
+		return $this->session->get('sales_rewards_remainder');
 	}
 
-	public function clear_rewards_remainder()
+	public function clear_rewards_remainder(): void
 	{
-		$this->CI->session->unset_userdata('sales_rewards_remainder');
+		$this->session->remove('sales_rewards_remainder');
 	}
 
-	public function add_item(&$item_id, $quantity = 1, $item_location, &$discount = 0.0, $discount_type = 0, $price_mode = PRICE_MODE_STANDARD, $kit_price_option = NULL, $kit_print_option = NULL, $price_override = NULL, $description = NULL, $serialnumber = NULL, $sale_id = NULL, $include_deleted = FALSE, $print_option = NULL, $line = NULL)
+	//TODO: this function needs to be reworked... way too many parameters.  Also, optional parameters must go after mandatory parameters.
+	public function add_item(int &$item_id, int $item_location, string $quantity = '1', string &$discount = '0.0', int $discount_type = 0, int $price_mode = PRICE_MODE_STANDARD, int $kit_price_option = NULL, int $kit_print_option = NULL, string $price_override = NULL, string $description = NULL, string $serialnumber = NULL, int $sale_id = NULL, bool $include_deleted = FALSE, bool $print_option = NULL, bool $line = NULL): bool
 	{
-		$item_info = $this->CI->Item->get_info_by_id_or_number($item_id, $include_deleted);
+		$item_info = $this->item->get_info_by_id_or_number($item_id, $include_deleted);
+
 		//make sure item exists
 		if(empty($item_info))
 		{
-			$item_id = -1;
+			$item_id = -1;	//TODO: Replace -1 with constant
 			return FALSE;
 		}
 
@@ -770,18 +827,20 @@ class Sale_lib
 		{
 			if(!($kit_price_option == PRICE_OPTION_ALL
 				|| $kit_price_option == PRICE_OPTION_KIT  && $item_type == ITEM_KIT
-				|| $kit_price_option == PRICE_OPTION_KIT_STOCK && $stock_type == HAS_STOCK))
+				|| $kit_price_option == PRICE_OPTION_KIT_STOCK && $stock_type == HAS_STOCK))	//TODO: === ?
 			{
-				$price = 0.00;
-				$applied_discount = 0.00;
+				$price = '0.00';
+				$applied_discount = '0.00';
 			}
+
 			// If price is zero do not include a discount regardless of type
-			if($price == 0.00)
+			if($price == '0.00')	//TODO: === ?
 			{
-				$applied_discount = 0.00;
+				$applied_discount = '0.00';
 			}
+
 			// If fixed discount then apply no more than the item price
-			if($discount_type == FIXED)
+			if($discount_type == FIXED)	//TODO: === ?
 			{
 				if($applied_discount > $price)
 				{
@@ -806,8 +865,8 @@ class Sale_lib
 		//item to the cart. Since items can be deleted, we can't use a count. we use the highest key + 1.
 
 		$maxkey = 0;                       //Highest key so far
-		$itemalreadyinsale = FALSE;        //We did not find the item yet.
-		$insertkey = 0;                    //Key to use for new entry.
+		$itemalreadyinsale = FALSE;        //We did not find the item yet.	//TODO: variable naming here does not match the convention
+		$insertkey = 0;                    //Key to use for new entry.	//TODO: $insertkey is never used
 		$updatekey = 0;                    //Key to use to update(quantity)
 
 		foreach($items as $item)
@@ -815,12 +874,12 @@ class Sale_lib
 			//We primed the loop so maxkey is 0 the first time.
 			//Also, we have stored the key in the element itself so we can compare.
 
-			if($maxkey <= $item['line'])
+			if($maxkey <= $item['line'])	//TODO: variable naming here does not match the convention
 			{
 				$maxkey = $item['line'];
 			}
 
-			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)
+			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)	//TODO: === ?
 			{
 				$itemalreadyinsale = TRUE;
 				$updatekey = $item['line'];
@@ -831,20 +890,20 @@ class Sale_lib
 			}
 		}
 
-		$insertkey = $maxkey + 1;
+		$insertkey = $maxkey + 1;//TODO Does not follow naming conventions.
 		//array/cart records are identified by $insertkey and item_id is just another field.
 
-		if($price_mode == PRICE_MODE_KIT)
+		if($price_mode == PRICE_MODE_KIT)	//TODO: === ?
 		{
-			if($kit_print_option == PRINT_ALL)
+			if($kit_print_option == PRINT_ALL)	//TODO: === ?
 			{
 				$print_option_selected = PRINT_YES;
 			}
-			elseif($kit_print_option == PRINT_KIT && $item_type == ITEM_KIT)
+			elseif($kit_print_option == PRINT_KIT && $item_type == ITEM_KIT)	//TODO: === ?
 			{
 				$print_option_selected = PRINT_YES;
 			}
-			elseif($kit_print_option == PRINT_PRICED && $price > 0)
+			elseif($kit_print_option == PRINT_PRICED && $price > 0)	//TODO: === ?
 			{
 				$print_option_selected = PRINT_YES;
 			}
@@ -854,8 +913,8 @@ class Sale_lib
 			}
 		}
 		else
-		{
-			if($print_option != NULL)
+		{	//TODO: Convert this to ternary notation
+			if($print_option != NULL)	//TODO: === ?
 			{
 				$print_option_selected = $print_option;
 			}
@@ -868,20 +927,23 @@ class Sale_lib
 		$total = $this->get_item_total($quantity, $price, $applied_discount, $discount_type);
 		$discounted_total = $this->get_item_total($quantity, $price, $applied_discount, $discount_type, TRUE);
 
-		if($this->CI->config->item('multi_pack_enabled') == '1')
+		if(config('OSPOS')->multi_pack_enabled)
 		{
 			$item_info->name .= NAME_SEPARATOR . $item_info->pack_name;
 		}
 
-		$attribute_links = $this->CI->Attribute->get_link_values($item_id, 'sale_id', $sale_id, Attribute::SHOW_IN_SALES)->row_object();
+		$attribute_links = $this->attribute->get_link_values($item_id, 'sale_id', $sale_id, Attribute::SHOW_IN_SALES)->getRowObject();
 
 		//Item already exists and is not serialized, add to quantity
 		if(!$itemalreadyinsale || $item_info->is_serialized)
 		{
-			$item = array($insertkey => array(
+			$item_quantity = model(Item_quantity::class);
+
+			$item = [
+				$insertkey => [
 					'item_id' => $item_id,
 					'item_location' => $item_location,
-					'stock_name' => $this->CI->Stock_location->get_location_name($item_location),
+					'stock_name' => $this->stock_location->get_location_name($item_location),
 					'line' => $insertkey,
 					'name' => $item_info->name,
 					'item_number' => $item_info->item_number,
@@ -894,7 +956,7 @@ class Sale_lib
 					'quantity' => $quantity,
 					'discount' => $applied_discount,
 					'discount_type' => $discount_type,
-					'in_stock' => $this->CI->Item_quantity->get_item_quantity($item_id, $item_location)->quantity,
+					'in_stock' => $item_quantity->get_item_quantity($item_id, $item_location)->quantity,
 					'price' => $price,
 					'cost_price' => $cost_price,
 					'total' => $total,
@@ -904,8 +966,8 @@ class Sale_lib
 					'item_type' => $item_type,
 					'hsn_code' => $item_info->hsn_code,
 					'tax_category_id' => $item_info->tax_category_id
-				)
-			);
+				]
+			];
 			//add to existing array
 			$items += $item;
 		}
@@ -922,25 +984,26 @@ class Sale_lib
 		return TRUE;
 	}
 
-	public function out_of_stock($item_id, $item_location)
+	public function out_of_stock(int $item_id, int $item_location): string
 	{
 		//make sure item exists
-		if($item_id != -1)
+		if($item_id != -1)	//TODO: !== ?.  Also Replace -1 with a constant
 		{
-			$item_info = $this->CI->Item->get_info_by_id_or_number($item_id);
+			$item_info = $this->item->get_info_by_id_or_number($item_id);
 
-			if($item_info->stock_type == HAS_STOCK)
+			if($item_info->stock_type == HAS_STOCK)	//TODO: === ?
 			{
-				$item_quantity = $this->CI->Item_quantity->get_item_quantity($item_id, $item_location)->quantity;
+				$item_quantity = model(Item_quantity::class);
+				$item_quantity = $item_quantity->get_item_quantity($item_id, $item_location)->quantity;
 				$quantity_added = $this->get_quantity_already_added($item_id, $item_location);
 
 				if($item_quantity - $quantity_added < 0)
 				{
-					return $this->CI->lang->line('sales_quantity_less_than_zero');
+					return lang('Sales.quantity_less_than_zero');
 				}
 				elseif($item_quantity - $quantity_added < $item_info->reorder_level)
 				{
-					return $this->CI->lang->line('sales_quantity_less_than_reorder_level');
+					return lang('Sales.quantity_less_than_reorder_level');
 				}
 			}
 		}
@@ -948,26 +1011,26 @@ class Sale_lib
 		return '';
 	}
 
-	public function get_quantity_already_added($item_id, $item_location)
+	public function get_quantity_already_added(int $item_id, int $item_location): string
 	{
 		$items = $this->get_cart();
-		$quantity_already_added = 0;
+		$quantity_already_added = '0.0';
 		foreach($items as $item)
 		{
-			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)
+			if($item['item_id'] == $item_id && $item['item_location'] == $item_location)	//TODO: === ?
 			{
-				$quantity_already_added += $item['quantity'];
+				$quantity_already_added += $item['quantity'];	//TODO: for precision we likely need to use bcadd() since we are using that everywhere else for quantity
 			}
 		}
 
 		return $quantity_already_added;
 	}
 
-	public function get_item_id($line_to_get)
+	public function get_item_id(string $line_to_get): int
 	{
 		$items = $this->get_cart();
 
-		foreach($items as $line=>$item)
+		foreach($items as $line => $item)
 		{
 			if($line == $line_to_get)
 			{
@@ -975,10 +1038,21 @@ class Sale_lib
 			}
 		}
 
-		return -1;
+		return -1;	//TODO: Replace -1 with constant
 	}
 
-	public function edit_item($line, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $discounted_total=NULL)
+	/**
+	 * @param string $line
+	 * @param string $description
+	 * @param string $serialnumber
+	 * @param string $quantity
+	 * @param string $discount
+	 * @param string $discount_type
+	 * @param string $price
+	 * @param string|NULL $discounted_total
+	 * @return bool
+	 */
+	public function edit_item(string $line, string $description, string $serialnumber, string $quantity, string $discount, string $discount_type, string $price, string $discounted_total = NULL): bool
 	{
 		$items = $this->get_cart();
 		if(isset($items[$line]))
@@ -993,33 +1067,42 @@ class Sale_lib
 			$line['serialnumber'] = $serialnumber;
 			$line['quantity'] = $quantity;
 			$line['discount'] = $discount;
-			if(!is_null($discount_type))
+
+			if(!empty($discount_type))
 			{
 				$line['discount_type'] = $discount_type;
 			}
+
 			$line['price'] = $price;
 			$line['total'] = $this->get_item_total($quantity, $price, $discount, $line['discount_type']);
 			$line['discounted_total'] = $this->get_item_total($quantity, $price, $discount, $line['discount_type'], TRUE);
 			$this->set_cart($items);
 		}
 
-		return FALSE;
+		return FALSE;	//TODO: This function will always return false.
 	}
 
-	public function delete_item($line)
+	/**
+	 * @param int $line
+	 * @return void
+	 * @throws ReflectionException
+	 */
+	public function delete_item(int $line): void
 	{
 		$items = $this->get_cart();
 		$item_type = $items[$line]['item_type'];
+
 		if($item_type == ITEM_TEMP)
 		{
 			$item_id = $items[$line]['item_id'];
-			$this->CI->Item->delete($item_id);
+			$this->item->delete($item_id);
 		}
+
 		unset($items[$line]);
 		$this->set_cart($items);
 	}
 
-	public function return_entire_sale($receipt_sale_id)
+	public function return_entire_sale(string $receipt_sale_id): void
 	{
 		//POS #
 		$pieces = explode(' ', $receipt_sale_id);
@@ -1028,15 +1111,15 @@ class Sale_lib
 		$this->empty_cart();
 		$this->remove_customer();
 
-		foreach($this->CI->Sale->get_sale_items_ordered($sale_id)->result() as $row)
+		foreach($this->sale->get_sale_items_ordered($sale_id)->getResult() as $row)
 		{
-			$this->add_item($row->item_id, -$row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, PRICE_MODE_STANDARD, NULL, NULL, $row->item_unit_price, $row->description, $row->serialnumber, NULL, TRUE);
+			$this->add_item($row->item_id, $row->item_location, -$row->quantity_purchased, $row->discount, $row->discount_type, PRICE_MODE_STANDARD, NULL, NULL, $row->item_unit_price, $row->description, $row->serialnumber, NULL, TRUE);
 		}
 
-		$this->set_customer($this->CI->Sale->get_customer($sale_id)->person_id);
+		$this->set_customer($this->sale->get_customer($sale_id)->person_id);
 	}
 
-	public function add_item_kit($external_item_kit_id, $item_location, $discount, $discount_type, $kit_price_option, $kit_print_option, &$stock_warning)
+	public function add_item_kit(string $external_item_kit_id, int $item_location, float $discount, string $discount_type, bool $kit_price_option, bool $kit_print_option, string &$stock_warning): bool
 	{
 		//KIT #
 		$pieces = explode(' ', $external_item_kit_id);
@@ -1044,9 +1127,9 @@ class Sale_lib
 		$result = TRUE;
 		$applied_discount = $discount;
 
-		foreach($this->CI->Item_kit_items->get_info($item_kit_id) as $item_kit_item)
+		foreach($this->item_kit_items->get_info($item_kit_id) as $item_kit_item)
 		{
-			$result &= $this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option);
+			$result &= $this->add_item($item_kit_item['item_id'], $item_location, $item_kit_item['quantity'], $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option);
 
 			if($stock_warning == NULL)
 			{
@@ -1057,64 +1140,68 @@ class Sale_lib
 		return $result;
 	}
 
-	public function copy_entire_sale($sale_id)
+	public function copy_entire_sale(int $sale_id): void
 	{
 		$this->empty_cart();
 		$this->remove_customer();
 
-		foreach($this->CI->Sale->get_sale_items_ordered($sale_id)->result() as $row)
+		foreach($this->sale->get_sale_items_ordered($sale_id)->getResult() as $row)
 		{
-			$this->add_item($row->item_id, $row->quantity_purchased, $row->item_location, $row->discount, $row->discount_type, PRICE_MODE_STANDARD, NULL, NULL, $row->item_unit_price, $row->description, $row->serialnumber, $sale_id, TRUE, $row->print_option);
+			$this->add_item($row->item_id, $row->item_location, $row->quantity_purchased, $row->discount, $row->discount_type, PRICE_MODE_STANDARD, NULL, NULL, $row->item_unit_price, $row->description, $row->serialnumber, $sale_id, TRUE, $row->print_option);
 		}
 
-		$this->CI->session->set_userdata('cash_mode', CASH_MODE_FALSE);
+		$this->session->set('cash_mode', CASH_MODE_FALSE);
 
 		// Establish cash_mode for this sale by inspecting the payments
-		if($this->CI->session->userdata('cash_rounding'))
+		if($this->session->get('cash_rounding'))
 		{
 			$cash_types_only = true;
-			foreach($this->CI->Sale->get_sale_payments($sale_id)->result() as $row)
+			foreach($this->sale->get_sale_payments($sale_id)->getResult() as $row)
 			{
-				if($row->payment_type != $this->CI->lang->line('sales_cash') && $row->payment_type != $this->CI->lang->line('sales_cash_adjustment'))
+				if($row->payment_type != lang('Sales.cash') && $row->payment_type != lang('Sales.cash_adjustment'))
 				{
 					$cash_types_only = FALSE;
 				}
 
 			}
+			//TODO: Consider converting to ternary notation.
+			//$cash_types_only
+			// ? $this->session->set('cash_mode', CASH_MODE_TRUE)
+			// : $this->session->set('cash_mode', CASH_MODE_FALSE);
 			if($cash_types_only)
 			{
-				$this->CI->session->set_userdata('cash_mode', CASH_MODE_TRUE);
+				$this->session->set('cash_mode', CASH_MODE_TRUE);
 			}
 			else
 			{
-				$this->CI->session->set_userdata('cash_mode', CASH_MODE_FALSE);
+				$this->session->set('cash_mode', CASH_MODE_FALSE);
 			}
 		}
 
 		// Now load payments
-		foreach($this->CI->Sale->get_sale_payments($sale_id)->result() as $row)
+		foreach($this->sale->get_sale_payments($sale_id)->getResult() as $row)
 		{
 			$this->add_payment($row->payment_type, $row->payment_amount, $row->cash_adjustment);
 		}
 
-		$this->set_customer($this->CI->Sale->get_customer($sale_id)->person_id);
-		$this->set_employee($this->CI->Sale->get_employee($sale_id)->person_id);
-		$this->set_quote_number($this->CI->Sale->get_quote_number($sale_id));
-		$this->set_work_order_number($this->CI->Sale->get_work_order_number($sale_id));
-		$this->set_sale_type($this->CI->Sale->get_sale_type($sale_id));
-		$this->set_comment($this->CI->Sale->get_comment($sale_id));
-		$this->set_dinner_table($this->CI->Sale->get_dinner_table($sale_id));
-		$this->CI->session->set_userdata('sale_id', $sale_id);
+		$this->set_customer($this->sale->get_customer($sale_id)->person_id);
+		$this->set_employee($this->sale->get_employee($sale_id)->person_id);
+		$this->set_quote_number($this->sale->get_quote_number($sale_id));
+		$this->set_work_order_number($this->sale->get_work_order_number($sale_id));
+		$this->set_sale_type($this->sale->get_sale_type($sale_id));
+		$this->set_comment($this->sale->get_comment($sale_id));
+		$this->set_dinner_table($this->sale->get_dinner_table($sale_id));
+		$this->session->set('sale_id', $sale_id);
 	}
 
-	public function get_sale_id()
+	public function get_sale_id(): int
 	{
-		return $this->CI->session->userdata('sale_id');
+		return $this->session->get('sale_id');
 	}
 
-	public function clear_all()
+	public function clear_all(): void
 	{
-		$this->CI->session->set_userdata('sale_id', -1);
+		$this->session->set('sale_id', -1);	//TODO: Replace -1 with constant
 		$this->clear_mode();
 		$this->clear_table();
 		$this->empty_cart();
@@ -1130,11 +1217,11 @@ class Sale_lib
 		$this->clear_cash_flags();
 	}
 
-	public function clear_cash_flags()
+	public function clear_cash_flags(): void
 	{
-		$this->CI->session->unset_userdata('cash_rounding');
-		$this->CI->session->unset_userdata('cash_mode');
-		$this->CI->session->unset_userdata('payment_type');
+		$this->session->remove('cash_rounding');
+		$this->session->remove('cash_mode');
+		$this->session->remove('payment_type');
 	}
 
 	/**
@@ -1142,34 +1229,34 @@ class Sale_lib
 	 * It also set resets the cash mode to disabled which will then be re-evaluated when
 	 * retrieving payments.
 	 */
-	public function reset_cash_rounding()
+	public function reset_cash_rounding(): int
 	{
-		$cash_rounding_code = $this->CI->config->item('cash_rounding_code');
+		$cash_rounding_code = config('OSPOS')->cash_rounding_code;
 
-		if(cash_decimals() < totals_decimals() || $cash_rounding_code == Rounding_mode::HALF_FIVE)
+		if(cash_decimals() < totals_decimals() || $cash_rounding_code == Rounding_mode::HALF_FIVE)	//TODO: convert to ternary notation.
 		{
-			$cash_rounding = 1;
+			$cash_rounding = 1;	//TODO: Replace with constant
 		}
 		else
 		{
-			$cash_rounding = 0;
+			$cash_rounding = 0;	//TODO: Replace with constant
 		}
-		$this->CI->session->set_userdata('cash_rounding', $cash_rounding);
-		$this->CI->session->set_userdata('cash_mode', CASH_MODE_FALSE);
+		$this->session->set('cash_rounding', $cash_rounding);
+		$this->session->set('cash_mode', CASH_MODE_FALSE);
 
 		return $cash_rounding;
 	}
 
-	public function is_customer_taxable()
+	public function is_customer_taxable(): bool	//TODO: This function is never called in the code
 	{
 		$customer_id = $this->get_customer();
-		$customer = $this->CI->Customer->get_info($customer_id);
+		$customer = $this->customer->get_info($customer_id);
 
 		//Do not charge sales tax if we have a customer that is not taxable
-		return $customer->taxable or $customer_id == -1;
+		return $customer->taxable or $customer_id == -1;	//TODO: Replace with constant.  Also, I'm not sure we should be using the or operator instead of || here. $a || $b guarantees that the result of those two get returned.  It's possible that return $a or $b could return just the result of $a since `or` has a lower precedence.
 	}
 
-	public function apply_customer_discount($discount, $discount_type)
+	public function apply_customer_discount(string $discount, int $discount_type): void
 	{
 		// Get all items in the cart so far...
 		$items = $this->get_cart();
@@ -1180,7 +1267,7 @@ class Sale_lib
 			$price = $item['price'];
 
 			// set a new discount only if the current one is 0
-			if($item['discount'] == 0.0)
+			if($item['discount'] == 0.0)	//TODO: === ?
 			{
 				$item['discount'] = $discount;
 				$item['total'] = $this->get_item_total($quantity, $price, $discount, $discount_type);
@@ -1191,12 +1278,12 @@ class Sale_lib
 		$this->set_cart($items);
 	}
 
-	public function get_discount()
+	public function get_discount(): string
 	{
-		$discount = 0.0;
+		$discount = '0.0';
 		foreach($this->get_cart() as $item)
 		{
-			if($item['discount'] > 0.0)
+			if($item['discount'] > '0.0')
 			{
 				$item_discount = $this->get_item_discount($item['quantity'], $item['price'], $item['discount'], $item['discount_type']);
 				$discount = bcadd($discount, $item_discount);
@@ -1206,15 +1293,16 @@ class Sale_lib
 		return $discount;
 	}
 
-	public function get_subtotal($include_discount = FALSE, $exclude_tax = FALSE)
+	public function get_subtotal(bool $include_discount = FALSE, bool $exclude_tax = FALSE): string
 	{
 		return $this->calculate_subtotal($include_discount, $exclude_tax);
 	}
 
-	public function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount, $discount_type, $include_discount = FALSE)
+	public function get_item_total_tax_exclusive(int $item_id, string $quantity, string $price, string $discount, int $discount_type, bool $include_discount = FALSE): string
 	{
-		$tax_info = $this->CI->Item_taxes->get_info($item_id);
+		$tax_info = $this->item_taxes->get_info($item_id);
 		$item_total = $this->get_item_total($quantity, $price, $discount, $discount_type, $include_discount);
+
 		// only additive tax here
 		foreach($tax_info as $tax)
 		{
@@ -1225,9 +1313,11 @@ class Sale_lib
 		return $item_total;
 	}
 
-	public function get_extended_total_tax_exclusive($item_id, $discounted_extended_amount, $quantity, $price, $discount = 0.0, $discount_type = 0)
+	//TODO: This function doesn't seem to be called anywhere in the code.
+	public function get_extended_total_tax_exclusive(int $item_id, string $discounted_extended_amount, string $quantity, string $price, string $discount = '0.0', int $discount_type = 0): string
 	{
-		$tax_info = $this->CI->Item_taxes->get_info($item_id);
+		$tax_info = $this->item_taxes->get_info($item_id);
+
 		// only additive tax here
 		foreach($tax_info as $tax)
 		{
@@ -1238,7 +1328,7 @@ class Sale_lib
 		return $discounted_extended_amount;
 	}
 
-	public function get_item_total($quantity, $price, $discount, $discount_type, $include_discount = FALSE)
+	public function get_item_total(string $quantity, string $price, string $discount, int $discount_type, bool $include_discount = FALSE): string
 	{
 		$total = bcmul($quantity, $price);
 		if($include_discount)
@@ -1254,62 +1344,60 @@ class Sale_lib
 	/**
 	 * Derive the quantity sold based on the new total entered, returning the quanitity rounded to the
 	 * appropriate decimal positions.
-	 * @param $total
-	 * @param $price
+	 * @param string $total
+	 * @param string $price
 	 * @return string
 	 */
-	public function get_quantity_sold($total, $price)
+	public function get_quantity_sold(string $total, string $price): string
 	{
-		$quantity = bcdiv($total, $price, quantity_decimals());
-
-		return $quantity;
+		return bcdiv($total, $price, quantity_decimals());
 	}
 
-	public function get_extended_amount($quantity, $price, $discount_amount = 0.0)
+	public function get_extended_amount(string $quantity, string $price, string $discount_amount = '0.0'): string
 	{
 		$extended_amount = bcmul($quantity, $price);
 
 		return bcsub($extended_amount, $discount_amount);
 	}
 
-	public function get_item_discount($quantity, $price, $discount, $discount_type)
+	public function get_item_discount(string $quantity, string $price, string $discount, int $discount_type): string
 	{
 		$total = bcmul($quantity, $price);
-		if($discount_type == PERCENT)
+		if($discount_type == PERCENT)	//TODO: === ?.  Also, ternary notation
 		{
-			$discount = bcmul($total, bcdiv($discount, 100));
+			$discount = bcmul($total, bcdiv($discount, '100'));
 		}
 		else
 		{
 			$discount = bcmul($quantity, $discount);
 		}
 
-		return round($discount, totals_decimals(), PHP_ROUND_HALF_UP);
+		return (string)round((float)$discount, totals_decimals(), PHP_ROUND_HALF_UP);	//TODO: is this safe with monetary amounts?
 	}
 
-	public function get_item_tax($quantity, $price, $discount, $discount_type, $tax_percentage)
+	public function get_item_tax(string $quantity, string $price, string $discount, int $discount_type, string $tax_percentage): string
 	{
 		$item_total = $this->get_item_total($quantity, $price, $discount, $discount_type, TRUE);
 
-		if($this->CI->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)
 		{
-			$tax_fraction = bcdiv(bcadd(100, $tax_percentage), 100);
+			$tax_fraction = bcdiv(bcadd('100', $tax_percentage), '100');
 			$price_tax_excl = bcdiv($item_total, $tax_fraction);
 
 			return bcsub($item_total, $price_tax_excl);
 		}
 
-		$tax_fraction = bcdiv($tax_percentage, 100);
+		$tax_fraction = bcdiv($tax_percentage, '100');
 
 		return bcmul($item_total, $tax_fraction);
 	}
 
-	public function calculate_subtotal($include_discount = FALSE, $exclude_tax = FALSE)
+	public function calculate_subtotal(bool $include_discount = FALSE, bool $exclude_tax = FALSE): string
 	{
-		$subtotal = 0.0;
+		$subtotal = '0.0';
 		foreach($this->get_cart() as $item)
 		{
-			if($exclude_tax && $this->CI->config->item('tax_included'))
+			if($exclude_tax && config('OSPOS')->tax_included)
 			{
 				$subtotal = bcadd($subtotal, $this->get_item_total_tax_exclusive($item['item_id'], $item['quantity'], $item['price'], $item['discount'], $item['discount_type'], $include_discount));
 			}
@@ -1325,18 +1413,18 @@ class Sale_lib
 	/**
 	 * Calculates the total sales amount with the default option to include cash rounding
 	 * @param bool $include_cash_rounding
-	 * @return float|int|string
+	 * @return string
 	 */
-	public function get_total($include_cash_rounding = TRUE)
+	public function get_total(bool $include_cash_rounding = TRUE): string
 	{
 		$total = $this->calculate_subtotal(TRUE);
 
-		$cash_mode = $this->CI->session->userdata('cash_mode');
+		$cash_mode = $this->session->get('cash_mode');
 
-		if(!$this->CI->config->item('tax_included'))
+		if(!config('OSPOS')->tax_included)
 		{
 			$cart = $this->get_cart();
-			foreach($this->CI->tax_lib->get_taxes($cart)[0] as $tax)
+			foreach($this->tax_lib->get_taxes($cart)[0] as $tax)
 			{
 				$total = bcadd($total, $tax['sale_tax_amount']);
 			}
@@ -1350,18 +1438,16 @@ class Sale_lib
 		return $total;
 	}
 
-	public function get_empty_tables($current_dinner_table_id)
+	public function get_empty_tables(int $current_dinner_table_id): array
 	{
-		return $this->CI->Dinner_table->get_empty_tables($current_dinner_table_id);
+		return $this->dinner_table->get_empty_tables($current_dinner_table_id);
 	}
 
-	public function check_for_cash_rounding($total)
+	public function check_for_cash_rounding(string $total): string
 	{
 		$cash_decimals = cash_decimals();
-		$cash_rounding_code = $this->CI->config->item('cash_rounding_code');
+		$cash_rounding_code = config('OSPOS')->cash_rounding_code;
 
-		return Rounding_mode::round_number($cash_rounding_code, $total, $cash_decimals);
+		return Rounding_mode::round_number($cash_rounding_code, (float)$total, $cash_decimals);
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Sms_lib.php b/app/Libraries/Sms_lib.php
index 0c2ed2dd5..b6f1d56f7 100644
--- a/app/Libraries/Sms_lib.php
+++ b/app/Libraries/Sms_lib.php
@@ -1,43 +1,58 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\EncrypterInterface;
+
 
 /**
  * SMS library
  *
  * Library with utilities to send texts via SMS Gateway (requires proxy implementation)
+ *
+ * @property encryption encryption
+ * @property encrypterinterface encrypter
+ *
  */
 
 class Sms_lib
 {
-	private $CI;
-
   	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->encryption = new Encryption();	//TODO: Is this the correct way to load the encryption service now?
+		$this->encrypter = $this->encryption->initialize();
 	}
 
 	/*
 	 * SMS sending function
 	 * Example of use: $response = sendSMS('4477777777', 'My test message');
 	 */
-	public function sendSMS($phone, $message)
+	public function sendSMS(int $phone, string $message): bool
 	{
-		$username   = $this->CI->config->item('msg_uid');
-		$password   = $this->CI->encryption->decrypt($this->CI->config->item('msg_pwd'));
-		$originator = $this->CI->config->item('msg_src');
+		$username = config('OSPOS')->msg_uid;
+		$password = $this->encrypter->decrypt(config('OSPOS')->msg_pwd);
+		$originator = config('OSPOS')->msg_src;
 
 		$response = FALSE;
 
 		// if any of the parameters is empty return with a FALSE
-		if(empty($username) || empty($password) || empty($phone) || empty($message) || empty($originator))
+		if(empty($username) || empty($password) || empty($phone) || empty($message) || empty($originator))	//TODO: This if/else needs to be flipped. and shortened.  No else needed in the code example below.
+			//$parameters = [$username, $password, $phone, $message, $originator];
+			//if(count(array_filter($parameters)) === 5)
+			//{
+			//	$response = TRUE;
+			//	$message = rawurlencode($message);
+			//}
 		{
 			//echo $username . ' ' . $password . ' ' . $phone . ' ' . $message . ' ' . $originator;
 		}
 		else
 		{
 			$response = TRUE;
-
+//TODO: These comments should be moved to the documentation.  As is, they tend to get out of date.
 			// make sure passed string is url encoded
-			$message = rawurlencode($message);
+			$message = rawurlencode($message);	//TODO: $message needs to be passed by reference if you want this line to actually do anything
 
 			// add call to send a message via 3rd party API here
 			// Some examples
@@ -63,6 +78,4 @@ class Sms_lib
 
 		return $response;
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Tax_lib.php b/app/Libraries/Tax_lib.php
index 9e8e2516e..9d69cbc0f 100644
--- a/app/Libraries/Tax_lib.php
+++ b/app/Libraries/Tax_lib.php
@@ -1,97 +1,127 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace app\Libraries;
+
+use app\Models\Customer;
+use app\Models\Item_taxes;
+use app\Models\Enums\Rounding_mode;
+use app\Models\Sale;
+use app\Models\Tax;
+use app\Models\Tax_category;
+use app\Models\Tax_code;
+use app\Models\Tax_jurisdiction;
+
 
 /**
  * Tax library
  *
  * Library with utilities to manage taxes
+ *
+ * @property sale_lib sale_lib
+ * @property customer customer
+ * @property item_taxes item_taxes
+ * @property rounding_mode rounding_mode
+ * @property sale sale
+ * @property tax tax
+ * @property tax_category tax_category
+ * @property tax_code tax_code
+ * @property tax_jurisdiction tax_jurisdiction
+ *
  */
 
 class Tax_lib
 {
-	const TAX_TYPE_EXCLUDED = '1';
+	const TAX_TYPE_EXCLUDED = '1';	//TODO: These constants need to be moved to constants.php
 	const TAX_TYPE_INCLUDED = '0';
 
-	private $CI;
-
 	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->sale_lib = new Sale_lib();
+
+		$this->customer = model('Customer');
+		$this->item_taxes = model('Item_taxes');
+		$this->rounding_mode = model('Rounding_mode');
+		$this->sale = model('Sale');
+		$this->tax = model('Tax');
+		$this->tax_category = model('Tax_category');
+		$this->tax_code = model('Tax_code');
+		$this->tax_jurisdiction = model('Tax_jurisdiction');
 	}
 
-	public function get_tax_types()
+	public function get_tax_types(): array
 	{
-		return array(
-			Tax_lib::TAX_TYPE_EXCLUDED => $this->CI->lang->line('taxes_tax_excluded'),
-			Tax_lib::TAX_TYPE_INCLUDED => $this->CI->lang->line('taxes_tax_included')
-		);
+		return [
+			Tax_lib::TAX_TYPE_EXCLUDED => lang('Taxes.tax_excluded'),
+			Tax_lib::TAX_TYPE_INCLUDED => lang('Taxes.tax_included')
+		];
 	}
 
-	/*
+	/**
 	 * Compute the tax basis and returns the tax amount
 	 */
-	public function get_item_sales_tax($quantity, $price, $discount, $discount_type, $tax_percentage, $rounding_code)
+	public function get_item_sales_tax(string $quantity, string $price, string $discount, int $discount_type, string $tax_percentage, int $rounding_code): string	//TODO: It appears this function is never called in the code.
 	{
 		$decimals = tax_decimals();
 
-		// The tax basis should be returned at the currency scale
-		$tax_basis = $this->CI->sale_lib->get_item_total($quantity, $price, $discount, $discount_type, TRUE);
+		// The tax basis should be returned to the currency scale
+		$tax_basis = $this->sale_lib->get_item_total($quantity, $price, $discount, $discount_type, TRUE);
 
 		return $this->get_tax_for_amount($tax_basis, $tax_percentage, $rounding_code, $decimals);
 	}
 
-	/*
+	/**
 	 * Computes the item level sales tax amount for a given tax basis
 	 */
-	public function get_tax_for_amount($tax_basis, $tax_percentage, $rounding_mode, $decimals)
+	public function get_tax_for_amount(string $tax_basis, string $tax_percentage, int $rounding_mode, int $decimals): string
 	{
-		$tax_amount = bcmul($tax_basis, bcdiv($tax_percentage, 100));
+		$tax_amount = bcmul($tax_basis, bcdiv($tax_percentage, '100'));
 
-		return Rounding_mode::round_number($rounding_mode, $tax_amount, $decimals);
+		return rounding_mode::round_number($rounding_mode, $tax_amount, $decimals);
 	}
 
 	/**
 	 * Compute taxes for all items in the cart
 	 */
-	public function get_taxes(&$cart, $sale_id = -1)
+	public function get_taxes(array &$cart, int $sale_id = -1): array    //TODO: Replace -1 with constant.
 	{
-		$register_mode = $this->CI->sale_lib->get_mode();
+		$register_mode = $this->sale_lib->get_mode();
 		$tax_decimals = tax_decimals();
-		$customer_id = $this->CI->sale_lib->get_customer();
-		$customer_info = $this->CI->Customer->get_info($customer_id);
-		$taxes = array();
-		$item_taxes = array();
+		$customer_id = $this->sale_lib->get_customer();
+		$customer_info = $this->customer->get_info($customer_id);
+		$taxes = [];
+		$item_taxes = [];
 
 		// Charge sales tax if customer is not selected (walk-in) or customer is flagged as taxable
-		if($customer_id == -1 || $customer_info->taxable)
+		if($customer_id == -1 || $customer_info->taxable)    //TODO: Replace -1 with constant.
 		{
 			foreach($cart as $line => $item)
 			{
 				$taxed = FALSE;
 
-				if(!($this->CI->config->item('use_destination_based_tax')))
+				if(!config('OSPOS')->use_destination_based_tax)
 				{
 					// Start of current Base System tax calculations
 
-					if($sale_id == -1)
+					if($sale_id == -1)    //TODO: Replace -1 with constant. Also, replace with ternary notation.
 					{
-						$tax_info = $this->CI->Item_taxes->get_info($item['item_id']);
+						$tax_info = $this->item_taxes->get_info($item['item_id']);
 					}
 					else
 					{
-						$tax_info = $this->CI->Sale->get_sales_item_taxes($sale_id, $item['item_id']);
-
+						$tax_info = $this->sale->get_sales_item_taxes($sale_id, $item['item_id']);
 					}
+
 					$tax_group_sequence = 0;
-					$cascade_level = 0;
-					$cascade_basis_level = 0;
+					$cascade_level = 0;	//TODO: This variable is set but never used.
+					$cascade_basis_level = 0;	//TODO: This variable is set but never used.
 
 					foreach($tax_info as $tax)
 					{
 						// This computes tax for each line item and adds it to the tax type total
-						$tax_basis = $this->CI->sale_lib->get_item_total($item['quantity'], $item['price'], $item['discount'], $item['discount_type'], TRUE);
-						$tax_amount = 0.0;
+						$tax_basis = $this->sale_lib->get_item_total($item['quantity'], $item['price'], $item['discount'], $item['discount_type'], TRUE);
+						$tax_amount = '0.0';
 
-						if($this->CI->config->item('tax_included'))
+						if(config('OSPOS')->tax_included)
 						{
 							$tax_type = Tax_lib::TAX_TYPE_INCLUDED;
 							$tax_amount = $this->get_included_tax($item['quantity'], $item['price'], $item['discount'], $item['discount_type'], $tax['percent'], $tax_decimals, Rounding_mode::HALF_UP);
@@ -105,11 +135,12 @@ class Tax_lib
 						if($tax_amount <> 0)
 						{
 							$tax_group_sequence++;
-							$this->update_taxes($taxes, $tax_type, $tax['name'], $tax['percent'], $tax_basis, $tax_amount, $tax_group_sequence, Rounding_mode::HALF_UP, -1, $tax['name']);
-							$tax_group_sequence += 1;
+							$this->update_taxes($taxes, $tax_type, $tax['name'], $tax['percent'], $tax_basis, $tax_amount, $tax_group_sequence, Rounding_mode::HALF_UP, -1, $tax['name']);    //TODO: Replace -1 with constant.
+							$tax_group_sequence += 1;	//TODO: $tax_group_sequence++;
 							$taxed = TRUE;
 						}
-						$items_taxes_detail = array();
+
+						$items_taxes_detail = [];
 						$items_taxes_detail['item_id'] = $item['item_id'];
 						$items_taxes_detail['line'] = $item['line'];
 						$items_taxes_detail['name'] = $tax['name'];
@@ -128,67 +159,68 @@ class Tax_lib
 				else
 				{
 					// Start of destination based tax calculations
-
-					if($item['tax_category_id'] == NULL)
+					if($item['tax_category_id'] == NULL)	//TODO: === ?
 					{
-						$item['tax_category_id'] = $this->CI->config->config['default_tax_category'];
+						$item['tax_category_id'] = config('OSPOS')->default_tax_category;
 					}
 
 					$taxed = $this->apply_destination_tax($item, $customer_info->city, $customer_info->state, $customer_info->sales_tax_code_id, $register_mode, 0, $taxes, $item_taxes, $item['line']);
 				}
 
-				if($taxed)
+				if($taxed)	//TODO: Convert to ternary notation
 				{
-					$cart[$line]['taxed_flag'] = $this->CI->lang->line('sales_taxed_ind');
+					$cart[$line]['taxed_flag'] = lang('Sales.taxed_ind');
 				}
 				else
 				{
-					$cart[$line]['taxed_flag'] = $this->CI->lang->line('sales_nontaxed_ind');
+					$cart[$line]['taxed_flag'] = lang('Sales.nontaxed_ind');
 				}
 			}
 			$this->round_taxes($taxes);
 		}
 
-		$tax_details = array();
+		$tax_details = [];
 		$tax_details[0] = $taxes;
 		$tax_details[1] = $item_taxes;
 
 		return $tax_details;
 	}
 
-	public function get_included_tax($quantity, $price, $discount_percentage, $discount_type, $tax_percentage, $tax_decimal, $rounding_code)
+	public function get_included_tax(string $quantity, string $price, string $discount_percentage, int $discount_type, string $tax_percentage, $tax_decimal, $rounding_code): string	//TODO: $tax_decimal and $rounding_code are in the signature but never used in the function.
 	{
-		$item_total = $this->CI->sale_lib->get_item_total($quantity, $price, $discount_percentage, $discount_type, TRUE);
-		$tax_fraction = bcdiv(bcadd(100, $tax_percentage), 100);
+		$item_total = $this->sale_lib->get_item_total($quantity, $price, $discount_percentage, $discount_type, TRUE);
+		$tax_fraction = bcdiv(bcadd('100', $tax_percentage), '100');
 		$price_tax_excl = bcdiv($item_total, $tax_fraction);
 		return bcsub($item_total, $price_tax_excl);
 	}
 
-	/*
+	/**
 	* Updates the sales_tax array which is later saved to the `sales_taxes` table and used for printing taxes on receipts and invoices
 	*/
-	public function update_taxes(&$taxes, $tax_type, $tax_group, $tax_rate, $tax_basis, $item_tax_amount, $tax_group_sequence, $rounding_code, $sale_id, $name = '', $tax_code_id = NULL, $jurisdiction_id = NULL,$tax_category_id = NULL  )
+	public function update_taxes(array &$taxes, string $tax_type, string $tax_group, string $tax_rate, string $tax_basis, string $item_tax_amount, int $tax_group_sequence, int $rounding_code, int $sale_id, string $name = '', int $tax_code_id = NULL, int $jurisdiction_id = NULL, int $tax_category_id = NULL): void
 	{
-		$tax_group_index = $this->clean('X' . (float)$tax_rate . '% ' . $tax_group);
+		$tax_group_index = $this->clean('X' . (float)$tax_rate . '% ' . $tax_group);	//TODO: Not sure we should be casting to a float here.  The clean() function takes a string, so it just gets converted back to a string and there's risk of inaccuracies in the value displayed.
 
 		if(!array_key_exists($tax_group_index, $taxes))
 		{
-			$insertkey = $tax_group_index;
+			$insertkey = $tax_group_index;	//TODO: this variable does not follow naming conventions.
 
-			$tax = array($insertkey => array(
-				'sale_id' => $sale_id,
-				'tax_type' => $tax_type,
-				'tax_group' => $tax_group,
-				'sale_tax_basis' => $tax_basis,
-				'sale_tax_amount' => $item_tax_amount,
-				'print_sequence' => $tax_group_sequence,
-				'name' => $name,
-				'tax_rate' => $tax_rate,
-				'sales_tax_code_id' => $tax_code_id,
-				'jurisdiction_id' => $jurisdiction_id,
-				'tax_category_id' => $tax_category_id,
-				'rounding_code' => $rounding_code
-			));
+			$tax = [
+				$insertkey => [
+					'sale_id' => $sale_id,
+					'tax_type' => $tax_type,
+					'tax_group' => $tax_group,
+					'sale_tax_basis' => $tax_basis,
+					'sale_tax_amount' => $item_tax_amount,
+					'print_sequence' => $tax_group_sequence,
+					'name' => $name,
+					'tax_rate' => $tax_rate,
+					'sales_tax_code_id' => $tax_code_id,
+					'jurisdiction_id' => $jurisdiction_id,
+					'tax_category_id' => $tax_category_id,
+					'rounding_code' => $rounding_code
+				]
+			];
 
 			//add to existing array
 			$taxes += $tax;
@@ -202,15 +234,15 @@ class Tax_lib
 		}
 	}
 
-	/*
+	/**
 	* If invoice taxing (as opposed to invoice_item_taxing) rules apply then recalculate the sales tax after tax group totals are final
 	* This is currently used ONLY for the original sales tax migration.
 	*/
-	public function apply_invoice_taxing(&$taxes)
+	public function apply_invoice_taxing(array &$taxes): void
 	{
 		if(!empty($taxes))
 		{
-			$sort = array();
+			$sort = [];
 			foreach($taxes as $k => $v)
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
@@ -226,14 +258,14 @@ class Tax_lib
 		}
 	}
 
-	/*
+	/**
 	 * Apply rounding rules to the accumulated sales tax amounts
 	 */
-	public function round_taxes(&$taxes)
+	public function round_taxes(array &$taxes): void
 	{
 		if(!empty($taxes))
 		{
-			$sort = array();
+			$sort = [];
 			foreach($taxes as $k => $v)
 			{
 				$sort['print_sequence'][$k] = $v['print_sequence'];
@@ -242,7 +274,7 @@ class Tax_lib
 		}
 
 		// If tax included then round decimal to tax decimals, otherwise round it to currency_decimals
-		if($this->CI->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)	//TODO: Convert to ternary notation
 		{
 			$decimals = tax_decimals();
 		}
@@ -257,7 +289,7 @@ class Tax_lib
 			$rounding_code = $sales_tax['rounding_code'];
 			$rounded_tax_amount = $tax_amount;
 
-			if($rounding_code == Rounding_mode::HALF_UP)
+			if($rounding_code == Rounding_mode::HALF_UP)	//TODO: this block needs to be converted to a switch statement
 			{
 				$rounded_tax_amount = round($tax_amount, $decimals, PHP_ROUND_HALF_UP);
 			}
@@ -296,26 +328,26 @@ class Tax_lib
 	 * Determine the applicable tax code and then determine the tax amount to be applied.
 	 * If a tax amount was identified then accumulate into the sales_taxes array
 	 */
-	public function apply_destination_tax(&$item, $city, $state, $sales_tax_code_id, $register_mode, $sale_id, &$taxes, &$item_taxes, $line)
+	public function apply_destination_tax(array &$item, string $city, string $state, int $sales_tax_code_id, string $register_mode, int $sale_id, array &$taxes, array &$item_taxes, int $line): bool
 	{
 		$taxed = FALSE;
 
 		$tax_code_id = $this->get_applicable_tax_code($register_mode, $city, $state, $sales_tax_code_id);
 
 		// If tax code cannot be determined or the price is zero then skip this item
-		if($tax_code_id != -1 && $item['price'] != 0)
+		if($tax_code_id != -1 && $item['price'] != 0)	//TODO: Replace -1 with constant. Also === ?
 		{
 			$tax_decimals = tax_decimals();
 
-			$tax_definition = $this->CI->Tax->get_taxes($tax_code_id, $item['tax_category_id']);
+			$tax_definition = $this->tax->get_taxes($tax_code_id, $item['tax_category_id']);
 
-			// The tax basis should be returned at the currency scale
-			$tax_basis = $this->CI->sale_lib->get_item_total($item['quantity'], $item['price'], $item['discount'], $item['discount_type'], TRUE);
+			// The tax basis should be returned to the currency scale
+			$tax_basis = $this->sale_lib->get_item_total($item['quantity'], $item['price'], $item['discount'], $item['discount_type'], TRUE);
 
-			$row = 0;
+			$row = 0;	//TODO: This variable is set but never used.
 
 			$last_cascade_sequence = 0;
-			$cascade_tax_amount = 0.0;
+			$cascade_tax_amount = '0.0';
 
 			foreach($tax_definition as $tax)
 			{
@@ -323,14 +355,13 @@ class Tax_lib
 				if($cascade_sequence != $last_cascade_sequence)
 				{
 					$last_cascade_sequence = $cascade_sequence;
-					$tax_basis = $tax_basis + $cascade_tax_amount;
+					$tax_basis = bcadd($tax_basis, $cascade_tax_amount);
 				}
 
 				$tax_rate = $tax['tax_rate'];
 				$rounding_code = $tax['tax_rounding_code'];
 
 				// This computes tax for each line item and adds it to the tax type total
-
 				$tax_type = $tax['tax_type'];
 
 				if($tax_type == Tax_lib::TAX_TYPE_INCLUDED)
@@ -340,7 +371,7 @@ class Tax_lib
 				else
 				{
 					$tax_amount = $this->get_tax_for_amount($tax_basis, $tax_rate, $rounding_code, $tax_decimals);
-					$cascade_tax_amount = $cascade_tax_amount + $tax_amount;
+					$cascade_tax_amount = bcadd($cascade_tax_amount,$tax_amount);
 				}
 
 				if($tax_amount != 0)
@@ -349,7 +380,7 @@ class Tax_lib
 					$this->update_taxes($taxes, $tax_type, $tax['tax_group'], $tax_rate, $tax_basis, $tax_amount, $tax['tax_group_sequence'], $rounding_code, $sale_id, $tax['tax_group'], $tax_code_id, $tax['rate_jurisdiction_id'], $item['tax_category_id']);
 				}
 
-				$item_taxes_detail = array();
+				$item_taxes_detail = [];
 				$item_taxes_detail['line'] = $line;
 				$item_taxes_detail['item_id'] = $item['item_id'];
 				$item_taxes_detail['name'] = $tax['tax_group'];
@@ -370,21 +401,21 @@ class Tax_lib
 		return $taxed;
 	}
 
-	public function get_applicable_tax_code($register_mode, $city, $state, $sales_tax_code_id)
+	public function get_applicable_tax_code(string $register_mode, string $city, string $state, int $sales_tax_code_id): int
 	{
-		if($register_mode == "sale")
+		if($register_mode == 'sale')
 		{
-			$sales_tax_code_id = $this->CI->config->config['default_tax_code']; // overrides customer assigned code
+			$sales_tax_code_id = config('OSPOS')->default_tax_code; // overrides customer assigned code
 		}
 		else
 		{
 			if($sales_tax_code_id == NULL || $sales_tax_code_id == 0)
 			{
-				$sales_tax_code_id = $this->CI->Tax_code->get_sales_tax_code($city, $state);
+				$sales_tax_code_id = $this->tax_code->get_sales_tax_code($city, $state);
 
 				if($sales_tax_code_id == NULL || $sales_tax_code_id == 0)
 				{
-					$sales_tax_code_id = $this->CI->config->config['default_tax_code']; // overrides customer assigned code
+					$sales_tax_code_id = config('OSPOS')->default_tax_code; // overrides customer assigned code
 				}
 			}
 		}
@@ -392,21 +423,22 @@ class Tax_lib
 		return $sales_tax_code_id;
 	}
 
-	public function clean($string)
+	public function clean(string $string): string	//TODO: $string is not a good choice of variable name here.
 	{
 		$string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens.
 
 		return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars.
 	}
 
-	public function get_tax_code_options()
+	public function get_tax_code_options(): array
 	{
-		$tax_codes = $this->CI->Tax_code->get_all()->result_array();
-		$tax_code_options = array();
+		$tax_codes = $this->tax_code->get_all()->getResultArray();
+		$tax_code_options = [];
 		$tax_code_options[''] = '';
+
 		foreach($tax_codes as $tax_code)
 		{
-			$a = $tax_code['tax_code_id'];
+			$a = $tax_code['tax_code_id'];	//TODO: Need to refactor single-letter variables into meaningful variable names
 			$b = $tax_code['tax_code_name'];
 			$tax_code_options[$a] = $b;
 		}
@@ -414,12 +446,13 @@ class Tax_lib
 		return $tax_code_options;
 	}
 
-	public function get_tax_jurisdiction_options()
+	public function get_tax_jurisdiction_options(): array
 	{
-		$tax_jurisdictions = $this->CI->Tax_jurisdiction->get_all()->result_array();
-		$tax_jurisdiction_options = array();
+		$tax_jurisdictions = $this->tax_jurisdiction->get_all()->getResultArray();
+		$tax_jurisdiction_options = [];
 		$tax_jurisdiction_options[0] = '';
-		foreach($tax_jurisdictions as $tax_jurisdiction)
+
+		foreach($tax_jurisdictions as $tax_jurisdiction)	//TODO: Need to refactor single-letter variables into meaningful variable names
 		{
 			$a = $tax_jurisdiction['jurisdiction_id'];
 			$b = $tax_jurisdiction['jurisdiction_name'];
@@ -429,14 +462,15 @@ class Tax_lib
 		return $tax_jurisdiction_options;
 	}
 
-	public function get_tax_category_options()
+	public function get_tax_category_options(): array
 	{
-		$tax_categories = $this->CI->Tax_category->get_all()->result_array();
-		$tax_category_options = array();
+		$tax_categories = $this->tax_category->get_all()->getResultArray();
+		$tax_category_options = [];
 		$tax_category_options[0] = '';
+
 		foreach($tax_categories as $tax_category)
 		{
-			$a = $tax_category['tax_category_id'];
+			$a = $tax_category['tax_category_id'];	//TODO: Need to refactor single-letter variables into meaningful variable names
 			$b = $tax_category['tax_category'];
 
 			$tax_category_options[$a] = $b;
@@ -445,11 +479,11 @@ class Tax_lib
 		return $tax_category_options;
 	}
 
-	public function get_tax_type_options($selected_tax_type)
+	public function get_tax_type_options(string $selected_tax_type): string
 	{
 		$selected = 'selected=\"selected\" ';
 
-		$s1 = '';
+		$s1 = '';	//TODO: Need to refactor short variables into meaningful variable names
 		$s2 = '';
 
 		if($selected_tax_type === Tax_lib::TAX_TYPE_EXCLUDED)
@@ -461,8 +495,7 @@ class Tax_lib
 			$s2 = $selected;
 		}
 
-		return '<option value=\"' . Tax_lib::TAX_TYPE_EXCLUDED . '\" ' . $s1 . '> ' . $this->CI->lang->line('taxes_sales_tax')
-			. '</option><option value=\"' . Tax_lib::TAX_TYPE_INCLUDED . '\" ' . $s2 . '> ' . $this->CI->lang->line('taxes_vat_tax') . '</option>';
+		return '<option value=\"' . Tax_lib::TAX_TYPE_EXCLUDED . '\" ' . $s1 . '> ' . lang('Taxes.sales_tax'). '</option>'
+			. '<option value=\"' . Tax_lib::TAX_TYPE_INCLUDED . '\" ' . $s2 . '> ' . lang('Taxes.vat_tax') . '</option>';
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/Token_lib.php b/app/Libraries/Token_lib.php
index 2260bdc9f..c7cb5bf67 100644
--- a/app/Libraries/Token_lib.php
+++ b/app/Libraries/Token_lib.php
@@ -1,26 +1,20 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once(APPPATH . 'models/tokens/Token.php');
+namespace app\Libraries;
+
+use app\Models\tokens\Token;
 
 /**
  * Token library
  *
  * Library with utilities to manage tokens
  */
-
 class Token_lib
 {
-	private $CI;
-
-	public function __construct()
-	{
-		$this->CI =& get_instance();
-	}
-
 	/**
-	 * Expands all of the tokens found in a given text string and returns the results.
+	 * Expands all the tokens found in a given text string and returns the results.
 	 */
-	public function render($tokened_text, $tokens = array(), $save = TRUE)
+	public function render(string $tokened_text, array $tokens = []): string
 	{
 		// Apply the transformation for the "%" tokens if any are used
 		if(strpos($tokened_text, '%') !== FALSE)
@@ -43,17 +37,17 @@ class Token_lib
 			}
 		}
 
-		$token_values = array();
-		$tokens_to_replace = array();
-		$this->generate($token_tree, $tokens_to_replace, $token_values, $tokens, $save);
+		$token_values = [];
+		$tokens_to_replace = [];
+		$this->generate($token_tree, $tokens_to_replace, $token_values, $tokens);
 
 		return str_replace($tokens_to_replace, $token_values, $tokened_text);
 	}
 
 	/**
-	 * Parses out the all of the tokens enclosed in braces {} and subparses on the colon : character where supplied
+	 * Parses out the all the tokens enclosed in braces {} and subparses on the colon : character where supplied
 	 */
-	public function scan($text)
+	public function scan(string $text): array
 	{
 		// Matches tokens with the following pattern: [$token:$length]
 		preg_match_all('/
@@ -69,7 +63,7 @@ class Token_lib
 		$tokens = $matches[1];
 		$lengths = $matches[2];
 
-		$token_tree = array();
+		$token_tree = [];
 		for($i = 0; $i < count($tokens); $i++)
 		{
 			$token_tree[$tokens[$i]][$lengths[$i]] = $matches[0][$i];
@@ -78,9 +72,9 @@ class Token_lib
 		return $token_tree;
 	}
 
-	public function parse_barcode(&$quantity, &$price,  &$item_id_or_number_or_item_kit_or_receipt)
+	public function parse_barcode(string &$quantity, string &$price,  string &$item_id_or_number_or_item_kit_or_receipt): void
 	{
-		$barcode_formats = json_decode($this->CI->config->item('barcode_formats'));
+		$barcode_formats = json_decode(config('OSPOS')->barcode_formats);
 		$barcode_tokens = Token::get_barcode_tokens();
 
 		if(!empty($barcode_formats))
@@ -96,16 +90,15 @@ class Token_lib
 		}
 		else 
 		{
-			$quantity = 1;
+			$quantity = 1;	//TODO: Quantity is handled using bcmath functions so that it is precision safe.  This should be '1'
 		}
-	
 	}
 
-	public function parse($string, $pattern, $tokens = array())
+	public function parse(string $string, string $pattern, array $tokens = []): array	//TODO: $string is a poor name for this parameter.
 	{
 		$token_tree = $this->scan($pattern);
 
-		$found_tokens = array();
+		$found_tokens = [];
 		foreach ($token_tree as $token_id => $token_length)
 		{
 			foreach ($tokens as $token)
@@ -120,7 +113,7 @@ class Token_lib
 			}
 		}
 
-		$results = array();
+		$results = [];
 
 		if (preg_match("/$pattern/", $string, $matches))
 		{
@@ -135,12 +128,12 @@ class Token_lib
 		return $results;
 	}
 
-	public function generate($used_tokens, &$tokens_to_replace, &$token_values, $tokens, $save = TRUE)
+	public function generate(array $used_tokens, array &$tokens_to_replace, array &$token_values, array $tokens): array	//TODO: $tokens
 	{
 		foreach($used_tokens as $token_code => $token_info)
 		{
 			// Generate value here based on the key value
-			$token_value = $this->resolve_token($token_code, array(), $save);
+			$token_value = $this->resolve_token($token_code);
 
 			foreach($token_info as $length => $token_spec)
 			{
@@ -159,18 +152,16 @@ class Token_lib
 		return $token_values;
 	}
 
-	private function resolve_token($token_code, $tokens = array(), $save = TRUE)
+	private function resolve_token($token_code, array $tokens = []): string
 	{
 		foreach(array_merge($tokens, Token::get_tokens()) as $token)
 		{
 			if($token->token_id() == $token_code)
 			{
-				return $token->get_value($save);
+				return $token->get_value();
 			}
 		}
 
 		return '';
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Libraries/index.html b/app/Libraries/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Libraries/index.html
+++ b/app/Libraries/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Models/Appconfig.php b/app/Models/Appconfig.php
index fd931362a..ad8c4fff8 100644
--- a/app/Models/Appconfig.php
+++ b/app/Models/Appconfig.php
@@ -1,113 +1,132 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use ReflectionException;
 
 /**
  * Appconfig class
+ *
+ * @property mixed config
  */
-
-class Appconfig extends CI_Model
+class Appconfig extends Model
 {
-	public function exists($key)
+	public function exists(string $key): bool
 	{
-		$this->db->from('app_config');
-		$this->db->where('app_config.key', $key);
+		$builder = $this->db->table('app_config');
+		$builder->where('app_config.key', $key);	//TODO: I think we can skip app_config. and just write where(key, $key);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	public function get_all()
+	public function get_all(): ResultInterface
 	{
-		$this->db->from('app_config');
-		$this->db->order_by('key', 'asc');
+		$builder = $this->db->table('app_config');
+		$builder->orderBy('key', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get($key, $default = '')
+	public function get_value(string $key, string $default = ''): string
 	{
-		$query = $this->db->get_where('app_config', array('key' => $key), 1);
+		$builder = $this->db->table('app_config');
+		$query = $builder->getWhere('key', $key, 1);
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row()->value;
+			return $query->getRow()->value;
 		}
 
 		return $default;
 	}
 
-	public function save($key, $value)
+	/**
+	 * Calls the parent save() from BaseModel but additionally updates the cached array value.
+	 * @param $data
+	 * @return bool
+	 * @throws ReflectionException
+	 */
+	public function save($data): bool
 	{
-		$config_data = array(
-			'key'   => $key,
-			'value' => $value
-		);
+		$this->config = config('OSPOS');
+		$success = parent::save($data);
 
-		if(!$this->exists($key))
+		$key = array_keys($data)[0];
+
+		if($success)
 		{
-			return $this->db->insert('app_config', $config_data);
+			$this->config[$key] = $data[$key];
 		}
 
-		$this->db->where('key', $key);
-
-		return $this->db->update('app_config', $config_data);
-	}
-
-	public function batch_save($data)
-	{
-		$success = TRUE;
-
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
-
-		foreach($data as $key=>$value)
-		{
-			$success &= $this->save($key, $value);
-		}
-
-		$this->db->trans_complete();
-
-		$success &= $this->db->trans_status();
-
 		return $success;
 	}
 
-	public function delete($key)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function batch_save(array $data): bool
 	{
-		return $this->db->delete('app_config', array('key' => $key));
-	}
+		$success = TRUE;
 
-	public function delete_all()
-	{
-		return $this->db->empty_table('app_config');
-	}
+		//Run these queries as a transaction, we want to make sure we do all or nothing
+		$this->db->transStart();
 
-	public function acquire_next_invoice_sequence($save = TRUE)
-	{
-		$last_used = $this->get('last_used_invoice_number') + 1;
-		if($save)
+		foreach($data as $element)
 		{
-			$this->save('last_used_invoice_number', $last_used);
+			$success &= $this->save($element);
 		}
+
+		$this->db->transComplete();
+
+		$success &= $this->db->transStatus();
+
+		return $success;
+	}
+
+	public function delete(string $key = null, bool $purge = false): bool
+	{
+		$builder = $this->db->table('app_config');
+		return $builder->delete(['key' => $key]);
+	}
+
+	public function delete_all(): bool	//TODO: This function is never used in the code. Consider removing it.
+	{
+		$builder = $this->db->table('app_config');
+		return $builder->emptyTable();
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function acquire_save_next_invoice_sequence(): string
+	{
+		$last_used = (int)config('OSPOS')->last_used_invoice_number + 1;
+		$this->save(['last_used_invoice_number' => $last_used]);
+
 		return $last_used;
 	}
 
-	public function acquire_next_quote_sequence($save = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function acquire_save_next_quote_sequence(): string
 	{
-		$last_used = $this->get('last_used_quote_number') + 1;
-		if($save)
-		{
-			$this->save('last_used_quote_number', $last_used);
-		}
+		$last_used = (int)config('OSPOS')->last_used_quote_number + 1;
+		$this->save(['last_used_quote_number' => $last_used]);
+
 		return $last_used;
 	}
 
-	public function acquire_next_work_order_sequence($save = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function acquire_save_next_work_order_sequence(): string
 	{
-		$last_used = $this->get('last_used_work_order_number') + 1;
-		if($save)
-		{
-			$this->save('last_used_work_order_number', $last_used);
-		}
+		$last_used = (int)config('OSPOS')->last_used_work_order_number + 1;
+		$this->save(['last_used_work_order_number' => $last_used]);
+
 		return $last_used;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Attribute.php b/app/Models/Attribute.php
index 504251504..d12c7103f 100644
--- a/app/Models/Attribute.php
+++ b/app/Models/Attribute.php
@@ -1,68 +1,78 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use DateTime;
+use stdClass;
+use ReflectionClass;
+
 /**
  * Attribute class
  */
-
-class Attribute extends CI_Model
+class Attribute extends Model
 {
-	const SHOW_IN_ITEMS = 1;
+	const SHOW_IN_ITEMS = 1;	//TODO: These need to be moved to constants.php
 	const SHOW_IN_SALES = 2;
 	const SHOW_IN_RECEIVINGS = 4;
 
-	public static function get_definition_flags()
+	public static function get_definition_flags(): array
 	{
 		$class = new ReflectionClass(__CLASS__);
 
 		return array_flip($class->getConstants());
 	}
 
-	/*
-	 Determines if a given definition_id is an attribute
+	/**
+	 * Determines if a given definition_id is an attribute
 	 */
-	public function exists($definition_id, $deleted = FALSE)
+	public function exists(int $definition_id, bool $deleted = FALSE): bool
 	{
-		$this->db->where('definition_id', $definition_id);
-		$this->db->where('deleted', $deleted);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_id', $definition_id);
+		$builder->where('deleted', $deleted);
 
-		return ($this->db->get('attribute_definitions')->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);    //TODO: ===
 	}
 
 	/**
 	 * Returns whether an attribute_link row exists given an item_id and optionally a definition_id
 	 * @param	int		$item_id
-	 * @param	boolean	$definition_id
-	 * @return	boolean					TRUE if at least one attribute_link exists or FALSE if no attributes exist.
+	 * @param	bool	$definition_id
+	 * @return	bool					TRUE if at least one attribute_link exists or FALSE if no attributes exist.
 	 */
-	public function link_exists($item_id, $definition_id = FALSE)
+	public function link_exists(int $item_id, bool $definition_id = FALSE): bool
 	{
-		$this->db->where('item_id', $item_id);
-		$this->db->where('sale_id');
-		$this->db->where('receiving_id');
+		$builder = $this->db->table('attribute_links');
+		$builder->where('item_id', $item_id);
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
 
 		if(empty($definition_id))
 		{
-			$this->db->where('definition_id <>');
-			$this->db->where('attribute_id');
+			$builder->where('definition_id IS NOT NULL');
+			$builder->where('attribute_id', null);
 		}
 		else
 		{
-			$this->db->where('definition_id', $definition_id);
+			$builder->where('definition_id', $definition_id);
 		}
 
-		return ($this->db->get('attribute_links')->num_rows() > 0);
+		return ($builder->get()->getNumRows() > 0);
 	}
 
 	/*
 	 * Determines if a given attribute_value exists in the attribute_values table and returns the attribute_id if it does
 	 */
-	public function value_exists($attribute_value, $definition_type = TEXT)
+	public function value_exists($attribute_value, string $definition_type = TEXT): bool
 	{
 		switch($definition_type)
 		{
 			case DATE:
-				$data_type				= 'date';
-				$attribute_date_value	= DateTime::createFromFormat($this->Appconfig->get('dateformat'), $attribute_value);
-				$attribute_value		= $attribute_date_value->format('Y-m-d');
+				$data_type = 'date';
+				$attribute_date_value = DateTime::createFromFormat(config('OSPOS')->dateformat, $attribute_value);
+				$attribute_value = $attribute_date_value->format('Y-m-d');
 				break;
 			case DECIMAL:
 				$data_type = 'decimal';
@@ -72,13 +82,14 @@ class Attribute extends CI_Model
 				break;
 		}
 
-		$this->db->select('attribute_id');
-		$this->db->where("attribute_$data_type", $attribute_value);
-		$query = $this->db->get('attribute_values');
+		$builder = $this->db->table('attribute_values');
+		$builder->select('attribute_id');
+		$builder->where("attribute_$data_type", $attribute_value);
+		$query = $builder->get();
 
-		if($query->num_rows() > 0)
+		if($query->getNumRows() > 0)
 		{
-			return $query->row()->attribute_id;
+			return $query->getRow()->attribute_id;
 		}
 
 		return FALSE;
@@ -87,18 +98,18 @@ class Attribute extends CI_Model
 	/*
 	 Gets information about a particular attribute definition
 	 */
-	public function get_info($definition_id)
+	public function get_info(int $definition_id): object
 	{
-		$this->db->select('parent_definition.definition_name AS definition_group, definition.*');
-		$this->db->from('attribute_definitions AS definition');
-		$this->db->join('attribute_definitions AS parent_definition', 'parent_definition.definition_id = definition.definition_fk', 'left');
-		$this->db->where('definition.definition_id', $definition_id);
+		$builder = $this->db->table('attribute_definitions AS definition');
+		$builder->select('parent_definition.definition_name AS definition_group, definition.*');
+		$builder->join('attribute_definitions AS parent_definition', 'parent_definition.definition_id = definition.definition_fk', 'left');
+		$builder->where('definition.definition_id', $definition_id);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -106,7 +117,7 @@ class Attribute extends CI_Model
 			$item_obj = new stdClass();
 
 			//Get all the fields from attribute_definitions table
-			foreach($this->db->list_fields('attribute_definitions') as $field)
+			foreach($this->db->getFieldNames('attribute_definitions') as $field)
 			{
 				$item_obj->$field = '';
 			}
@@ -118,55 +129,57 @@ class Attribute extends CI_Model
 	/*
 	 Performs a search on attribute definitions
 	 */
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'definition.definition_name', $order = 'asc')
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'definition.definition_name', string $order = 'asc'): ResultInterface
 	{
-		$this->db->select('parent_definition.definition_name AS definition_group, definition.*');
-		$this->db->from('attribute_definitions AS definition');
-		$this->db->join('attribute_definitions AS parent_definition', 'parent_definition.definition_id = definition.definition_fk', 'left');
+		$builder = $this->db->table('attribute_definitions AS definition');
+		$builder->select('parent_definition.definition_name AS definition_group, definition.*');
+		$builder->join('attribute_definitions AS parent_definition', 'parent_definition.definition_id = definition.definition_fk', 'left');
 
-		$this->db->group_start();
-			$this->db->like('definition.definition_name', $search);
-			$this->db->or_like('definition.definition_type', $search);
-		$this->db->group_end();
+		$builder->groupStart();
+			$builder->like('definition.definition_name', $search);
+			$builder->orLike('definition.definition_type', $search);
+		$builder->groupEnd();
 
-		$this->db->where('definition.deleted', 0);
-		$this->db->order_by($sort, $order);
+		$builder->where('definition.deleted', 0);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_attributes_by_item($item_id)
+	public function get_attributes_by_item(int $item_id): array
 	{
-		$this->db->join('attribute_links', 'attribute_links.definition_id = attribute_definitions.definition_id');
-		$this->db->where('item_id', $item_id);
-		$this->db->where('sale_id');
-		$this->db->where('receiving_id');
-		$this->db->where('deleted', 0);
-		$this->db->order_by('definition_name', 'ASC');
+		$builder = $this->db->table('attribute_definitions');
+		$builder->join('attribute_links', 'attribute_links.definition_id = attribute_definitions.definition_id');
+		$builder->where('item_id', $item_id);
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
+		$builder->where('deleted', 0);
+		$builder->orderBy('definition_name', 'ASC');
 
-		$results = $this->db->get('attribute_definitions')->result_array();
+		$results = $builder->get()->getResultArray();
 
 		return $this->to_array($results, 'definition_id');
 	}
 
-	public function get_values_by_definitions($definition_ids)
+	public function get_values_by_definitions(array $definition_ids): array
 	{
 		if(count($definition_ids ? : []))
 		{
-			$this->db->group_start();
-				$this->db->where_in('definition_fk', array_keys($definition_ids));
-				$this->db->or_where_in('definition_id', array_keys($definition_ids));
-				$this->db->where('definition_type !=', GROUP);
-			$this->db->group_end();
+			$builder = $this->db->table('attribute_definitions');
+			$builder->groupStart();
+				$builder->whereIn('definition_fk', array_keys($definition_ids));
+				$builder->orWhereIn('definition_id', array_keys($definition_ids));
+				$builder->where('definition_type !=', GROUP);
+			$builder->groupEnd();
 
-			$this->db->where('deleted', 0);
+			$builder->where('deleted', 0);
 
-			$results = $this->db->get('attribute_definitions')->result_array();
+			$results = $builder->get()->getResultArray();
 
 			return $this->to_array($results, 'definition_id');
 		}
@@ -174,29 +187,31 @@ class Attribute extends CI_Model
 		return [];
 	}
 
-	public function get_definitions_by_type($attribute_type, $definition_id = NO_DEFINITION_ID)
+	public function get_definitions_by_type(string $attribute_type, int $definition_id = NO_DEFINITION_ID): array
 	{
-		$this->db->where('definition_type', $attribute_type);
-		$this->db->where('deleted', 0);
-		$this->db->where('definition_fk');
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_type', $attribute_type);
+		$builder->where('deleted', 0);
+		$builder->where('definition_fk');
 
 		if($definition_id != CATEGORY_DEFINITION_ID)
 		{
-			$this->db->where('definition_id <>', $definition_id);
+			$builder->where('definition_id <>', $definition_id);
 		}
 
-		$results = $this->db->get('attribute_definitions')->result_array();
+		$results = $builder->get()->getResultArray();
 
 		return $this->to_array($results, 'definition_id', 'definition_name');
 	}
 
-	public function get_definitions_by_flags($definition_flags)
+	public function get_definitions_by_flags(int $definition_flags): array
 	{
-		$this->db->where('definition_flags &', $definition_flags);
-		$this->db->where('deleted', 0);
-		$this->db->where('definition_type <>', GROUP);
-		$this->db->order_by('definition_id');
-		$results = $this->db->get('attribute_definitions')->result_array();
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_flags &', $definition_flags);
+		$builder->where('deleted', 0);
+		$builder->where('definition_type <>', GROUP);
+		$builder->orderBy('definition_id');
+		$results = $builder->get()->getResultArray();
 
 		return $this->to_array($results, 'definition_id', 'definition_name');
 	}
@@ -207,34 +222,36 @@ class Attribute extends CI_Model
 	 * @param 	boolean		$groups		If FALSE does not return GROUP type attributes in the array
 	 * @return	array					Array containing definition IDs, attribute names and -1 index with the local language '[SELECT]' line.
 	 */
-	public function get_definition_names($groups = TRUE)
+	public function get_definition_names(bool $groups = TRUE): array
 	{
-		$this->db->where('deleted', 0);
-		$this->db->order_by('definition_name','ASC');
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('deleted', 0);
+		$builder->orderBy('definition_name','ASC');
 
 		if($groups === FALSE)
 		{
-			$this->db->where_not_in('definition_type',GROUP);
+			$builder->whereNotIn('definition_type',GROUP);
 		}
 
-		$results = $this->db->get('attribute_definitions')->result_array();
-		$definition_name = array(-1 => $this->lang->line('common_none_selected_text'));
+		$results = $builder->get()->getResultArray();
+		$definition_name = [-1 => lang('Common.none_selected_text')];
 
 		return $definition_name + $this->to_array($results, 'definition_id', 'definition_name');
 	}
 
-	public function get_definition_values($definition_id)
+	public function get_definition_values(int $definition_id): array
 	{
 		$attribute_values = [];
 
 		if($definition_id > 0 || $definition_id == CATEGORY_DEFINITION_ID)
 		{
-			$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-			$this->db->where('item_id');
-			$this->db->where('definition_id', $definition_id);
-			$this->db->order_by('attribute_value','ASC');
+			$builder = $this->db->table('attribute_links');
+			$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+			$builder->where('item_id', null);
+			$builder->where('definition_id', $definition_id);
+			$builder->orderBy('attribute_value','ASC');
 
-			$results = $this->db->get('attribute_links')->result_array();
+			$results = $builder->get()->getResultArray();
 
 			return $this->to_array($results, 'attribute_id', 'attribute_value');
 		}
@@ -242,7 +259,7 @@ class Attribute extends CI_Model
 		return $attribute_values;
 	}
 
-	private function to_array($results, $key, $value = '')
+	private function to_array(array $results, string $key, string $value = ''): array
 	{
 		return array_column(array_map(function($result) use ($key, $value){
 			return [$result[$key], empty($value) ? $result : $result[$value]];
@@ -252,22 +269,23 @@ class Attribute extends CI_Model
 	/*
 	 Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results('attribute_definitions');
+		return $builder->countAllResults();
 	}
 
 	/*
 	 Get number of rows
 	 */
-	public function get_found_rows($search)
+	public function get_found_rows(string $search): int
 	{
-		return $this->search($search)->num_rows();
+		return $this->search($search)->getNumRows();
 	}
 
-	private function check_data_validity($definition_id, $from, $to)
+	private function check_data_validity(int $definition_id, string $from, string $to): bool
 	{
 		$success = FALSE;
 
@@ -275,11 +293,12 @@ class Attribute extends CI_Model
 		{
 			$success = TRUE;
 
-			$this->db->distinct()->select('attribute_value');
-			$this->db->join('attribute_links', 'attribute_values.attribute_id = attribute_links.attribute_id');
-			$this->db->where('definition_id', $definition_id);
+			$builder = $this->db->table('attribute_values');
+			$builder->distinct()->select('attribute_value');
+			$builder->join('attribute_links', 'attribute_values.attribute_id = attribute_links.attribute_id');
+			$builder->where('definition_id', $definition_id);
 
-			foreach($this->db->get('attribute_values')->result() as $attribute)
+			foreach($builder->get()->getResult() as $attribute)
 			{
 				switch($to)
 				{
@@ -313,15 +332,16 @@ class Attribute extends CI_Model
 	 * @param int $definition_id
 	 * @return array
 	 */
-	private function get_items_by_value($attribute_value, $definition_id)
+	private function get_items_by_value(string $attribute_value, int $definition_id): array
 	{
-		$this->db->select('item_id');
-		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-		$this->db->where('definition_id', $definition_id);
-		$this->db->where('attribute_value', $attribute_value);
-		return $this->db->get('attribute_links')->result_array();
-	}
+		$builder = $this->db->table('attribute_links');
+		$builder->select('item_id');
+		$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$builder->where('definition_id', $definition_id);
+		$builder->where('attribute_value', $attribute_value);
 
+		return $builder->get()->getResultArray();
+	}
 
 	/**
 	 * Converts data in attribute_values and attribute_links tables associated with the conversion of one attribute type to another.
@@ -330,7 +350,7 @@ class Attribute extends CI_Model
 	 * @param 	string	$to_type
 	 * @return boolean
 	 */
-	private function convert_definition_data($definition_id, $from_type, $to_type)
+	private function convert_definition_data(int $definition_id, string $from_type, string $to_type): bool
 	{
 		$success = FALSE;
 
@@ -348,40 +368,41 @@ class Attribute extends CI_Model
 			{
 				$success = TRUE;
 			}
-			else if($to_type === CHECKBOX)
+			else if($to_type === CHECKBOX)	//TODO: duplicated code.
 			{
 				$checkbox_attribute_values = $this->checkbox_attribute_values($definition_id);
 
-				$this->db->trans_start();
-
-				$query = 'UPDATE '. $this->db->dbprefix('attribute_links') .' links ';
-				$query .= 'JOIN '. $this->db->dbprefix('attribute_values') .' vals ';
+				$this->db->transStart();
+//TODO: We should see if we can convert these queries to use query builder from CI4.
+				$query = 'UPDATE '. $this->db->prefixTable('attribute_links') .' links ';
+				$query .= 'JOIN '. $this->db->prefixTable('attribute_values') .' vals ';
 				$query .= 'ON vals.attribute_id = links.attribute_id ';
 				$query .= "SET links.attribute_id = IF((attribute_value IN('FALSE','0','') OR (attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
 				$query .= 'WHERE definition_id = '. $this->db->escape($definition_id);
 				$success = $this->db->query($query);
 
-				$this->db->trans_complete();
+				$this->db->transComplete();
 			}
 		}
 		else if($from_type === DROPDOWN)
 		{
-			if(in_array($to_type, [TEXT, CHECKBOX], TRUE))
+			if(in_array($to_type, [TEXT, CHECKBOX], TRUE))	//TODO: This if statement is possibly unnecessary... unless we have it there so that later we can do something with TEXT types also.
 			{
-				if($to_type === CHECKBOX)
+				if($to_type === CHECKBOX)	//TODO: Duplicated code.
 				{
 					$checkbox_attribute_values = $this->checkbox_attribute_values($definition_id);
 
-					$this->db->trans_start();
-
-					$query = 'UPDATE '. $this->db->dbprefix('attribute_links') .' links ';
-					$query .= 'JOIN '. $this->db->dbprefix('attribute_values') .' vals ';
+					$this->db->transStart();
+//TODO: We should see if we can convert these queries to use query builder from CI4.
+//TODO: We should see if we can refactor a function out of this block and the identical block above it.
+					$query = 'UPDATE '. $this->db->prefixTable('attribute_links') .' links ';
+					$query .= 'JOIN '. $this->db->prefixTable('attribute_values') .' vals ';
 					$query .= 'ON vals.attribute_id = links.attribute_id ';
 					$query .= "SET links.attribute_id = IF((attribute_value IN('FALSE','0','') OR (attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
 					$query .= 'WHERE definition_id = '. $this->db->escape($definition_id);
 					$success = $this->db->query($query);
 
-					$this->db->trans_complete();
+					$this->db->transComplete();
 				}
 			}
 		}
@@ -395,7 +416,7 @@ class Attribute extends CI_Model
 		return $success;
 	}
 
-	private function checkbox_attribute_values($definition_id)
+	private function checkbox_attribute_values(int $definition_id): array
 	{
 		$zero_attribute_id = $this->value_exists('0');
 		$one_attribute_id = $this->value_exists('1');
@@ -410,27 +431,29 @@ class Attribute extends CI_Model
 			$one_attribute_id = $this->save_value('1', $definition_id, FALSE, FALSE, CHECKBOX);
 		}
 
-		return array($zero_attribute_id, $one_attribute_id);
+		return [$zero_attribute_id, $one_attribute_id];
 	}
 
 	/*
 	 Inserts or updates a definition
 	 */
-	public function save_definition(&$definition_data, $definition_id = NO_DEFINITION_ID)
+	public function save_definition(array &$definition_data, int $definition_id = NO_DEFINITION_ID): bool
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
+
+		$builder = $this->db->table('attribute_definitions');
 
 		//Definition doesn't exist
 		if($definition_id === NO_DEFINITION_ID || !$this->exists($definition_id))
 		{
 			if($this->exists($definition_id,TRUE))
 			{
-				$success = $this->undelete_definition($definition_id);
+				$success = $this->undelete($definition_id);
 			}
 			else
 			{
-				$success = $this->db->insert('attribute_definitions', $definition_data);
-				$definition_data['definition_id'] = $this->db->insert_id();
+				$success = $builder->insert($definition_data);
+				$definition_data['definition_id'] = $this->db->insertID();
 			}
 		}
 
@@ -438,17 +461,17 @@ class Attribute extends CI_Model
 		else
 		{
 			//Get current definition type and name
-			$this->db->select('definition_type');
-			$this->db->where('definition_id', $definition_id);
+			$builder->select('definition_type');
+			$builder->where('definition_id', $definition_id);
 
-			$row = $this->db->get('attribute_definitions')->row();
+			$row = $builder->get('attribute_definitions')->getRow();
 			$from_definition_type = $row->definition_type;
 			$to_definition_type = $definition_data['definition_type'];
 
 			//Update the definition values
-			$this->db->where('definition_id', $definition_id);
+			$builder->where('definition_id', $definition_id);
 
-			$success = $this->db->update('attribute_definitions', $definition_data);
+			$success = $builder->update($definition_data);
 			$definition_data['definition_id'] = $definition_id;
 
 			if($from_definition_type !== $to_definition_type)
@@ -460,164 +483,172 @@ class Attribute extends CI_Model
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	public function get_definition_by_name($definition_name, $definition_type = FALSE)
+	public function get_definition_by_name(string $definition_name, $definition_type = FALSE): array
 	{
-		$this->db->where('definition_name', $definition_name);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_name', $definition_name);
 
 		if($definition_type != FALSE)
 		{
-			$this->db->where('definition_type', $definition_type);
+			$builder->where('definition_type', $definition_type);
 		}
 
-		return $this->db->get('attribute_definitions')->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	public function save_link($item_id, $definition_id, $attribute_id)
+	public function save_link(int $item_id, int $definition_id, int $attribute_id): bool
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
+
+		$builder = $this->db->table('attribute_links');
 
 		if($this->link_exists($item_id, $definition_id))
 		{
-			$this->db->where('definition_id', $definition_id);
-			$this->db->where('item_id', $item_id);
-			$this->db->where('sale_id');
-			$this->db->where('receiving_id');
-			$this->db->update('attribute_links', array('attribute_id' => $attribute_id));
+			$builder->where('definition_id', $definition_id);
+			$builder->where('item_id', $item_id);
+			$builder->where('sale_id', null);
+			$builder->where('receiving_id', null);
+			$builder->update(['attribute_id' => $attribute_id]);
 		}
 		else
 		{
-			$this->db->insert('attribute_links', array(
+			$builder->insert([
 					'attribute_id' => $attribute_id,
 					'item_id' => $item_id,
-					'definition_id' => $definition_id));
+					'definition_id' => $definition_id
+			]);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		return $this->db->trans_status();
+		return $this->db->transStatus();
 	}
 
-	public function delete_link($item_id, $definition_id = FALSE)
+	public function delete_link(int $item_id, bool $definition_id = FALSE): bool
 	{
-		$delete_data = array('item_id' => $item_id);
+		$delete_data = ['item_id' => $item_id];
 
 		//Exclude rows where sale_id or receiving_id has a value
-		$this->db->where('sale_id');
-		$this->db->where('receiving_id');
+		$builder = $this->db->table('attribute_links');
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
 
 		if(!empty($definition_id))
 		{
 			$delete_data += ['definition_id' => $definition_id];
 		}
 
-		$success = $this->db->delete('attribute_links', $delete_data);
-
-		return $success;
+		return $builder->delete($delete_data);
 	}
 
-	public function get_link_value($item_id, $definition_id)
+	public function get_link_value(int $item_id, int $definition_id): object
 	{
-		$this->db->where('item_id', $item_id);
-		$this->db->where('sale_id');
-		$this->db->where('receiving_id');
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_links');
+		$builder->where('item_id', $item_id);
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
+		$builder->where('definition_id', $definition_id);
 
-		return $this->db->get('attribute_links')->row_object();
+		return $builder->get('attribute_links')->getRowObject();
 	}
 
-	public function get_link_values($item_id, $sale_receiving_fk, $id, $definition_flags)
+	public function get_link_values(int $item_id, string $sale_receiving_fk, int $id, int $definition_flags): ResultInterface
 	{
 		$format = $this->db->escape(dateformat_mysql());
-		$this->db->select("GROUP_CONCAT(attribute_value SEPARATOR ', ') AS attribute_values");
-		$this->db->select("GROUP_CONCAT(DATE_FORMAT(attribute_date, $format) SEPARATOR ', ') AS attribute_dtvalues");
-		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-		$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
-		$this->db->where('definition_type <>', GROUP);
-		$this->db->where('deleted', 0);
-		$this->db->where('item_id', intval($item_id));
+
+		$builder = $this->db->table('attribute_links');
+		$builder->select("GROUP_CONCAT(attribute_value SEPARATOR ', ') AS attribute_values");
+		$builder->select("GROUP_CONCAT(DATE_FORMAT(attribute_date, $format) SEPARATOR ', ') AS attribute_dtvalues");
+		$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$builder->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
+		$builder->where('definition_type <>', GROUP);
+		$builder->where('deleted', 0);
+		$builder->where('item_id', $item_id);
 
 		if(!empty($id))
 		{
-			$this->db->where($sale_receiving_fk, $id);
+			$builder->where($sale_receiving_fk, $id);
 		}
 		else
 		{
-			$this->db->where('sale_id');
-			$this->db->where('receiving_id');
+			$builder->where('sale_id', null);
+			$builder->where('receiving_id', null);
 		}
 
-		$this->db->where('definition_flags & ', $definition_flags);
+		$builder->where('definition_flags & ', $definition_flags);
 
-		return $this->db->get('attribute_links');
+		return $builder->get();
 	}
 
-	public function get_attribute_value($item_id, $definition_id)
+	public function get_attribute_value(int $item_id, int $definition_id): object
 	{
-		$this->db->join('attribute_links', 'attribute_links.attribute_id = attribute_values.attribute_id');
-		$this->db->where('item_id', intval($item_id));
-		$this->db->where('sale_id');
-		$this->db->where('receiving_id');
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_values');
+		$builder->join('attribute_links', 'attribute_links.attribute_id = attribute_values.attribute_id');
+		$builder->where('item_id', $item_id);
+		$builder->where('sale_id', null);
+		$builder->where('receiving_id', null);
+		$builder->where('definition_id', $definition_id);
 
-		return $this->db->get('attribute_values')->row_object();
+		return $builder->get()->getRowObject();
 	}
 
-	public function get_attribute_values($item_id)
+	public function get_attribute_values(int $item_id): array	//TODO: Is this function used anywhere in the code?
 	{
-		$this->db->select('attribute_values.attribute_value, attribute_values.attribute_decimal, attribute_values.attribute_date, attribute_links.definition_id');
-		$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
-		$this->db->where('item_id', intval($item_id));
+		$builder = $this->db->table('attribute_links');
+		$builder->select('attribute_values.attribute_value, attribute_values.attribute_decimal, attribute_values.attribute_date, attribute_links.definition_id');
+		$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+		$builder->where('item_id', $item_id);
 
-		$results = $this->db->get('attribute_links')->result_array();
+		$results = $builder->get()->getResultArray();
 
 		return $this->to_array($results, 'definition_id');
 	}
 
-
-	public function copy_attribute_links($item_id, $sale_receiving_fk, $id)
+	public function copy_attribute_links(int $item_id, string $sale_receiving_fk, int $id): void
 	{
-		$this->db->query(
-			'INSERT INTO ' . $this->db->dbprefix('attribute_links') . ' (item_id, definition_id, attribute_id, ' . $sale_receiving_fk . ')
-			SELECT ' . $this->db->escape($item_id) . ', definition_id, attribute_id, ' . $this->db->escape($id) . '
-			FROM ' . $this->db->dbprefix('attribute_links') . '
-			WHERE item_id = ' . $this->db->escape($item_id) . ' AND sale_id IS NULL AND receiving_id IS NULL'
-			);
+//TODO: this likely needs to be rewritten as two different queries rather than a subquery within a query.  Then use query_builder for both.
+		$query = 'INSERT INTO ' . $this->db->prefixTable('attribute_links') . ' (item_id, definition_id, attribute_id, ' . $sale_receiving_fk . ')	';
+		$query .= 'SELECT ' . $this->db->escape($item_id) . ', definition_id, attribute_id, ' . $this->db->escape($id);
+		$query .= 'FROM ' . $this->db->prefixTable('attribute_links');
+		$query .= 'WHERE item_id = ' . $this->db->escape($item_id);
+		$query .=' AND sale_id IS NULL AND receiving_id IS NULL';
+		$this->db->query($query);
 	}
 
-	public function get_suggestions($definition_id, $term)
+	public function get_suggestions(int $definition_id, string $term): array
 	{
 		$suggestions = [];
-		$this->db->distinct();
-		$this->db->select('attribute_value, attribute_values.attribute_id');
-		$this->db->from('attribute_definitions AS definition');
-		$this->db->join('attribute_links', 'attribute_links.definition_id = definition.definition_id');
-		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-		$this->db->like('attribute_value', $term);
-		$this->db->where('deleted', 0);
-		$this->db->where('definition.definition_id', $definition_id);
-		$this->db->order_by('attribute_value','ASC');
 
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('attribute_definitions AS definition');
+		$builder->distinct()->select('attribute_value, attribute_values.attribute_id');
+		$builder->join('attribute_links', 'attribute_links.definition_id = definition.definition_id');
+		$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$builder->like('attribute_value', $term);
+		$builder->where('deleted', 0);
+		$builder->where('definition.definition_id', $definition_id);
+		$builder->orderBy('attribute_value','ASC');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$row_array = (array) $row;
-			$suggestions[] = array('value' => $row_array['attribute_id'], 'label' => $row_array['attribute_value']);
+			$row_array = (array)$row;
+			$suggestions[] = ['value' => $row_array['attribute_id'], 'label' => $row_array['attribute_value']];
 		}
 
 		return $suggestions;
 	}
 
-	public function save_value($attribute_value, $definition_id, $item_id = FALSE, $attribute_id = FALSE, $definition_type = DROPDOWN)
+	public function save_value(string $attribute_value, int $definition_id, $item_id = FALSE, $attribute_id = FALSE, string $definition_type = DROPDOWN): int
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$locale_date_format = $this->Appconfig->get('dateformat');
+		$locale_date_format = config('OSPOS')->dateformat;
 
 		//New Attribute
 		if(empty($attribute_id) || empty($item_id))
@@ -627,7 +658,7 @@ class Attribute extends CI_Model
 
 			if($attribute_id === FALSE)
 			{
-				switch($definition_type)
+				switch($definition_type)	//TODO: Duplicated code
 				{
 					case DATE:
 						$data_type				= 'date';
@@ -642,19 +673,23 @@ class Attribute extends CI_Model
 						break;
 				}
 
-				$this->db->insert('attribute_values', array("attribute_$data_type" => $attribute_value));
+				$builder = $this->db->table('attribute_values');
+				$builder->insert(["attribute_$data_type" => $attribute_value]);
+
+				$attribute_id = $this->db->insertID();
 			}
 
-			$attribute_id = $attribute_id ? $attribute_id : $this->db->insert_id();
-
-			$this->db->insert('attribute_links', array(
+			$builder = $this->db->table('attribute_links');
+			$data = [
 				'attribute_id' => empty($attribute_id) ? NULL : $attribute_id,
 				'item_id' => empty($item_id) ? NULL : $item_id,
-				'definition_id' => $definition_id));
+				'definition_id' => $definition_id
+			];
+			$builder->insert($data);
 		}
 		//Existing Attribute
 		else
-		{
+		{//TODO: TAKE A LOOK AT THIS DUPLICATE CODE FRAGMENT FROM ABOVE AND SEE ABOUT REFACTORING OUT A FUNCTION
 			switch($definition_type)
 			{
 				case DATE:
@@ -670,19 +705,23 @@ class Attribute extends CI_Model
 					break;
 			}
 
-				$this->db->where('attribute_id', $attribute_id);
-				$this->db->update('attribute_values', array("attribute_$data_type" => $attribute_value));
+			$builder = $this->db->table('attribute_values');
+			$builder->where('attribute_id', $attribute_id);
+			$builder->update(["attribute_$data_type" => $attribute_value]);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
 		return $attribute_id;
 	}
 
-	public function delete_value($attribute_value, $definition_id)
+	public function delete_value(string $attribute_value, int $definition_id)
 	{
-		return $this->db->query('DELETE atrv, atrl FROM ' . $this->db->dbprefix('attribute_values') . ' atrv, ' . $this->db->dbprefix('attribute_links') .  ' atrl ' .
-			'WHERE atrl.attribute_id = atrv.attribute_id AND atrv.attribute_value = ' . $this->db->escape($attribute_value) . ' AND atrl.definition_id = ' . $this->db->escape($definition_id));
+		$query = 'DELETE atrv, atrl ';
+		$query .= 'FROM ' . $this->db->prefixTable('attribute_values') . ' atrv, ' . $this->db->prefixTable('attribute_links') .  ' atrl ';
+		$query .= 'WHERE atrl.attribute_id = atrv.attribute_id AND atrv.attribute_value = ' . $this->db->escape($attribute_value);
+		$query .= ' AND atrl.definition_id = ' . $this->db->escape($definition_id);
+		return $this->db->query($query);
 	}
 
 	/**
@@ -691,18 +730,20 @@ class Attribute extends CI_Model
 	 * @param	int		$definition_id	Attribute definition ID to remove.
 	 * @return 	boolean					TRUE if successful and FALSE if there is a failure
 	 */
-	public function delete_definition($definition_id)
+	public function delete_definition(int $definition_id): bool
 	{
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_id', $definition_id);
 
-		return $this->db->update('attribute_definitions', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
-	public function delete_definition_list($definition_ids)
+	public function delete_definition_list(string $definition_ids): bool
 	{
-		$this->db->where_in('definition_id', $definition_ids);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->whereIn('definition_id', $definition_ids);
 
-		return $this->db->update('attribute_definitions', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
 	/**
@@ -711,67 +752,73 @@ class Attribute extends CI_Model
 	 * @param int $definition_id
 	 * @return boolean TRUE is returned if the delete was successful or FALSE if there were any failures
 	 */
-	public function delete_orphaned_links($definition_id)
+	public function delete_orphaned_links(int $definition_id): bool
 	{
-		$this->db->select('definition_type');
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->select('definition_type');
+		$builder->where('definition_id', $definition_id);
 
-		$definition = $this->db->get('attribute_definitions')->row();
+		$definition = $builder->get()->getRow();
 
 		if($definition->definition_type != DROPDOWN)
 		{
-			$this->db->trans_start();
+			$this->db->transStart();
 
-			$this->db->where('item_id');
-			$this->db->where('definition_id', $definition_id);
-			$this->db->delete('attribute_links');
+			$builder = $this->db->table('attribute_links');
+			$builder->where('item_id', null);
+			$builder->where('definition_id', $definition_id);
+			$builder->delete();
 
-			$this->db->trans_complete();
+			$this->db->transComplete();
 
-			return $this->db->trans_status();
+			return $this->db->transStatus();
 		}
+
+		return true;	//Return true when definition_type is DROPDOWN
 	}
 
-	/*
+	/**
 	 * Deletes any orphaned values that do not have associated links
-	 * @param int $definition_id
+	 *
 	 * @return boolean TRUE is returned if the delete was successful or FALSE if there were any failures
 	 */
-	public function delete_orphaned_values()
+	public function delete_orphaned_values(): bool
 	{
-		$this->db->distinct();
-		$this->db->select('attribute_id');
-		$attribute_ids = $this->db->get_compiled_select('attribute_links');
+		$builder = $this->db->table('attribute_values');
+		$builder->distinct()->select('attribute_id');
+		$attribute_ids = $builder->getCompiledSelect('attribute_links');
 
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$this->db->where_not_in('attribute_id', $attribute_ids, FALSE);
-		$this->db->delete('attribute_values');
+		$builder->whereNotIn('attribute_id', $attribute_ids, FALSE);
+		$builder->delete();
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		return $this->db->trans_status();
+		return $this->db->transStatus();
 	}
 
-	/*
-	Undeletes one attribute definition
-	*/
-	public function undelete($definition_id)
+	/**
+	 * Undeletes one attribute definition
+	 */
+	public function undelete(int $definition_id): bool
 	{
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_definitions');
+		$builder->where('definition_id', $definition_id);
 
-		return $this->db->update('attribute_definitions', array('deleted' => 0));
+		return $builder->update(['deleted' => 0]);
 	}
 
 	/**
 	 *
-	 * @param array 	attributes 			attributes that need to be fixed
-	 * @param int 		$definition_id
-	 * @param string	$definition_type	This dictates what column should be populated in any new attribute_values that are created
+	 * @param array $attributes attributes that need to be fixed
+	 * @param int $definition_id
+	 * @param string $definition_type This dictates what column should be populated in any new attribute_values that are created
+	 * @return bool
 	 */
-	public function attribute_cleanup($attributes, $definition_id, $definition_type)
+	public function attribute_cleanup(array $attributes, int $definition_id, string $definition_type): bool
 	{
-		$this->db->trans_begin();
+		$this->db->transBegin();
 
 		foreach($attributes as $attribute)
 		{
@@ -780,13 +827,13 @@ class Attribute extends CI_Model
 			if($this->save_link($attribute['item_id'], $definition_id, $new_attribute_id) == FALSE)
 			{
 				log_message('Error', 'Transaction failed');
-				$this->db->trans_rollback();
+				$this->db->transRollback();
 				return FALSE;
 			}
 		}
 		$success = $this->delete_orphaned_links($definition_id);
 
-		$this->db->trans_commit();
+		$this->db->transCommit();
 		return $success;
 	}
 
@@ -796,12 +843,13 @@ class Attribute extends CI_Model
 	 * @param int $definition_id
 	 * @return array All attribute_id and item_id pairs in the attribute_links table with that attribute definition_id
 	 */
-	public function get_attributes_by_definition($definition_id)
+	public function get_attributes_by_definition(int $definition_id): array
 	{
-		$this->db->select('attribute_links.attribute_id, item_id, attribute_value, attribute_decimal, attribute_date');
-		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-		$this->db->where('definition_id', $definition_id);
+		$builder = $this->db->table('attribute_links');
+		$builder->select('attribute_links.attribute_id, item_id, attribute_value, attribute_decimal, attribute_date');
+		$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$builder->where('definition_id', $definition_id);
 
-		return $this->db->get('attribute_links')->result_array();
+		return $builder->get()->getResultArray();
 	}
 }
\ No newline at end of file
diff --git a/app/Models/Cashup.php b/app/Models/Cashup.php
index de03509b9..f59add1b8 100644
--- a/app/Models/Cashup.php
+++ b/app/Models/Cashup.php
@@ -1,62 +1,74 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Cashup class
+ *
+ * @property employee employee
  */
 
-class Cashup extends CI_Model
+class Cashup extends Model
 {
-	/*
-	Determines if a given Cashup_id is an Cashup
-	*/
-	public function exists($cashup_id)
+	/**
+	 * Determines if a given Cashup_id is a Cashup
+	 */
+	public function exists(int $cashup_id): bool
 	{
-		$this->db->from('cash_up');
-		$this->db->where('cashup_id', $cashup_id);
+		$builder = $this->db->table('cash_up');
+		$builder->where('cashup_id', $cashup_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets employee info
-	*/
-	public function get_employee($cashup_id)
+	/**
+	 * Gets employee info
+	 */
+	public function get_employee(int $cashup_id): object    //TODO: This function is never called and if it were called, would not yield proper results.  There is no employee_id field in the cash_up table.
 	{
-		$this->db->from('cash_up');
-		$this->db->where('cashup_id', $cashup_id);
+		$builder = $this->db->table('cash_up');
+		$builder->where('cashup_id', $cashup_id);
 
-		return $this->Employee->get_info($this->db->get()->row()->employee_id);
+		$employee = model(Employee::class);
+
+		return $employee->get_info($builder->get()->getRow()->employee_id);
 	}
 
-	public function get_multiple_info($cash_up_ids)
+	public function get_multiple_info(string $cashup_ids): ResultInterface
 	{
-		$this->db->from('cash_up');
-		$this->db->where_in('cashup_id', $cashup_ids);
-		$this->db->order_by('cashup_id', 'asc');
+		$builder = $this->db->table('cash_up');
+		$builder->whereIn('cashup_id', $cashup_ids);
+		$builder->orderBy('cashup_id', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets rows
-	*/
-	public function get_found_rows($search, $filters)
+	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search, array $filters): ResultInterface
 	{
 		return $this->search($search, $filters, 0, 0, 'cashup_id', 'asc', TRUE);
 	}
 
-	/*
-	Searches cashups
-	*/
-	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'cashup_id', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Searches cashups
+	 */
+	public function search(string $search, array $filters, int $rows = 0, int $limit_from = 0, string $sort = 'cashup_id', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
+		$builder = $this->db->table('cash_up AS cash_up');
+		
 		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			$this->db->select('COUNT(cash_up.cashup_id) as count');
+			$builder->select('COUNT(cash_up.cashup_id) as count');
 		}
 
-		$this->db->select('
+		$builder->select('
 			cash_up.cashup_id,
 			MAX(cash_up.open_date) AS open_date,
 			MAX(cash_up.close_date) AS close_date,
@@ -76,56 +88,57 @@ class Cashup extends CI_Model
 			MAX(close_employees.first_name) AS close_first_name,
 			MAX(close_employees.last_name) AS close_last_name
 		');
-		$this->db->from('cash_up AS cash_up');
-		$this->db->join('people AS open_employees', 'open_employees.person_id = cash_up.open_employee_id', 'LEFT');
-		$this->db->join('people AS close_employees', 'close_employees.person_id = cash_up.close_employee_id', 'LEFT');
 
-		$this->db->group_start();
-			$this->db->like('cash_up.open_date', $search);
-			$this->db->or_like('open_employees.first_name', $search);
-			$this->db->or_like('open_employees.last_name', $search);
-			$this->db->or_like('close_employees.first_name', $search);
-			$this->db->or_like('close_employees.last_name', $search);
-			$this->db->or_like('cash_up.closed_amount_total', $search);
-			$this->db->or_like('CONCAT(open_employees.first_name, " ", open_employees.last_name)', $search);
-			$this->db->or_like('CONCAT(close_employees.first_name, " ", close_employees.last_name)', $search);
-		$this->db->group_end();
+		$builder->join('people AS open_employees', 'open_employees.person_id = cash_up.open_employee_id', 'LEFT');
+		$builder->join('people AS close_employees', 'close_employees.person_id = cash_up.close_employee_id', 'LEFT');
 
-		$this->db->where('cash_up.deleted', $filters['is_deleted']);
+		$builder->groupStart();
+			$builder->like('cash_up.open_date', $search);
+			$builder->orLike('open_employees.first_name', $search);
+			$builder->orLike('open_employees.last_name', $search);
+			$builder->orLike('close_employees.first_name', $search);
+			$builder->orLike('close_employees.last_name', $search);
+			$builder->orLike('cash_up.closed_amount_total', $search);
+			$builder->orLike('CONCAT(open_employees.first_name, " ", open_employees.last_name)', $search);
+			$builder->orLike('CONCAT(close_employees.first_name, " ", close_employees.last_name)', $search);
+		$builder->groupEnd();
 
-		if(empty($this->config->item('date_or_time_format')))
+		$builder->where('cash_up.deleted', $filters['is_deleted']);
+
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: convert this to ternary notation.
 		{
-			$this->db->where('DATE_FORMAT(cash_up.open_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+			$builder->where('DATE_FORMAT(cash_up.open_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
 		}
 		else
 		{
-			$this->db->where('cash_up.open_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+			$builder->where('cash_up.open_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
 		}
 
-		$this->db->group_by('cashup_id');
+		$builder->groupBy('cashup_id');
 
 		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			return $this->db->get()->row_array()['count'];
+			return $builder->get()->getRowArray()['count'];
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets information about a particular cashup
+	/**
+	* Gets information about a particular cashup
 	*/
-	public function get_info($cashup_id)
+	public function get_info(int $cashup_id): object
 	{
-		$this->db->select('
+		$builder = $this->db->table('cash_up AS cash_up');
+		$builder->select('
 			cash_up.cashup_id AS cashup_id,
 			cash_up.open_date AS open_date,
 			cash_up.close_date AS close_date,
@@ -146,15 +159,14 @@ class Cashup extends CI_Model
 			close_employees.first_name AS close_first_name,
 			close_employees.last_name AS close_last_name
 		');
-		$this->db->from('cash_up AS cash_up');
-		$this->db->join('people AS open_employees', 'open_employees.person_id = cash_up.open_employee_id', 'LEFT');
-		$this->db->join('people AS close_employees', 'close_employees.person_id = cash_up.close_employee_id', 'LEFT');
-		$this->db->where('cashup_id', $cashup_id);
+		$builder->join('people AS open_employees', 'open_employees.person_id = cash_up.open_employee_id', 'LEFT');
+		$builder->join('people AS close_employees', 'close_employees.person_id = cash_up.close_employee_id', 'LEFT');
+		$builder->where('cashup_id', $cashup_id);
 
-		$query = $this->db->get();
-		if($query->num_rows() == 1)
+		$query = $builder->get();
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -162,7 +174,7 @@ class Cashup extends CI_Model
 			$cash_up_obj = new stdClass();
 
 			//Get all the fields from cashup table
-			foreach($this->db->list_fields('cash_up') as $field)
+			foreach($this->db->getFieldNames('cash_up') as $field)
 			{
 				$cash_up_obj->$field = '';
 			}
@@ -171,16 +183,17 @@ class Cashup extends CI_Model
 		}
 	}
 
-	/*
-	Inserts or updates an cashup
+	/**
+	* Inserts or updates a cashup
 	*/
-	public function save(&$cash_up_data, $cashup_id = FALSE)
+	public function save_value(array &$cash_up_data, $cashup_id = FALSE): bool
 	{
-		if(!$cashup_id == -1 || !$this->exists($cashup_id))
+		if(!$cashup_id == -1 || !$this->exists($cashup_id))	//TODO: Replace -1 with constant
 		{
-			if($this->db->insert('cash_up', $cash_up_data))
+			$builder = $this->db->table('cash_up');
+			if($builder->insert($cash_up_data))
 			{
-				$cash_up_data['cashup_id'] = $this->db->insert_id();
+				$cash_up_data['cashup_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -188,25 +201,24 @@ class Cashup extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('cashup_id', $cashup_id);
+		$builder = $this->db->table('cash_up');
+		$builder->where('cashup_id', $cashup_id);
 
-		return $this->db->update('cash_up', $cash_up_data);
+		return $builder->update($cash_up_data);
 	}
 
-	/*
-	Deletes a list of cashups
-	*/
-	public function delete_list($cashup_ids)
+	/**
+	 * Deletes a list of cashups
+	 */
+	public function delete_list(array $cashup_ids): bool
 	{
-		$success = FALSE;
-
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
-			$this->db->where_in('cashup_id', $cashup_ids);
-			$success = $this->db->update('cash_up', array('deleted'=>1));
-		$this->db->trans_complete();
+		$this->db->transStart();
+			$builder = $this->db->table('cash_up');
+			$builder->whereIn('cashup_id', $cashup_ids);
+			$success = $builder->update(['deleted' => 1]);
+		$this->db->transComplete();
 
 		return $success;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Customer.php b/app/Models/Customer.php
index d5b812718..4ff6ea1e4 100644
--- a/app/Models/Customer.php
+++ b/app/Models/Customer.php
@@ -1,90 +1,93 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
 
 /**
  * Customer class
  */
-
 class Customer extends Person
 {
-	/*
-	Determines if a given person_id is a customer
-	*/
-	public function exists($person_id)
+	/**
+	 * Determines if a given person_id is a customer
+	 */
+	public function exists(int $person_id): bool
 	{
-		$this->db->from('customers');
-		$this->db->join('people', 'people.person_id = customers.person_id');
-		$this->db->where('customers.person_id', $person_id);
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'people.person_id = customers.person_id');
+		$builder->where('customers.person_id', $person_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);
 	}
 
-	/*
-	Checks if account number exists
-	*/
-	public function check_account_number_exists($account_number, $person_id = '')
+	/**
+	 * Checks if account number exists
+	 */
+	public function check_account_number_exists(string $account_number, string $person_id = ''): bool
 	{
-		$this->db->from('customers');
-		$this->db->where('account_number', $account_number);
+		$builder = $this->db->table('customers');
+		$builder->where('account_number', $account_number);
 
 		if(!empty($person_id))
 		{
-			$this->db->where('person_id !=', $person_id);
+			$builder->where('person_id !=', $person_id);
 		}
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('customers');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('customers');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Returns all the customers
-	*/
-	public function get_all($rows = 0, $limit_from = 0)
+	/**
+	 * Returns all the customers
+	 */
+	public function get_all(int $limit = 0, int $offset = 0): ResultInterface
 	{
-		$this->db->from('customers');
-		$this->db->join('people', 'customers.person_id = people.person_id');
-		$this->db->where('deleted', 0);
-		$this->db->order_by('last_name', 'asc');
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'customers.person_id = people.person_id');
+		$builder->where('deleted', 0);
+		$builder->orderBy('last_name', 'asc');
 
-		if($rows > 0)
+		if($limit > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($limit, $offset);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets information about a particular customer
-	*/
-	public function get_info($customer_id)
+	/**
+	 * Gets information about a particular customer
+	 */
+	public function get_info(int $person_id): object
 	{
-		$this->db->from('customers');
-		$this->db->join('people', 'people.person_id = customers.person_id');
-		$this->db->where('customers.person_id', $customer_id);
-		$query = $this->db->get();
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'people.person_id = customers.person_id');
+		$builder->where('customers.person_id', $person_id);
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
 			//Get empty base parent object, as $customer_id is NOT a customer
-			$person_obj = parent::get_info(-1);
+			$person_obj = parent::get_info(-1);	//TODO: NEED TO CREATE A GLOBAL CONSTANT FOR NO_PERSON IN CONFIG/CONSTANTS.PHP AND CALL IT HERE FOR CLARITY.
 
 			//Get all the fields from customer table
-			//append those fields to base parent object, we we have a complete empty object
-			foreach($this->db->list_fields('customers') as $field)
+			//append those fields to base parent object, we have a complete empty object
+			foreach($this->db->getFieldNames('customers') as $field)
 			{
 				$person_obj->$field = '';
 			}
@@ -93,31 +96,32 @@ class Customer extends Person
 		}
 	}
 
-	/*
-	Gets stats about a particular customer
-	*/
-	public function get_stats($customer_id)
+	/**
+	 * Gets stats about a particular customer
+	 */
+	public function get_stats(int $customer_id)
 	{
 		// create a temporary table to contain all the sum and average of items
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_temp') .
-			' (INDEX(sale_id)) ENGINE=MEMORY
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_temp');
+		$sql .= ' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT
 					sales.sale_id AS sale_id,
 					AVG(sales_items.discount) AS avg_discount,
 					SUM(sales_items.quantity_purchased) AS quantity
-				FROM ' . $this->db->dbprefix('sales') . ' AS sales
-				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
+				FROM ' . $this->db->prefixTable('sales') . ' AS sales
+				INNER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales.sale_id
 				WHERE sales.customer_id = ' . $this->db->escape($customer_id) . '
 				GROUP BY sale_id
-			)'
-		);
+			)';
+		$this->db->query($sql);
 
 		$totals_decimals = totals_decimals();
 		$quantity_decimals = quantity_decimals();
 
-		$this->db->select('
+		$builder = $this->db->table('sales');
+		$builder->select('
 						SUM(sales_payments.payment_amount - sales_payments.cash_refund) AS total,
 						MIN(sales_payments.payment_amount - sales_payments.cash_refund) AS min,
 						MAX(sales_payments.payment_amount - sales_payments.cash_refund) AS max,
@@ -126,38 +130,38 @@ class Customer extends Person
 						ROUND(AVG(sales_items_temp.avg_discount), $totals_decimals) AS avg_discount,
 						ROUND(SUM(sales_items_temp.quantity), $quantity_decimals) AS quantity
 						");
-		$this->db->from('sales');
-		$this->db->join('sales_payments AS sales_payments', 'sales.sale_id = sales_payments.sale_id');
-		$this->db->join('sales_items_temp AS sales_items_temp', 'sales.sale_id = sales_items_temp.sale_id');
-		$this->db->where('sales.customer_id', $customer_id);
-		$this->db->where('sales.sale_status', COMPLETED);
-		$this->db->group_by('sales.customer_id');
+		$builder->join('sales_payments AS sales_payments', 'sales.sale_id = sales_payments.sale_id');
+		$builder->join('sales_items_temp AS sales_items_temp', 'sales.sale_id = sales_items_temp.sale_id');
+		$builder->where('sales.customer_id', $customer_id);
+		$builder->where('sales.sale_status', COMPLETED);
+		$builder->groupBy('sales.customer_id');
 
-		$stat = $this->db->get()->row();
+		$stat = $builder->get()->getRow();
 
 		// drop the temporary table to contain memory consumption as it's no longer required
-		$this->db->query('DROP TEMPORARY TABLE IF EXISTS ' . $this->db->dbprefix('sales_items_temp'));
+		$sql = 'DROP TEMPORARY TABLE IF EXISTS ' . $this->db->prefixTable('sales_items_temp');
+		$this->db->query($sql);
 
 		return $stat;
 	}
 
-	/*
-	Gets information about multiple customers
-	*/
-	public function get_multiple_info($customer_ids)
+	/**
+	 * Gets information about multiple customers
+	 */
+	public function get_multiple_info(array $person_ids): ResultInterface
 	{
-		$this->db->from('customers');
-		$this->db->join('people', 'people.person_id = customers.person_id');
-		$this->db->where_in('customers.person_id', $customer_ids);
-		$this->db->order_by('last_name', 'asc');
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'people.person_id = customers.person_id');
+		$builder->whereIn('customers.person_id', $person_ids);
+		$builder->orderBy('last_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Checks if customer email exists
-	*/
-	public function check_email_exists($email, $customer_id = '')
+	/**
+	 * Checks if customer email exists
+	 */
+	public function check_email_exists(string $email, string $customer_id = ''): bool
 	{
 		// if the email is empty return like it is not existing
 		if(empty($email))
@@ -165,188 +169,198 @@ class Customer extends Person
 			return FALSE;
 		}
 
-		$this->db->from('customers');
-		$this->db->join('people', 'people.person_id = customers.person_id');
-		$this->db->where('people.email', $email);
-		$this->db->where('customers.deleted', 0);
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'people.person_id = customers.person_id');
+		$builder->where('people.email', $email);
+		$builder->where('customers.deleted', 0);
 
 		if(!empty($customer_id))
 		{
-			$this->db->where('customers.person_id !=', $customer_id);
+			$builder->where('customers.person_id !=', $customer_id);
 		}
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Inserts or updates a customer
-	*/
-	public function save_customer(&$person_data, &$customer_data, $customer_id = FALSE)
+	/**
+	 * Inserts or updates a customer
+	 */
+	public function save_customer(array &$person_data, array &$customer_data, bool $customer_id = FALSE): bool
 	{
 		$success = FALSE;
 
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		if(parent::save($person_data, $customer_id))
+		if(parent::save_value($person_data, $customer_id))
 		{
+			$builder = $this->db->table('customers');
 			if(!$customer_id || !$this->exists($customer_id))
 			{
 				$customer_data['person_id'] = $person_data['person_id'];
-				$success = $this->db->insert('customers', $customer_data);
+				$success = $builder->insert($customer_data);
 			}
 			else
 			{
-				$this->db->where('person_id', $customer_id);
-				$success = $this->db->update('customers', $customer_data);
+				$builder->where('person_id', $customer_id);
+				$success = $builder->update($customer_data);
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Updates reward points value
-	*/
-	public function update_reward_points_value($customer_id, $value)
+	/**
+	 * Updates reward points value
+	 */
+	public function update_reward_points_value(int $customer_id, int $value): void
 	{
-		$this->db->where('person_id', $customer_id);
-		$this->db->update('customers', array('points' => $value));
+		$builder = $this->db->table('customers');
+		$builder->where('person_id', $customer_id);
+		$builder->update(['points' => $value]);
 	}
 
-	/*
-	Deletes one customer
-	*/
-	public function delete($customer_id)
+	public function delete($customer_id = null, bool $purge = false): bool
 	{
 		$result = TRUE;
 
 		// if privacy enforcement is selected scramble customer data
-		if($this->config->item('enforce_privacy'))
+		if(config('OSPOS')->enforce_privacy)
 		{
-			$this->db->where('person_id', $customer_id);
+			$builder = $this->db->table('people');
+			$builder->where('person_id', $customer_id);
+			$result &= $builder->update([
+					'first_name' => $customer_id,
+					'last_name' => $customer_id,
+					'phone_number' => '',
+					'email' => '',
+					'gender' => NULL,
+					'address_1' => '',
+					'address_2' => '',
+					'city' => '',
+					'state' => '',
+					'zip' => '',
+					'country' => '',
+					'comments' => ''
+				]);
 
-			$result &= $this->db->update('people', array(
-					'first_name'	=> $customer_id,
-					'last_name'		=> $customer_id,
-					'phone_number'	=> '',
-					'email'			=> '',
-					'gender'		=> NULL,
-					'address_1'		=> '',
-					'address_2'		=> '',
-					'city'			=> '',
-					'state'			=> '',
-					'zip'			=> '',
-					'country'		=> '',
-					'comments'		=> ''
-				));
-
-			$this->db->where('person_id', $customer_id);
-
-			$result &= $this->db->update('customers', array(
-					'consent'			=> 0,
-					'company_name'		=> NULL,
-					'account_number'	=> NULL,
-					'tax_id'			=> '',
-					'taxable'			=> 0,
-					'discount'			=> 0.00,
-					'discount_type'		=> 0,
-					'package_id'		=> NULL,
-					'points'			=> NULL,
-					'sales_tax_code_id'	=> NULL,
-					'deleted'			=> 1
-				));
+			$builder = $this->db->table('customers');
+			$builder->where('person_id', $customer_id);
+			$result &= $builder->update([
+					'consent' => 0,
+					'company_name' => NULL,
+					'account_number' => NULL,
+					'tax_id' => '',
+					'taxable' => 0,
+					'discount' => 0.00,
+					'discount_type' => 0,
+					'package_id' => NULL,
+					'points' => NULL,
+					'sales_tax_code_id' => NULL,
+					'deleted' => 1
+				]);
 		}
 		else
 		{
-			$this->db->where('person_id', $customer_id);
+			$builder = $this->db->table('customers');
+			$builder->where('person_id', $customer_id);
 
-			$result &= $this->db->update('customers', array('deleted' => 1));
+			$result &= $builder->update(['deleted' => 1]);
 		}
 
 		return $result;
 	}
 
-	/*
-	Deletes a list of customers
-	*/
-	public function delete_list($customer_ids)
+	/**
+	 * Deletes a list of customers
+	 */
+	public function delete_list(array $person_ids): bool
 	{
-		$this->db->where_in('person_id', $customer_ids);
+		$builder = $this->db->table('customers');
+		$builder->whereIn('person_id', $person_ids);
 
-		return $this->db->update('customers', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
- 	/*
-	Get search suggestions to find customers
-	*/
-	public function get_search_suggestions($search, $unique = TRUE, $limit = 25)
+ 	/**
+	 * Get search suggestions to find customers
+	 */
+	public function get_search_suggestions(string $search, int $limit = 25, bool $unique = true): array
 	{
-		$suggestions = array();
+		$suggestions = [];
+
+		$builder = $this->db->table('customers');
+		$builder->join('people', 'customers.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
 
-		$this->db->from('customers');
-		$this->db->join('people', 'customers.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
 			if($unique)
 			{
-				$this->db->or_like('email', $search);
-				$this->db->or_like('phone_number', $search);
-				$this->db->or_like('company_name', $search);
+				$builder->orLike('email', $search);
+				$builder->orLike('phone_number', $search);
+				$builder->orLike('company_name', $search);
 			}
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
-		$this->db->order_by('last_name', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+		$builder->orderBy('last_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->first_name . ' ' . $row->last_name . (!empty($row->company_name) ? ' [' . $row->company_name . ']' : ''). (!empty($row->phone_number) ? ' [' . $row->phone_number . ']' : ''));
+			$suggestions[] = [
+				'value' => $row->person_id,
+				'label' => $row->first_name . ' ' . $row->last_name . (!empty($row->company_name) ? ' [' . $row->company_name . ']' : ''). (!empty($row->phone_number) ? ' [' . $row->phone_number . ']' : '')
+			];
 		}
 
 		if(!$unique)
 		{
-			$this->db->from('customers');
-			$this->db->join('people', 'customers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('email', $search);
-			$this->db->order_by('email', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('customers');
+			$builder->join('people', 'customers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('email', $search);
+			$builder->orderBy('email', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->email);
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->email];
 			}
 
-			$this->db->from('customers');
-			$this->db->join('people', 'customers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('phone_number', $search);
-			$this->db->order_by('phone_number', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('customers');
+			$builder->join('people', 'customers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('phone_number', $search);
+			$builder->orderBy('phone_number', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->phone_number);
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->phone_number];
 			}
 
-			$this->db->from('customers');
-			$this->db->join('people', 'customers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('account_number', $search);
-			$this->db->order_by('account_number', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('customers');
+			$builder->join('people', 'customers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('account_number', $search);
+			$builder->orderBy('account_number', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->account_number);
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->account_number];
 			}
-			$this->db->from('customers');
-			$this->db->join('people', 'customers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('company_name', $search);
-			$this->db->order_by('company_name', 'asc');
-			foreach($this->db->get()->result() as $row)
+
+			$builder = $this->db->table('customers');
+			$builder->join('people', 'customers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('company_name', $search);
+			$builder->orderBy('company_name', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->company_name);
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->company_name];
 			}
 		}
 
@@ -359,52 +373,52 @@ class Customer extends Person
 		return $suggestions;
 	}
 
- 	/*
-	Gets rows
-	*/
-	public function get_found_rows($search)
+ 	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'last_name', 'asc', TRUE);
 	}
 
-	/*
-	Performs a search on customers
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'last_name', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Performs a search on customers
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'last_name', string $order = 'asc', bool $count_only = FALSE)
 	{
+		$builder = $this->db->table('customers AS customers');
+
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only)
 		{
-			$this->db->select('COUNT(customers.person_id) as count');
+			$builder->select('COUNT(customers.person_id) as count');
 		}
 
-		$this->db->from('customers AS customers');
-		$this->db->join('people', 'customers.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('email', $search);
-			$this->db->or_like('phone_number', $search);
-			$this->db->or_like('account_number', $search);
-			$this->db->or_like('company_name', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
+		$builder->join('people', 'customers.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('email', $search);
+			$builder->orLike('phone_number', $search);
+			$builder->orLike('account_number', $search);
+			$builder->orLike('company_name', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);	//TODO: Duplicated code.
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
 
 		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Customer_rewards.php b/app/Models/Customer_rewards.php
index 60c69a793..3ebe5e651 100644
--- a/app/Models/Customer_rewards.php
+++ b/app/Models/Customer_rewards.php
@@ -1,65 +1,75 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
 
 /**
  * Customer_rewards class
  */
-
-class Customer_rewards extends CI_Model
+class Customer_rewards extends Model
 {
-	public function exists($package_id)
+	public function exists(int $package_id): bool
 	{
-		$this->db->from('customers_packages');
-		$this->db->where('package_id', $package_id);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('package_id', $package_id);
 
-		return ($this->db->get()->num_rows() >= 1);
+		return ($builder->get()->getNumRows() >= 1);
 	}
 
-	public function save($package_data, $package_id)
+	public function save_value(array $package_data, int $package_id): bool
 	{
-		$package_data_to_save = array('package_name' => $package_data['package_name'], 'deleted' => 0, 'points_percent' => $package_data['points_percent']);
+		$package_data_to_save = [
+			'package_name' => $package_data['package_name'],
+			'deleted' => 0,
+			'points_percent' => $package_data['points_percent']
+		];
 
 		if(!$this->exists($package_id))
 		{
-			return $this->db->insert('customers_packages', $package_data_to_save);
+			$builder = $this->db->table('customers_packages');
+			return $builder->insert($package_data_to_save);
 		}
 
-		$this->db->where('package_id', $package_id);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('package_id', $package_id);
 
-		return $this->db->update('customers_packages', $package_data_to_save);
+		return $builder->update($package_data_to_save);
 	}
 
-	public function get_name($package_id)
+	public function get_name(int $package_id): string
 	{
-		$this->db->from('customers_packages');
-		$this->db->where('package_id', $package_id);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('package_id', $package_id);
 
-		return $this->db->get()->row()->package_name;
+		return $builder->get()->getRow()->package_name;
 	}
 
-	public function get_points_percent($package_id)
+	public function get_points_percent(int $package_id): float
 	{
-		$this->db->from('customers_packages');
-		$this->db->where('package_id', $package_id);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('package_id', $package_id);
 
-		return $this->db->get()->row()->points_percent;
+		return $builder->get()->getRow()->points_percent;
 	}
 
-	public function get_all()
+	public function get_all(): ResultInterface
 	{
-		$this->db->from('customers_packages');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('deleted', 0);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
-	Deletes one reward package
+	* Deletes one reward package
 	*/
-	public function delete($package_id)
+	public function delete($package_id = null, bool $purge = false): bool
 	{
-		$this->db->where('package_id', $package_id);
+		$builder = $this->db->table('customers_packages');
+		$builder->where('package_id', $package_id);
 
-		return $this->db->update('customers_packages', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 }
-?>
diff --git a/app/Models/Dinner_table.php b/app/Models/Dinner_table.php
index fa55b3573..bb2dff55e 100644
--- a/app/Models/Dinner_table.php
+++ b/app/Models/Dinner_table.php
@@ -1,46 +1,51 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
 
 /**
  * Dinner_table class
  */
-
-class Dinner_table extends CI_Model
+class Dinner_table extends Model
 {
-	public function exists($dinner_table_id)
+	public function exists(int $dinner_table_id): bool
 	{
-		$this->db->from('dinner_tables');
-		$this->db->where('dinner_table_id', $dinner_table_id);
+		$builder = $this->db->table('dinner_tables');
+		$builder->where('dinner_table_id', $dinner_table_id);
 
-		return ($this->db->get()->num_rows() >= 1);
+		return ($builder->get()->getNumRows() >= 1);
 	}
 
-	public function save($table_data, $dinner_table_id)
+	public function save_value(array $table_data, int $dinner_table_id): bool
 	{
-		$table_data_to_save = array('name' => $table_data['name'], 'deleted' => 0);
+		$table_data_to_save = ['name' => $table_data['name'], 'deleted' => 0];
 
+		$builder = $this->db->table('dinner_tables');
 		if(!$this->exists($dinner_table_id))
 		{
-			return $this->db->insert('dinner_tables', $table_data_to_save);
+			return $builder->insert($table_data_to_save);
 		}
 
-		$this->db->where('dinner_table_id', $dinner_table_id);
+		$builder->where('dinner_table_id', $dinner_table_id);
 
-		return $this->db->update('dinner_tables', $table_data_to_save);
+		return $builder->update($table_data_to_save);
 	}
 
 	/**
-	Get empty tables
-	*/
-	public function get_empty_tables($current_dinner_table_id)
+	 * Get empty tables
+	 */
+	public function get_empty_tables(int $current_dinner_table_id): array
 	{
-		$this->db->from('dinner_tables');
-		$this->db->where('status', 0);
-		$this->db->or_where('dinner_table_id', $current_dinner_table_id);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('dinner_tables');
+		$builder->where('status', 0);
+		$builder->orWhere('dinner_table_id', $current_dinner_table_id);
+		$builder->where('deleted', 0);
 
-		$empty_tables = $this->db->get()->result_array();
+		$empty_tables = $builder->get()->getResultArray();
 
-		$empty_tables_array = array();
+		$empty_tables_array = [];	//TODO: Variable names should not contain the name of the datatype.
 		foreach($empty_tables as $empty_table)
 		{
 			$empty_tables_array[$empty_table['dinner_table_id']] = $empty_table['name'];
@@ -49,64 +54,83 @@ class Dinner_table extends CI_Model
 		return $empty_tables_array;
 	}
 
-	public function get_name($dinner_table_id)
+	public function get_name(int $dinner_table_id): string
 	{
 		if(empty($dinner_table_id))
 		{
 			return '';
 		}
-		else
+		else	//TODO: No need for this else statement.  Just put it's contents outside of the else since the if has a return in it.
 		{
-			$this->db->from('dinner_tables');
-			$this->db->where('dinner_table_id', $dinner_table_id);
+			$builder = $this->db->table('dinner_tables');
+			$builder->where('dinner_table_id', $dinner_table_id);
 
-			return $this->db->get()->row()->name;
+			return $builder->get()->getRow()->name;
 		}
 	}
 
-	public function is_occupied($dinner_table_id)
+	public function is_occupied(int $dinner_table_id): bool
 	{
 		if(empty($dinner_table_id))
 		{
 			return FALSE;
 		}
-		else
+		else	//TODO: No need for this else statement.  Just put it's contents outside of the else since the if has a return in it.
 		{
-			$this->db->from('dinner_tables');
-			$this->db->where('dinner_table_id', $dinner_table_id);
+			$builder = $this->db->table('dinner_tables');
+			$builder->where('dinner_table_id', $dinner_table_id);
 
-			return ($this->db->get()->row()->status == 1);
+			return ($builder->get()->getRow()->status == 1);	//TODO: === ?
 		}
 	}
 
-	public function get_all()
+	public function get_all(): ResultInterface
 	{
-		$this->db->from('dinner_tables');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('dinner_tables');
+		$builder->where('deleted', 0);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
-	Deletes one table
-	*/
-	public function delete($dinner_table_id)
+	 * Deletes one dinner table
+	 */
+	public function delete($dinner_table_id = null, bool $purge = false): bool
 	{
-		$this->db->where('dinner_table_id', $dinner_table_id);
+		$builder = $this->db->table('dinner_tables');
+		$builder->where('dinner_table_id', $dinner_table_id);
 
-		return $this->db->update('dinner_tables', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
 	/**
 	 * Occupy table
 	 * Ignore the Delivery and Takeaway "tables".  They should never be occupied.
 	 */
-	public function occupy($dinner_table_id)
+	public function occupy(int $dinner_table_id): bool
 	{
 		if($dinner_table_id > 2 )
 		{
-			$this->db->where('dinner_table_id', $dinner_table_id);
-			return $this->db->update('dinner_tables', array('status' => 1));
+			$builder = $this->db->table('dinner_tables');
+			$builder->where('dinner_table_id', $dinner_table_id);
+			return $builder->update(['status' => 1]);
+		}
+		else//TODO: THIS ELSE STATEMENT ISN'T NEEDED.  JUST DO THE IF AND THEN RETURN TRUE AFTER IT.
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Release table
+	 */
+	public function release(int $dinner_table_id): bool
+	{
+		if($dinner_table_id > 2 )
+		{
+			$builder = $this->db->table('dinner_tables');
+			$builder->where('dinner_table_id', $dinner_table_id);
+			return $builder->update(['status' => 0]);
 		}
 		else
 		{
@@ -115,28 +139,10 @@ class Dinner_table extends CI_Model
 	}
 
 	/**
-	Release table
+	 * Swap tables
 	 */
-	public function release($dinner_table_id)
-	{
-		if($dinner_table_id > 2 )
-		{
-			$this->db->where('dinner_table_id', $dinner_table_id);
-			return $this->db->update('dinner_tables', array('status' => 0));
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
-	Swap tables
-	 */
-	public function swap_tables($release_dinner_table_id, $occupy_dinner_table_id)
+	public function swap_tables(int $release_dinner_table_id, int $occupy_dinner_table_id): bool
 	{
 		return $this->release($release_dinner_table_id) && $this->occupy($occupy_dinner_table_id);
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Employee.php b/app/Models/Employee.php
index 69e79e5b9..af37e0f06 100644
--- a/app/Models/Employee.php
+++ b/app/Models/Employee.php
@@ -1,80 +1,93 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Session\Session;
 
 /**
  * Employee class
+ *
+ * @property session session
+ *
  */
-
 class Employee extends Person
 {
-	/*
-	Determines if a given person_id is an employee
-	*/
-	public function exists($person_id)
+	public function __construct()
 	{
-		$this->db->from('employees');
-		$this->db->join('people', 'people.person_id = employees.person_id');
-		$this->db->where('employees.person_id', $person_id);
-
-		return ($this->db->get()->num_rows() == 1);
+		parent::__construct();
+		$this->session = session();
 	}
 
-	public function username_exists($employee_id, $username)
+	/**
+	 * Determines if a given person_id is an employee
+	 */
+	public function exists(int $person_id): bool
 	{
-		$this->db->from('employees');
-		$this->db->where('employees.username', $username);
-		$this->db->where('employees.person_id <>', $employee_id);
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'people.person_id = employees.person_id');
+		$builder->where('employees.person_id', $person_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	public function username_exists(int $employee_id, string $username): bool
 	{
-		$this->db->from('employees');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('employees');
+		$builder->where('employees.username', $username);
+		$builder->where('employees.person_id <>', $employee_id);
 
-		return $this->db->count_all_results();
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Returns all the employees
-	*/
-	public function get_all($limit = 10000, $offset = 0)
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('employees');
-		$this->db->where('deleted', 0);
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		$this->db->order_by('last_name', 'asc');
-		$this->db->limit($limit);
-		$this->db->offset($offset);
+		$builder = $this->db->table('employees');
+		$builder->where('deleted', 0);
 
-		return $this->db->get();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Gets information about a particular employee
-	*/
-	public function get_info($employee_id)
+	/**
+	 * Returns all the employees
+	 */
+	public function get_all(int $limit = 10000, int $offset = 0): ResultInterface
 	{
-		$this->db->from('employees');
-		$this->db->join('people', 'people.person_id = employees.person_id');
-		$this->db->where('employees.person_id', $employee_id);
-		$query = $this->db->get();
+		$builder = $this->db->table('employees');
+		$builder->where('deleted', 0);
+		$builder->join('people', 'employees.person_id = people.person_id');
+		$builder->orderBy('last_name', 'asc');
+		$builder->limit($limit);
+		$builder->offset($offset);
 
-		if($query->num_rows() == 1)
+		return $builder->get();
+	}
+
+	/**
+	 * Gets information about a particular employee
+	 */
+	public function get_info(int $person_id): object
+	{
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'people.person_id = employees.person_id');
+		$builder->where('employees.person_id', $person_id);
+		$query = $builder->get();
+
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
-		else
+		else	//TODO: No need for this else statement.  Just put it's contents outside of the else since the if has a return in it.
 		{
 			//Get empty base parent object, as $employee_id is NOT an employee
-			$person_obj = parent::get_info(-1);
+			$person_obj = parent::get_info(-1);	//TODO: Replace -1 with a constant
 
 			//Get all the fields from employee table
-			//append those fields to base parent object, we we have a complete empty object
-			foreach($this->db->list_fields('employees') as $field)
+			//append those fields to base parent object, we have a complete empty object
+			foreach($this->db->getFieldNames('employees') as $field)
 			{
 				$person_obj->$field = '';
 			}
@@ -83,185 +96,212 @@ class Employee extends Person
 		}
 	}
 
-	/*
-	Gets information about multiple employees
-	*/
-	public function get_multiple_info($employee_ids)
+	/**
+	 * Gets information about multiple employees
+	 */
+	public function get_multiple_info(array $person_ids): ResultInterface
 	{
-		$this->db->from('employees');
-		$this->db->join('people', 'people.person_id = employees.person_id');
-		$this->db->where_in('employees.person_id', $employee_ids);
-		$this->db->order_by('last_name', 'asc');
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'people.person_id = employees.person_id');
+		$builder->whereIn('employees.person_id', $person_ids);
+		$builder->orderBy('last_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Inserts or updates an employee
-	*/
-	public function save_employee(&$person_data, &$employee_data, &$grants_data, $employee_id = FALSE)
+	/**
+	 * Inserts or updates an employee
+	 */
+	public function save_employee(array &$person_data, array &$employee_data, array &$grants_data, bool $employee_id = FALSE): bool
 	{
 		$success = FALSE;
 
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		if(ENVIRONMENT != 'testing' && parent::save($person_data, $employee_id))
+		if(ENVIRONMENT != 'testing' && parent::save_value($person_data, $employee_id))
 		{
+			$builder = $this->db->table('employees');
 			if(!$employee_id || !$this->exists($employee_id))
 			{
 				$employee_data['person_id'] = $employee_id = $person_data['person_id'];
-				$success = $this->db->insert('employees', $employee_data);
+				$success = $builder->insert($employee_data);
 			}
 			else
 			{
-				$this->db->where('person_id', $employee_id);
-				$success = $this->db->update('employees', $employee_data);
+				$builder->where('person_id', $employee_id);
+				$success = $builder->update($employee_data);
 			}
 
 			//We have either inserted or updated a new employee, now lets set permissions.
 			if($success)
 			{
 				//First lets clear out any grants the employee currently has.
-				$success = $this->db->delete('grants', array('person_id' => $employee_id));
+				$builder = $this->db->table('grants');
+				$success = $builder->delete(['person_id' => $employee_id]);
 
 				//Now insert the new grants
 				if($success)
 				{
 					foreach($grants_data as $grant)
 					{
-						$success = $this->db->insert('grants', array('permission_id' => $grant['permission_id'], 'person_id' => $employee_id, 'menu_group' => $grant['menu_group']));
+						$data = [
+							'permission_id' => $grant['permission_id'],
+							'person_id' => $employee_id,
+							'menu_group' => $grant['menu_group']
+						];
+
+						$builder = $this->db->table('grants');
+						$success = $builder->insert($data);
 					}
 				}
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Deletes one employee
-	*/
-	public function delete($employee_id)
+	/**
+	 * Deletes one employee
+	 */
+	public function delete($employee_id = null, bool $purge = false): bool
 	{
 		$success = FALSE;
 
-		//Don't let employees delete theirself
+		//Don't let employees delete themselves
 		if($employee_id == $this->get_logged_in_employee_info()->person_id)
 		{
 			return FALSE;
 		}
 
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		//Delete permissions
-		if($this->db->delete('grants', array('person_id' => $employee_id)))
+		$builder = $this->db->table('grants');
+
+		if($builder->delete(['person_id' => $employee_id]))
 		{
-			$this->db->where('person_id', $employee_id);
-			$success = $this->db->update('employees', array('deleted' => 1));
+			$builder = $this->db->table('employees');
+			$builder->where('person_id', $employee_id);
+			$success = $builder->update(['deleted' => 1]);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
 		return $success;
 	}
 
-	/*
-	Deletes a list of employees
-	*/
-	public function delete_list($employee_ids)
+	/**
+	 * Deletes a list of employees
+	 */
+	public function delete_list(array $person_ids): bool
 	{
 		$success = FALSE;
 
-		//Don't let employees delete theirself
-		if(in_array($this->get_logged_in_employee_info()->person_id, $employee_ids))
+		//Don't let employees delete themselves
+		if(in_array($this->get_logged_in_employee_info()->person_id, $person_ids))
 		{
 			return FALSE;
 		}
 
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$this->db->where_in('person_id', $employee_ids);
+		$builder = $this->db->table('grants');
+		$builder->whereIn('person_id', $person_ids);
 		//Delete permissions
-		if($this->db->delete('grants'))
+		if($builder->delete())
 		{
 			//delete from employee table
-			$this->db->where_in('person_id', $employee_ids);
-			$success = $this->db->update('employees', array('deleted' => 1));
+			$builder = $this->db->table('employees');
+			$builder->whereIn('person_id', $person_ids);
+			$success = $builder->update(['deleted' => 1]);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
+		$success &= $this->db->transStatus();
 
 		return $success;
  	}
 
-	/*
-	Get search suggestions to find employees
-	*/
-	public function get_search_suggestions($search, $include_deleted = FALSE, $limit = 5)
+	/**
+	 * Get search suggestions to find employees
+	 */
+	public function get_search_suggestions(string $search, int $limit = 25, bool $unique = FALSE): array
 	{
-		$suggestions = array();
+		$suggestions = [];
 
-		$this->db->from('employees');
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		if($include_deleted == FALSE)
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'employees.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+		$builder->groupEnd();
+
+		if($unique == FALSE)
 		{
-			$this->db->where('deleted', 0);
-		}
-		$this->db->order_by('last_name', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->first_name.' '.$row->last_name);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->from('employees');
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		if($include_deleted == FALSE)
+		$builder->orderBy('last_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$this->db->where('deleted', 0);
-		}
-		$this->db->like('email', $search);
-		$this->db->order_by('email', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->email);
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->first_name.' '.$row->last_name];
 		}
 
-		$this->db->from('employees');
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		if($include_deleted == FALSE)
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'employees.person_id = people.person_id');
+
+		if(!$unique)
 		{
-			$this->db->where('deleted', 0);
-		}
-		$this->db->like('username', $search);
-		$this->db->order_by('username', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->username);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->from('employees');
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		if($include_deleted == FALSE)
+		$builder->like('email', $search);
+		$builder->orderBy('email', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$this->db->where('deleted', 0);
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->email];
 		}
-		$this->db->like('phone_number', $search);
-		$this->db->order_by('phone_number', 'asc');
-		foreach($this->db->get()->result() as $row)
+
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'employees.person_id = people.person_id');
+
+		if(!$unique)
 		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->phone_number);
+			$builder->where('deleted', 0);
+		}
+
+		$builder->like('username', $search);
+		$builder->orderBy('username', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
+		{
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->username];
+		}
+
+		$builder = $this->db->table('employees');
+		$builder->join('people', 'employees.person_id = people.person_id');
+
+		if(!$unique)
+		{
+			$builder->where('deleted', 0);
+		}
+
+		$builder->like('phone_number', $search);
+		$builder->orderBy('phone_number', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
+		{
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->phone_number];
 		}
 
 		//only return $limit suggestions
@@ -273,125 +313,126 @@ class Employee extends Person
 		return $suggestions;
 	}
 
- 	/*
-	Gets rows
-	*/
-	public function get_found_rows($search)
+ 	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'last_name', 'asc', TRUE);
 	}
 
-	/*
-	Performs a search on employees
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'last_name', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Performs a search on employees
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'last_name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(employees.person_id) as count');
-		}
-
-		$this->db->from('employees AS employees');
-		$this->db->join('people', 'employees.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('email', $search);
-			$this->db->or_like('phone_number', $search);
-			$this->db->or_like('username', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('employees AS employees');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only)
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(employees.person_id) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->join('people', 'employees.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('email', $search);
+			$builder->orLike('phone_number', $search);
+			$builder->orLike('username', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+
+		// get_found_rows case
+		if($count_only)
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Attempts to login employee and set session. Returns boolean based on outcome.
-	*/
-	public function login($username, $password)
+	/**
+	 * Attempts to log in employee and set session. Returns boolean based on outcome.
+	 */
+	public function login(string $username, string $password): bool
 	{
-		$query = $this->db->get_where('employees', array('username' => $username, 'deleted' => 0), 1);
+		$builder = $this->db->table('employees');
+		$query = $builder->getWhere(['username' => $username, 'deleted' => 0], 1);
 
-		if($query->num_rows() === 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			$row = $query->row();
+			$row = $query->getRow();
 
 			// compare passwords depending on the hash version
-			if($row->hash_version === '1' && $row->password === md5($password))
+			if($row->hash_version == 1 && $row->password == md5($password))	//TODO: === ?
 			{
-				$this->db->where('person_id', $row->person_id);
-				$this->session->set_userdata('person_id', $row->person_id);
+				$builder->where('person_id', $row->person_id);
+				$this->session->set('person_id', $row->person_id);
 				$password_hash = password_hash($password, PASSWORD_DEFAULT);
 
-				return $this->db->update('employees', array('hash_version' => 2, 'password' => $password_hash));
+				return $builder->update(['hash_version' => 2, 'password' => $password_hash]);
 			}
-			elseif($row->hash_version === '2' && password_verify($password, $row->password))
+			elseif($row->hash_version == 2 && password_verify($password, $row->password))	//TODO: === ?
 			{
-				$this->session->set_userdata('person_id', $row->person_id);
+				$this->session->set('person_id', $row->person_id);
 
 				return TRUE;
 			}
-
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Logs out a user by destorying all session data and redirect to login
-	*/
-	public function logout()
+	/**
+	 * Logs out a user by destroying all session data and redirect to log in
+	 */
+	public function logout(): void
 	{
-		$this->session->sess_destroy();
+		$this->session->destroy();
 
 		redirect('login');
 	}
 
-	/*
-	Determins if a employee is logged in
-	*/
-	public function is_logged_in()
+	/**
+	 * Determines if an employee is logged in
+	 */
+	public function is_logged_in(): bool
 	{
-		return ($this->session->userdata('person_id') != FALSE);
+		return ($this->session->get('person_id') != FALSE);
 	}
 
-	/*
-	Gets information about the currently logged in employee.
-	*/
+	/**
+	 * Gets information about the currently logged in employee.
+	 */
 	public function get_logged_in_employee_info()
 	{
 		if($this->is_logged_in())
 		{
-			return $this->get_info($this->session->userdata('person_id'));
+			return $this->get_info($this->session->get('person_id'));
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Determines whether the employee has access to at least one submodule
-	*/
-	public function has_module_grant($permission_id, $person_id)
+	/**
+	 * Determines whether the employee has access to at least one submodule
+	 */
+	public function has_module_grant(string $permission_id, int $person_id): bool
 	{
-		$this->db->from('grants');
-		$this->db->like('permission_id', $permission_id, 'after');
-		$this->db->where('person_id', $person_id);
-		$result_count = $this->db->get()->num_rows();
+		$builder = $this->db->table('grants');
+		$builder->like('permission_id', $permission_id, 'after');
+		$builder->where('person_id', $person_id);
+		$result_count = $builder->get()->getNumRows();
 
 		if($result_count != 1)
 		{
@@ -401,21 +442,21 @@ class Employee extends Person
 		return $this->has_subpermissions($permission_id);
 	}
 
- 	/*
-	Checks permissions
-	*/
-	public function has_subpermissions($permission_id)
+ 	/**
+	 * Checks permissions
+	 */
+	public function has_subpermissions(string $permission_id): bool
 	{
-		$this->db->from('permissions');
-		$this->db->like('permission_id', $permission_id.'_', 'after');
+		$builder = $this->db->table('permissions');
+		$builder->like('permission_id', $permission_id.'_', 'after');
 
-		return ($this->db->get()->num_rows() == 0);
+		return ($builder->get()->getNumRows() == 0);	//TODO: ===
 	}
 
 	/**
 	 * Determines whether the employee specified employee has access the specific module.
 	 */
-	public function has_grant($permission_id, $person_id)
+	public function has_grant(string $permission_id, int $person_id): bool
 	{
 		//if no module_id is null, allow access
 		if($permission_id == NULL)
@@ -423,22 +464,23 @@ class Employee extends Person
 			return TRUE;
 		}
 
-		$query = $this->db->get_where('grants', array('person_id' => $person_id, 'permission_id' => $permission_id), 1);
+		$builder = $this->db->table('grants');
+		$query = $builder->getWhere(['person_id' => $person_id, 'permission_id' => $permission_id], 1);
 
-		return ($query->num_rows() == 1);
+		return ($query->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Returns the menu group designation that this module is to appear in
 	 */
-	public function get_menu_group($permission_id, $person_id)
+	public function get_menu_group(string $permission_id, int $person_id): string
 	{
-		$this->db->select('menu_group');
-		$this->db->from('grants');
-		$this->db->where('permission_id', $permission_id);
-		$this->db->where('person_id', $person_id);
+		$builder = $this->db->table('grants');
+		$builder->select('menu_group');
+		$builder->where('permission_id', $permission_id);
+		$builder->where('person_id', $person_id);
 
-		$row = $this->db->get()->row();
+		$row = $builder->get()->getRow();
 
 		// If no grants are assigned yet then set the default to 'home'
 		if($row == NULL)
@@ -451,60 +493,58 @@ class Employee extends Person
 		}
 	}
 
-	/*
-	Gets employee permission grants
-	*/
-	public function get_employee_grants($person_id)
+	/**
+	 * Gets employee permission grants
+	 */
+	public function get_employee_grants(int $person_id): array
 	{
-		$this->db->from('grants');
-		$this->db->where('person_id', $person_id);
+		$builder = $this->db->table('grants');
+		$builder->where('person_id', $person_id);
 
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	/*
-	Attempts to login employee and set session. Returns boolean based on outcome.
-	*/
-	public function check_password($username, $password)
+	/**
+	 * Attempts to log in employee and set session. Returns boolean based on outcome.
+	 */
+	public function check_password(string $username, string $password): bool
 	{
-		$query = $this->db->get_where('employees', array('username' => $username, 'deleted' => 0), 1);
+		$builder = $this->db->table('employees');
+		$query = $builder->getWhere(['username' => $username, 'deleted' => 0], 1);
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			$row = $query->row();
+			$row = $query->getRow();
 
-			// compare passwords
 			if(password_verify($password, $row->password))
 			{
 				return TRUE;
 			}
-
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Change password for the employee
-	*/
-	public function change_password($employee_data, $employee_id = FALSE)
+	/**
+	 * Change password for the employee
+	 */
+	public function change_password(array $employee_data, $employee_id = FALSE): bool
 	{
 		$success = FALSE;
 
 		if(ENVIRONMENT != 'testing')
 		{
-			//Run these queries as a transaction, we want to make sure we do all or nothing
-			$this->db->trans_start();
+			$this->db->transStart();
 
-			$this->db->where('person_id', $employee_id);
-			$success = $this->db->update('employees', $employee_data);
+			$builder = $this->db->table('employees');
+			$builder->where('person_id', $employee_id);
+			$success = $builder->update($employee_data);
 
-			$this->db->trans_complete();
+			$this->db->transComplete();
 
-			$success &= $this->db->trans_status();
+			$success &= $this->db->transStatus();
 		}
 
 		return $success;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Enums/Rounding_mode.php b/app/Models/Enums/Rounding_mode.php
index 65fe7414c..0b2e2901f 100644
--- a/app/Models/Enums/Rounding_mode.php
+++ b/app/Models/Enums/Rounding_mode.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace App\Models\Enums;
+
+use ReflectionClass;
+
 class Rounding_mode
 {
-	const HALF_UP = PHP_ROUND_HALF_UP;
+	const HALF_UP = PHP_ROUND_HALF_UP;  //TODO: These constants need to be moved to constants.php
 	const HALF_DOWN = PHP_ROUND_HALF_DOWN;
 	const HALF_EVEN = PHP_ROUND_HALF_EVEN;
 	const HALF_ODD = PHP_ROUND_HALF_ODD;
@@ -10,38 +14,36 @@ class Rounding_mode
 	const ROUND_DOWN = 6;
 	const HALF_FIVE = 7;
 
-	public static function get_rounding_options()
+	public function __construct()
+	{
+		helper('language');
+	}
+
+	public static function get_rounding_options(): array
 	{
-		$CI =& get_instance();
-		$CI->load->helper('language');
 		$class = new ReflectionClass(__CLASS__);
-		$result = array();
+		$result = [];
 
 		foreach($class->getConstants() as $key => $value)
 		{
-			$result[$value] = lang(strtolower('ENUM_'. $key));
+			$result[$value] = lang('Enum.' . strtolower($key));
 		}
 
 		return $result;
 	}
 
-	public static function get_rounding_code_name($code)
+	public static function get_rounding_code_name(int $code): string
 	{
-		$CI =& get_instance();
-		$CI->load->helper('language');
-
 		if(empty($code))
 		{
-			return lang('common_unknown');
+			return lang('Common.unknown');
 		}
 
 		return Rounding_mode::get_rounding_options()[$code];
 	}
 
-	public static function get_html_rounding_options()
+	public static function get_html_rounding_options(): string
 	{
-		$CI =& get_instance();
-		$CI->load->helper('language');
 		$x = '';
 
 		foreach(Rounding_mode::get_rounding_options() as $option => $label)
@@ -52,16 +54,16 @@ class Rounding_mode
 		return $x;
 	}
 
-	public static function round_number($rounding_mode, $amount, $decimals)
-	{
+	public static function round_number(int $rounding_mode, float $amount, int $decimals): string
+	{//TODO: this needs to be be replaced with a switch statement
 		if($rounding_mode == Rounding_mode::ROUND_UP)
 		{
-			$fig = pow(10,$decimals);
+			$fig = pow(10, $decimals);
 			$rounded_total = (ceil($fig*$amount) + ceil($fig*$amount - ceil($fig*$amount)))/$fig;
 		}
 		elseif($rounding_mode == Rounding_mode::ROUND_DOWN)
 		{
-			$fig = pow(10,$decimals);
+			$fig = pow(10, $decimals);
 			$rounded_total = (floor($fig*$amount) + floor($fig*$amount - floor($fig*$amount)))/$fig;
 		}
 		elseif($rounding_mode == Rounding_mode::HALF_FIVE)
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 035e256c5..af6a7e2a1 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -1,74 +1,87 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Expense class
+ *
+ * @property employee employee
+ * @property expense_category expense_category
  */
-
-class Expense extends CI_Model
+class Expense extends Model
 {
-	/*
-	Determines if a given Expense_id is an Expense
-	*/
-	public function exists($expense_id)
+	/**
+	 * Determines if a given Expense_id is an Expense
+	 */
+	public function exists(int $expense_id): bool
 	{
-		$this->db->from('expenses');
-		$this->db->where('expense_id', $expense_id);
+		$builder = $this->db->table('expenses');
+		$builder->where('expense_id', $expense_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets category info
-	*/
-	public function get_expense_category($expense_id)
+	/**
+	 * Gets category info
+	 */
+	public function get_expense_category(int $expense_id): object	//TODO: This function is never called in the code
 	{
-		$this->db->from('expenses');
-		$this->db->where('expense_id', $expense_id);
+		$builder = $this->db->table('expenses');
+		$builder->where('expense_id', $expense_id);
 
-		return $this->Expense_category->get_info($this->db->get()->row()->expense_category_id);
+		$expense_category = model(Expense_category::class);
+		return $expense_category->get_info($builder->get()->getRow()->expense_category_id);	//TODO: refactor out the nested function call.
 	}
 
-	/*
-	Gets employee info
-	*/
-	public function get_employee($expense_id)
+	/**
+	 * Gets employee info
+	 */
+	public function get_employee(int $expense_id): object	//TODO: This function is never called in the code
 	{
-		$this->db->from('expenses');
-		$this->db->where('expense_id', $expense_id);
+		$builder = $this->db->table('expenses');
+		$builder->where('expense_id', $expense_id);
 
-		return $this->Employee->get_info($this->db->get()->row()->employee_id);
+		$employee = model(Employee::class);
+
+		return $employee->get_info($builder->get()->getRow()->employee_id);	//TODO: refactor out the nested function call.
 	}
 
-	public function get_multiple_info($expense_ids)
+	public function get_multiple_info(array $expense_ids): ResultInterface
 	{
-		$this->db->from('expenses');
-		$this->db->where_in('expenses.expense_id', $expense_ids);
-		$this->db->order_by('expense_id', 'asc');
+		$builder = $this->db->table('expenses');
+		$builder->whereIn('expenses.expense_id', $expense_ids);
+		$builder->orderBy('expense_id', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets rows
-	*/
-	public function get_found_rows($search, $filters)
+	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search, array $filters): ResultInterface
 	{
 		return $this->search($search, $filters, 0, 0, 'expense_id', 'asc', TRUE);
 	}
 
-	/*
-	Searches expenses
-	*/
-	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'expense_id', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Searches expenses
+	 */
+	public function search(string $search, array $filters, int $rows = 0, int $limit_from = 0, string $sort = 'expense_id', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
+		$builder = $this->db->table('expenses AS expenses');
+
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			$this->db->select('COUNT(DISTINCT expenses.expense_id) as count');
+			$builder->select('COUNT(DISTINCT expenses.expense_id) as count');
 		}
 		else
 		{
-			$this->db->select('
+			$builder->select('
 				expenses.expense_id,
 				MAX(expenses.date) AS date,
 				MAX(suppliers.company_name) AS supplier_name,
@@ -83,84 +96,88 @@ class Expense extends CI_Model
 			');
 		}
 
-		$this->db->from('expenses AS expenses');
-		$this->db->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
-		$this->db->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
-		$this->db->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'LEFT');
+		$builder->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
+		$builder->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
+		$builder->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'LEFT');
 
-		$this->db->group_start();
-			$this->db->like('employees.first_name', $search);
-			$this->db->or_like('expenses.date', $search);
-			$this->db->or_like('employees.last_name', $search);
-			$this->db->or_like('expenses.payment_type', $search);
-			$this->db->or_like('expenses.amount', $search);
-			$this->db->or_like('expense_categories.category_name', $search);
-			$this->db->or_like('CONCAT(employees.first_name, " ", employees.last_name)', $search);
-		$this->db->group_end();
+		$builder->groupStart();
+			$builder->like('employees.first_name', $search);
+			$builder->orLike('expenses.date', $search);
+			$builder->orLike('employees.last_name', $search);
+			$builder->orLike('expenses.payment_type', $search);
+			$builder->orLike('expenses.amount', $search);
+			$builder->orLike('expense_categories.category_name', $search);
+			$builder->orLike('CONCAT(employees.first_name, " ", employees.last_name)', $search);
+		$builder->groupEnd();
 
-		$this->db->where('expenses.deleted', $filters['is_deleted']);
+		$builder->where('expenses.deleted', $filters['is_deleted']);
 
-		if(empty($this->config->item('date_or_time_format')))
+		/*	//TODO: Below needs to be replaced with Ternary notation
+		empty(config('OSPOS')->date_or_time_format)
+			? $builder->where('DATE_FORMAT(expenses.date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']))
+			: $builder->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+		*/
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
-			$this->db->where('DATE_FORMAT(expenses.date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+			$builder->where('DATE_FORMAT(expenses.date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
 		}
 		else
 		{
-			$this->db->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+			$builder->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
 		}
 
-		if($filters['only_debit'] != FALSE)
+		if($filters['only_debit'] != FALSE)	//TODO: Avoid the double negative on these... just replace it with `if($filters['only_debit'])`... same with below.
 		{
-			$this->db->like('expenses.payment_type', $this->lang->line('expenses_debit'));
+			$builder->like('expenses.payment_type', lang('Expenses.debit'));
 		}
 
 		if($filters['only_credit'] != FALSE)
 		{
-			$this->db->like('expenses.payment_type', $this->lang->line('expenses_credit'));
+			$builder->like('expenses.payment_type', lang('Expenses.credit'));
 		}
 
 		if($filters['only_cash'] != FALSE)
 		{
-			$this->db->group_start();
-				$this->db->like('expenses.payment_type', $this->lang->line('expenses_cash'));
-				$this->db->or_where('expenses.payment_type IS NULL');
-			$this->db->group_end();
+			$builder->groupStart();
+				$builder->like('expenses.payment_type', lang('Expenses.cash'));
+				$builder->orWhere('expenses.payment_type IS NULL');
+			$builder->groupEnd();
 		}
 
 		if($filters['only_due'] != FALSE)
 		{
-			$this->db->like('expenses.payment_type', $this->lang->line('expenses_due'));
+			$builder->like('expenses.payment_type', lang('Expenses.due'));
 		}
 
 		if($filters['only_check'] != FALSE)
 		{
-			$this->db->like('expenses.payment_type', $this->lang->line('expenses_check'));
+			$builder->like('expenses.payment_type', lang('Expenses.check'));
 		}
 
-		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
-		$this->db->group_by('expense_id');
+		$builder->groupBy('expense_id');
 
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets information about a particular expense
-	*/
-	public function get_info($expense_id)
+	/**
+	 * Gets information about a particular expense
+	 */
+	public function get_info(int $expense_id): object
 	{
-		$this->db->select('
+		$builder = $this->db->table('expenses AS expenses');
+		$builder->select('
 			expenses.expense_id AS expense_id,
 			expenses.date AS date,
 			suppliers.company_name AS supplier_name,
@@ -177,24 +194,25 @@ class Expense extends CI_Model
 			expense_categories.expense_category_id AS expense_category_id,
 			expense_categories.category_name AS category_name
 		');
-		$this->db->from('expenses AS expenses');
-		$this->db->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
-		$this->db->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
-		$this->db->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'LEFT');
-		$this->db->where('expense_id', $expense_id);
 
-		$query = $this->db->get();
-		if($query->num_rows() == 1)
+		$builder->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
+		$builder->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
+		$builder->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'LEFT');
+		$builder->where('expense_id', $expense_id);
+
+		$query = $builder->get();
+
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
-		else
+		else	//TODO: No need for this else statement.  Just put it's contents outside of the else since the if has a return in it.
 		{
 			//Get empty base parent object
 			$expenses_obj = new stdClass();
 
 			//Get all the fields from expenses table
-			foreach($this->db->list_fields('expenses') as $field)
+			foreach($this->db->getFieldNames('expenses') as $field)
 			{
 				$expenses_obj->$field = '';
 			}
@@ -205,16 +223,18 @@ class Expense extends CI_Model
 		}
 	}
 
-	/*
-	Inserts or updates an expense
-	*/
-	public function save(&$expense_data, $expense_id = FALSE)
+	/**
+	 * Inserts or updates an expense
+	 */
+	public function save_value(array &$expense_data, bool $expense_id = FALSE): bool
 	{
+		$builder = $this->db->table('expenses');
+
 		if(!$expense_id || !$this->exists($expense_id))
 		{
-			if($this->db->insert('expenses', $expense_data))
+			if($builder->insert($expense_data))
 			{
-				$expense_data['expense_id'] = $this->db->insert_id();
+				$expense_data['expense_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -222,95 +242,93 @@ class Expense extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('expense_id', $expense_id);
+		$builder->where('expense_id', $expense_id);
 
-		return $this->db->update('expenses', $expense_data);
+		return $builder->update($expense_data);
 	}
 
-	/*
-	Deletes a list of expense_category
-	*/
-	public function delete_list($expense_ids)
+	/**
+	 * Deletes a list of expense_category
+	 */
+	public function delete_list(array $expense_ids): bool
 	{
-		$success = FALSE;
+		$builder = $this->db->table('expenses');
 
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
-			$this->db->where_in('expense_id', $expense_ids);
-			$success = $this->db->update('expenses', array('deleted'=>1));
-		$this->db->trans_complete();
+		$this->db->transStart();
+			$builder->whereIn('expense_id', $expense_ids);
+			$success = $builder->update(['deleted' => 1]);
+		$this->db->transComplete();
+
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Gets the payment summary for the expenses (expenses/manage) view
-	*/
-	public function get_payments_summary($search, $filters)
+	/**
+	 * Gets the payment summary for the expenses (expenses/manage) view
+	 */
+	public function get_payments_summary(string $search, array $filters): array	//TODO: $search is passed but never used in the function
 	{
 		// get payment summary
-		$this->db->select('payment_type, COUNT(amount) AS count, SUM(amount) AS amount');
-		$this->db->from('expenses');
-		$this->db->where('deleted', $filters['is_deleted']);
+		$builder = $this->db->table('expenses');
+		$builder->select('payment_type, COUNT(amount) AS count, SUM(amount) AS amount');
+		$builder->where('deleted', $filters['is_deleted']);
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
-			$this->db->where('DATE_FORMAT(date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+			$builder->where('DATE_FORMAT(date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
 		}
 		else
 		{
-			$this->db->where('date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+			$builder->where('date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
 		}
 
-		if($filters['only_cash'] != FALSE)
+		if($filters['only_cash'] != FALSE)	//TODO: Avoid the double negative on these... just replace it with `if($filters['only_cash'])`... same with below.
 		{
-			$this->db->like('payment_type', $this->lang->line('expenses_cash'));
+			$builder->like('payment_type', lang('Expenses.cash'));
 		}
 
 		if($filters['only_due'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('expenses_due'));
+			$builder->like('payment_type', lang('Expenses.due'));
 		}
 
 		if($filters['only_check'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('expenses_check'));
+			$builder->like('payment_type', lang('Expenses.check'));
 		}
 
 		if($filters['only_credit'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('expenses_credit'));
+			$builder->like('payment_type', lang('Expenses.credit'));
 		}
 
 		if($filters['only_debit'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('expenses_debit'));
+			$builder->like('payment_type', lang('Expenses.debit'));
 		}
 
-		$this->db->group_by('payment_type');
+		$builder->groupBy('payment_type');
 
-		$payments = $this->db->get()->result_array();
-
-		return $payments;
+		return $builder->get()->getResultArray();
 	}
 
-	/*
-	Gets the payment options to show in the expense forms
-	*/
-	public function get_payment_options()
+	/**
+	 * Gets the payment options to show in the expense forms
+	 */
+	public function get_payment_options(): array
 	{
 		return get_payment_options();
 	}
 
-	/*
-	Gets the expense payment
-	*/
-	public function get_expense_payment($expense_id)
+	/**
+	 * Gets the expense payment
+	 */
+	public function get_expense_payment(int $expense_id): ResultInterface
 	{
-		$this->db->from('expenses');
-		$this->db->where('expense_id', $expense_id);
+		$builder = $this->db->table('expenses');
+		$builder->where('expense_id', $expense_id);
 
-		return $this->db->get();
+		return $builder->get();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Expense_category.php b/app/Models/Expense_category.php
index 2aaa76853..23b6e4777 100644
--- a/app/Models/Expense_category.php
+++ b/app/Models/Expense_category.php
@@ -1,46 +1,51 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Expense_category class
  */
-
-class Expense_category extends CI_Model
+class Expense_category extends Model
 {
-	/*
-	Determines if a given Expense_id is an Expense category
-	*/
-	public function exists($expense_category_id)
+	/**
+	 * Determines if a given Expense_id is an Expense category
+	 */
+	public function exists(int $expense_category_id): bool
 	{
-		$this->db->from('expense_categories');
-		$this->db->where('expense_category_id', $expense_category_id);
+		$builder = $this->db->table('expense_categories');
+		$builder->where('expense_category_id', $expense_category_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('expense_categories');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('expense_categories');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Gets information about a particular category
-	*/
-	public function get_info($expense_category_id)
+	/**
+	 * Gets information about a particular category
+	 */
+	public function get_info(int $expense_category_id): object
 	{
-		$this->db->from('expense_categories');
-		$this->db->where('expense_category_id', $expense_category_id);
-		$this->db->where('deleted', 0);
-		$query = $this->db->get();
+		$builder = $this->db->table('expense_categories');
+		$builder->where('expense_category_id', $expense_category_id);
+		$builder->where('deleted', 0);
+		$query = $builder->get();
 
-		if($query->num_rows()==1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -48,7 +53,7 @@ class Expense_category extends CI_Model
 			$expense_obj = new stdClass();
 
 			//Get all the fields from items table
-			foreach($this->db->list_fields('expense_categories') as $field)
+			foreach($this->db->getFieldNames('expense_categories') as $field)
 			{
 				$expense_obj->$field = '';
 			}
@@ -57,49 +62,52 @@ class Expense_category extends CI_Model
 		}
 	}
 
-	/*
-	Returns all the expense_categories
-	*/
-	public function get_all($rows = 0, $limit_from = 0, $no_deleted = FALSE)
+	/**
+	 * Returns all the expense_categories
+	 */
+	public function get_all(int $rows = 0, int $limit_from = 0, bool $no_deleted = FALSE): ResultInterface
 	{
-		$this->db->from('expense_categories');
+		$builder = $this->db->table('expense_categories');
+
 		if($no_deleted == TRUE)
 		{
-			$this->db->where('deleted', 0);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->order_by('category_name', 'asc');
+		$builder->orderBy('category_name', 'asc');
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets information about multiple expense_category_id
-	*/
-	public function get_multiple_info($expense_category_ids)
+	/**
+	 * Gets information about multiple expense_category_id
+	 */
+	public function get_multiple_info(array $expense_category_ids): ResultInterface
 	{
-		$this->db->from('expense_categories');
-		$this->db->where_in('expense_category_id', $expense_category_ids);
-		$this->db->order_by('category_name', 'asc');
+		$builder = $this->db->table('expense_categories');
+		$builder->whereIn('expense_category_id', $expense_category_ids);
+		$builder->orderBy('category_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Inserts or updates an expense_category
-	*/
-	public function save(&$expense_category_data, $expense_category_id = FALSE)
+	/**
+	 * Inserts or updates an expense_category
+	 */
+	public function save_value(array &$expense_category_data, bool $expense_category_id = FALSE): bool
 	{
+		$builder = $this->db->table('expense_categories');
+
 		if(!$expense_category_id || !$this->exists($expense_category_id))
 		{
-			if($this->db->insert('expense_categories', $expense_category_data))
+			if($builder->insert($expense_category_data))
 			{
-				$expense_category_data['expense_category_id'] = $this->db->insert_id();
+				$expense_category_data['expense_category_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -107,61 +115,62 @@ class Expense_category extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('expense_category_id', $expense_category_id);
+		$builder->where('expense_category_id', $expense_category_id);
 
-		return $this->db->update('expense_categories', $expense_category_data);
+		return $builder->update($expense_category_data);
 	}
 
-	/*
-	Deletes a list of expense_category
-	*/
-	public function delete_list($expense_category_ids)
+	/**
+	 * Deletes a list of expense_category
+	 */
+	public function delete_list(array $expense_category_ids): bool
 	{
-		$this->db->where_in('expense_category_id', $expense_category_ids);
+		$builder = $this->db->table('expense_categories');
+		$builder->whereIn('expense_category_id', $expense_category_ids);
 
-		return $this->db->update('expense_categories', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
-	/*
-	Gets rows
-	*/
-	public function get_found_rows($search)
+	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'category_name', 'asc', TRUE);
 	}
 
-	/*
-	Perform a search on expense_category
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'category_name', $order='asc', $count_only = FALSE)
+	/**
+	 * Perform a search on expense_category
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'category_name', string $order='asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(expense_categories.expense_category_id) as count');
-		}
-
-		$this->db->from('expense_categories AS expense_categories');
-		$this->db->group_start();
-			$this->db->like('category_name', $search);
-			$this->db->or_like('category_description', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('expense_categories AS expense_categories');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only)
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(expense_categories.expense_category_id) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->groupStart();
+			$builder->like('category_name', $search);
+			$builder->orLike('category_description', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+
+		// get_found_rows case
+		if($count_only)
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Giftcard.php b/app/Models/Giftcard.php
index 281ed5219..ae76a64c7 100644
--- a/app/Models/Giftcard.php
+++ b/app/Models/Giftcard.php
@@ -1,71 +1,76 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Giftcard class
  */
-
-class Giftcard extends CI_Model
+class Giftcard extends Model
 {
-	/*
-	Determines if a given giftcard_id is a giftcard
-	*/
-	public function exists($giftcard_id)
+	/**
+	 * Determines if a given giftcard_id is a giftcard
+	 */
+	public function exists(int $giftcard_id): bool
 	{
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_id', $giftcard_id);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_id', $giftcard_id);
+		$builder->where('deleted', 0);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Gets max gift card number
-	*/
-	public function get_max_number()
+	/**
+	 * Gets max gift card number	//TODO: This isn't entirely accurate.  It returns the object and the results then pulls the giftcard_number.
+	 */
+	public function get_max_number(): object
 	{
-		$this->db->select('CAST(giftcard_number AS UNSIGNED) AS giftcard_number');
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number REGEXP', "'^[0-9]+$'", FALSE);
-		$this->db->order_by("giftcard_number","desc");
-		$this->db->limit(1);
+		$builder = $this->db->table('giftcards');
+		$builder->select('CAST(giftcard_number AS UNSIGNED) AS giftcard_number');
+		$builder->where('giftcard_number REGEXP', "'^[0-9]+$'", FALSE);
+		$builder->orderBy("giftcard_number","desc");
+		$builder->limit(1);
 
-		return $this->db->get()->row();
+		return $builder->get()->getRow();
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('giftcards');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('giftcards');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Gets information about a particular giftcard
-	*/
-	public function get_info($giftcard_id)
+	/**
+	 * Gets information about a particular giftcard
+	 */
+	public function get_info(int $giftcard_id): object
 	{
-		$this->db->from('giftcards');
-		$this->db->join('people', 'people.person_id = giftcards.person_id', 'left');
-		$this->db->where('giftcard_id', $giftcard_id);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('giftcards');
+		$builder->join('people', 'people.person_id = giftcards.person_id', 'left');
+		$builder->where('giftcard_id', $giftcard_id);
+		$builder->where('deleted', 0);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
-		else
+		else	//TODO: No need for this else statement.  Just put it's contents outside of the else since the if has a return in it.
 		{
-			//Get empty base parent object, as $giftcard_id is NOT an giftcard
+			//Get empty base parent object, as $giftcard_id is NOT a giftcard
 			$giftcard_obj = new stdClass();
 
 			//Get all the fields from giftcards table
-			foreach($this->db->list_fields('giftcards') as $field)
+			foreach($this->db->getFieldNames('giftcards') as $field)
 			{
 				$giftcard_obj->$field = '';
 			}
@@ -74,49 +79,51 @@ class Giftcard extends CI_Model
 		}
 	}
 
-	/*
-	Gets an giftcard id given a giftcard number
-	*/
-	public function get_giftcard_id($giftcard_number)
+	/**
+	 * Gets a giftcard id given a giftcard number
+	 */
+	public function get_giftcard_id(string $giftcard_number): bool
 	{
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number', $giftcard_number);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcard_number);
+		$builder->where('deleted', 0);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row()->giftcard_id;
+			return $query->getRow()->giftcard_id;
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Gets information about multiple giftcards
-	*/
-	public function get_multiple_info($giftcard_ids)
+	/**
+	 * Gets information about multiple giftcards
+	 */
+	public function get_multiple_info(array $giftcard_ids): ResultInterface
 	{
-		$this->db->from('giftcards');
-		$this->db->where_in('giftcard_id', $giftcard_ids);
-		$this->db->where('deleted', 0);
-		$this->db->order_by('giftcard_number', 'asc');
+		$builder = $this->db->table('giftcards');
+		$builder->whereIn('giftcard_id', $giftcard_ids);
+		$builder->where('deleted', 0);
+		$builder->orderBy('giftcard_number', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Inserts or updates a giftcard
-	*/
-	public function save(&$giftcard_data, $giftcard_id = FALSE)
+	/**
+	 * Inserts or updates a giftcard
+	 */
+	public function save_value(array &$giftcard_data, $giftcard_id = FALSE): bool
 	{
+		$builder = $this->db->table('giftcards');
+
 		if(!$giftcard_id || !$this->exists($giftcard_id))
 		{
-			if($this->db->insert('giftcards', $giftcard_data))
+			if($builder->insert($giftcard_data))
 			{
-				$giftcard_data['giftcard_number'] = $this->db->insert_id();
-				$giftcard_data['giftcard_id'] = $this->db->insert_id();
+				$giftcard_data['giftcard_number'] = $this->db->insertID();
+				$giftcard_data['giftcard_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -124,69 +131,74 @@ class Giftcard extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('giftcard_id', $giftcard_id);
+		$builder->where('giftcard_id', $giftcard_id);
 
-		return $this->db->update('giftcards', $giftcard_data);
+		return $builder->update($giftcard_data);
 	}
 
-	/*
-	Updates multiple giftcards at once
-	*/
-	public function update_multiple($giftcard_data, $giftcard_ids)
+	/**
+	 * Updates multiple giftcards at once
+	 */
+	public function update_multiple(array $giftcard_data, array $giftcard_ids): bool	//TODO: This function appears to never be used in the code.
 	{
-		$this->db->where_in('giftcard_id', $giftcard_ids);
+		$builder = $this->db->table('giftcards');
+		$builder->whereIn('giftcard_id', $giftcard_ids);
 
-		return $this->db->update('giftcards', $giftcard_data);
+		return $builder->update($giftcard_data);
 	}
 
-	/*
-	Deletes one giftcard
-	*/
-	public function delete($giftcard_id)
+	/**
+	 * Deletes one giftcard
+	 */
+	public function delete($giftcard_id = null, bool $purge = false): bool
 	{
-		$this->db->where('giftcard_id', $giftcard_id);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_id', $giftcard_id);
 
-		return $this->db->update('giftcards', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
-	/*
-	Deletes a list of giftcards
-	*/
-	public function delete_list($giftcard_ids)
+	/**
+	 * Deletes a list of giftcards
+	 */
+	public function delete_list(array $giftcard_ids): bool
 	{
-		$this->db->where_in('giftcard_id', $giftcard_ids);
+		$builder = $this->db->table('giftcards');
+		$builder->whereIn('giftcard_id', $giftcard_ids);
 
-		return $this->db->update('giftcards', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
- 	/*
-	Get search suggestions to find giftcards
-	*/
-	public function get_search_suggestions($search, $limit = 25)
+ 	/**
+	 * Get search suggestions to find giftcards
+	 */
+	public function get_search_suggestions(string $search, int $limit = 25): array
 	{
-		$suggestions = array();
+		$suggestions = [];
 
-		$this->db->from('giftcards');
-		$this->db->like('giftcard_number', $search);
-		$this->db->where('deleted', 0);
-		$this->db->order_by('giftcard_number', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('giftcards');
+		$builder->like('giftcard_number', $search);
+		$builder->where('deleted', 0);
+		$builder->orderBy('giftcard_number', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[]=array('label' => $row->giftcard_number);
+			$suggestions[]= ['label' => $row->giftcard_number];
 		}
 
- 		$this->db->from('customers');
-		$this->db->join('people', 'customers.person_id = people.person_id', 'left');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
-		$this->db->order_by('last_name', 'asc');
-		foreach($this->db->get()->result() as $row)
+ 		$builder = $this->db->table('customers');
+		$builder->join('people', 'customers.person_id = people.person_id', 'left');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+		$builder->orderBy('last_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('label' => $row->first_name.' '.$row->last_name);
+			$suggestions[] = ['label' => $row->first_name.' '.$row->last_name];
 		}
 
 		//only return $limit suggestions
@@ -198,99 +210,103 @@ class Giftcard extends CI_Model
 		return $suggestions;
 	}
 
-	/*
-	Gets gift cards
-	*/
-	public function get_found_rows($search)
+	/**
+	 * Gets gift cards
+	 */
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'giftcard_number', 'asc', TRUE);
 	}
 
-	/*
-	Performs a search on giftcards
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'giftcard_number', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Performs a search on giftcards
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'giftcard_number', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(giftcards.giftcard_id) as count');
-		}
-
-		$this->db->from('giftcards AS giftcards');
-		$this->db->join('people AS person', 'giftcards.person_id = person.person_id', 'left');
-		$this->db->group_start();
-			$this->db->like('person.first_name', $search);
-			$this->db->or_like('person.last_name', $search);
-			$this->db->or_like('CONCAT(person.first_name, " ", person.last_name)', $search);
-			$this->db->or_like('giftcards.giftcard_number', $search);
-			$this->db->or_like('giftcards.person_id', $search);
-		$this->db->group_end();
-		$this->db->where('giftcards.deleted', 0);
+		$builder = $this->db->table('giftcards');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(giftcards.giftcard_id) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->join('people AS person', 'giftcards.person_id = person.person_id', 'left');
+		$builder->groupStart();
+			$builder->like('person.first_name', $search);
+			$builder->orLike('person.last_name', $search);
+			$builder->orLike('CONCAT(person.first_name, " ", person.last_name)', $search);
+			$builder->orLike('giftcards.giftcard_number', $search);
+			$builder->orLike('giftcards.person_id', $search);
+		$builder->groupEnd();
+		$builder->where('giftcards.deleted', 0);
+
+		// get_found_rows case
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets gift card value
-	*/
-	public function get_giftcard_value($giftcard_number)
+	/**
+	 * Gets gift card value
+	 */
+	public function get_giftcard_value(string $giftcard_number): float	//TODO: we may need to do a search for all float values and for currencies cast them to strings at the point where we get them from the database.
 	{
-		if( !$this->exists($this->get_giftcard_id($giftcard_number)) )
+		if(!$this->exists($this->get_giftcard_id($giftcard_number)))
 		{
 			return 0;
 		}
 
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number', $giftcard_number);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcard_number);
 
-		return $this->db->get()->row()->value;
+		return $builder->get()->getRow()->value;
 	}
 
-	/*
-	Updates gift card value
-	*/
-	public function update_giftcard_value($giftcard_number, $value)
+	/**
+	 * Updates gift card value
+	 */
+	public function update_giftcard_value(string $giftcard_number, float $value): void	//TODO: Should we return the value of update like other similar functions do?
 	{
-		$this->db->where('giftcard_number', $giftcard_number);
-		$this->db->update('giftcards', array('value' => $value));
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcard_number);
+		$builder->update(['value' => $value]);
 	}
 
-	/*
-	Determines if a given giftcard_name esists
-	*/
-	public function exists_gitcard_name($giftcard_name)
+	/**
+	 * Determines if a given giftcard_name exists
+	 */
+	public function exists_giftcard_name($giftcard_name): bool
 	{
 		$giftcard_name = strtoupper($giftcard_name);
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number', $giftcard_name);
-		$this->db->where('deleted', 0);
 
-		return ($this->db->get()->num_rows() == 1);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcard_name);
+		$builder->where('deleted', 0);
+
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Generate unique gift card name/number
-	*/
-	public function generate_unique_giftcard_name($value)
+	/**
+	 * Generate unique gift card name/number
+	 */
+	public function generate_unique_giftcard_name(string $value): string
 	{
 		$value = str_replace('.', 'DE', $value);
 		$random = bin2hex(openssl_random_pseudo_bytes(3));
-		$giftcard_name = (string)$random . '-' . $value;
-		if($this->exists_gitcard_name($giftcard_name))
+		$giftcard_name = "$random-$value";
+
+		if($this->exists_giftcard_name($giftcard_name))
 		{
 			$this->generate_unique_giftcard_name($value);
 		}
@@ -298,20 +314,19 @@ class Giftcard extends CI_Model
 		return strtoupper($giftcard_name);
 	}
 
-	/*
-	Gets gift card customer
-	*/
-	public function get_giftcard_customer($giftcard_number)
+	/**
+	 * Gets gift card customer
+	 */
+	public function get_giftcard_customer(string $giftcard_number): int
 	{
 		if( !$this->exists($this->get_giftcard_id($giftcard_number)) )
 		{
 			return 0;
 		}
 
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number', $giftcard_number);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcard_number);
 
-		return $this->db->get()->row()->person_id;
+		return $builder->get()->getRow()->person_id;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Inventory.php b/app/Models/Inventory.php
index 6021a61c3..1ee3cb106 100644
--- a/app/Models/Inventory.php
+++ b/app/Models/Inventory.php
@@ -1,63 +1,87 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use ReflectionException;
 
 /**
  * Inventory class
+ *
+ * @property employee employee
+ *
  */
-
-class Inventory extends CI_Model
+class Inventory extends Model
 {
-	public function insert($inventory_data)
+	public function insert(array $inventory_data = NULL, bool $returnID = TRUE): bool	//TODO: $returnID does not match variable naming conventions.  It's also never used in the function
 	{
-		return $this->db->insert('inventory', $inventory_data);
+		$builder = $this->db->table('inventory');
+
+		return $builder->insert($inventory_data);
 	}
 
-	public function update($comment, $inventory_data)
+	public function update(string $comment = NULL, array $inventory_data = NULL): bool	//TODO: this function either needs a name change or to be brought in line with the parent function declaration.
 	{
-		$this->db->where('trans_comment', $comment);
-		return $this->db->update('inventory', $inventory_data);
+		$builder = $this->db->table('inventory');
+		$builder->where('trans_comment', $comment);
+
+		return $builder->update($inventory_data);
 	}
 
-	public function get_inventory_data_for_item($item_id, $location_id = FALSE)
+	/**
+	 * Retrieves inventory data given an item_id.  Called in the view.
+	 * @param int $item_id
+	 * @param bool $location_id
+	 * @return ResultInterface
+	 */
+	public function get_inventory_data_for_item(int $item_id, bool $location_id = FALSE): ResultInterface
 	{
-		$this->db->from('inventory');
-		$this->db->where('trans_items', $item_id);
-        if($location_id != FALSE)
+		$builder = $this->db->table('inventory');
+		$builder->where('trans_items', $item_id);
+
+		if($location_id != FALSE)
         {
-            $this->db->where('trans_location', $location_id);
+            $builder->where('trans_location', $location_id);
         }
-		$this->db->order_by('trans_date', 'desc');
 
-		return $this->db->get();
+		$builder->orderBy('trans_date', 'desc');
+
+		return $builder->get();
 	}
 
-	public function reset_quantity($item_id)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function reset_quantity(int $item_id): bool
 	{
-		$inventory_sums = $this->Inventory->get_inventory_sum($item_id);
+		$inventory_sums = $this->get_inventory_sum($item_id);
 		foreach($inventory_sums as $inventory_sum)
 		{
 			if($inventory_sum['sum'] > 0)
-			{
-				return $this->Inventory->insert(array(
+			{//TODO: Reflection Exception
+				$employee = model(Employee::class);
+
+				return $this->insert([
 					'trans_inventory' => -1 * $inventory_sum['sum'],
 					'trans_items' => $item_id,
 					'trans_location' => $inventory_sum['location_id'],
-					'trans_comment' => $this->lang->line('items_is_deleted'),
-					'trans_user' => $this->Employee->get_logged_in_employee_info()->person_id)
-				);
+					'trans_comment' => lang('Items.is_deleted'),
+					'trans_user' => $employee->get_logged_in_employee_info()->person_id
+				]);
 			}
 		}
 
 		return TRUE;
 	}
 
-	public function get_inventory_sum($item_id)
+	public function get_inventory_sum(int $item_id): array
 	{
-		$this->db->select('SUM(trans_inventory) AS sum, MAX(trans_location) AS location_id');
-		$this->db->from('inventory');
-		$this->db->where('trans_items', $item_id);
-		$this->db->group_by('trans_location');
+		$builder = $this->db->table('inventory');
+		$builder->select('SUM(trans_inventory) AS sum, MAX(trans_location) AS location_id');
+		$builder->where('trans_items', $item_id);
+		$builder->groupBy('trans_location');
 
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Item.php b/app/Models/Item.php
index dfd586fb9..d7ce7d8a2 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -1,147 +1,162 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use ReflectionException;
+use stdClass;
+
 /**
  * Item class
+ *
+ * @property inventory inventory
+ * @property item_quantity item_quantity
  */
-
-class Item extends CI_Model
+class Item extends Model
 {
-	/*
-	Determines if a given item_id is an item
-	*/
-	public function exists($item_id, $ignore_deleted = FALSE, $deleted = FALSE)
+	/**
+	 * Determines if a given item_id is an item
+	 */
+	public function exists(int $item_id, bool $ignore_deleted = FALSE, bool $deleted = FALSE): bool
 	{
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
 		if(ctype_digit($item_id) && substr($item_id, 0, 1) !== '0')
 		{
-			$this->db->where('item_id', intval($item_id));
+			$builder = $this->db->table('items');
+			$builder->where('item_id', $item_id);
+
 			if($ignore_deleted === FALSE)
 			{
-				$this->db->where('deleted', $deleted);
+				$builder->where('deleted', $deleted);
 			}
 
-			return ($this->db->get('items')->num_rows() === 1);
+			return ($builder->get()->getNumRows() === 1);
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Determines if a given item_number exists
-	*/
-	public function item_number_exists($item_number, $item_id = '')
+	/**
+	 * Determines if a given item_number exists
+	 */
+	public function item_number_exists(string $item_number, string $item_id = ''): bool
 	{
-		if($this->config->item('allow_duplicate_barcodes') != FALSE)
+		if(config('OSPOS')->allow_duplicate_barcodes)
 		{
 			return FALSE;
 		}
 
-		$this->db->where('item_number', (string) $item_number);
+		$builder = $this->db->table('items');
+		$builder->where('item_number', $item_number);
+
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
-		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')
+		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')	//TODO: !==
 		{
-			$this->db->where('item_id !=', intval($item_id));
+			$builder->where('item_id !=', intval($item_id));
 		}
 
-		return ($this->db->get('items')->num_rows() >= 1);
+		return ($builder->get()->getNumRows() >= 1);
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('items');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('items');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	public function get_tax_category_usage($tax_category_id)
+	public function get_tax_category_usage(int $tax_category_id): int	//TODO: This function is never called in the code.
 	{
-		$this->db->from('items');
-		$this->db->where('tax_category_id', $tax_category_id);
+		$builder = $this->db->table('items');
+		$builder->where('tax_category_id', $tax_category_id);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Get number of rows
-	*/
-	public function get_found_rows($search, $filters)
+	/**
+	 * Get number of rows
+	 */
+	public function get_found_rows(string $search, array $filters): ResultInterface
 	{
 		return $this->search($search, $filters, 0, 0, 'items.name', 'asc', TRUE);
 	}
 
-	/*
-	Perform a search on items
-	*/
-	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'items.name', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Perform a search on items
+	 */
+	public function search(string $search, array $filters, int $rows = 0, int $limit_from = 0, string $sort = 'items.name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
+		$builder = $this->db->table('items AS items');	//TODO: I'm not sure if it's needed to write items AS items... I think you can just get away with items
+
 		// get_found_rows case
-		if($count_only === TRUE)
+		if($count_only === TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			$this->db->select('COUNT(DISTINCT items.item_id) AS count');
+			$builder->select('COUNT(DISTINCT items.item_id) AS count');
 		}
 		else
 		{
-			$this->db->select('MAX(items.item_id) AS item_id');
-			$this->db->select('MAX(items.name) AS name');
-			$this->db->select('MAX(items.category) AS category');
-			$this->db->select('MAX(items.supplier_id) AS supplier_id');
-			$this->db->select('MAX(items.item_number) AS item_number');
-			$this->db->select('MAX(items.description) AS description');
-			$this->db->select('MAX(items.cost_price) AS cost_price');
-			$this->db->select('MAX(items.unit_price) AS unit_price');
-			$this->db->select('MAX(items.reorder_level) AS reorder_level');
-			$this->db->select('MAX(items.receiving_quantity) AS receiving_quantity');
-			$this->db->select('MAX(items.pic_filename) AS pic_filename');
-			$this->db->select('MAX(items.allow_alt_description) AS allow_alt_description');
-			$this->db->select('MAX(items.is_serialized) AS is_serialized');
-			$this->db->select('MAX(items.pack_name) AS pack_name');
-			$this->db->select('MAX(items.tax_category_id) AS tax_category_id');
-			$this->db->select('MAX(items.deleted) AS deleted');
+			$builder->select('MAX(items.item_id) AS item_id');
+			$builder->select('MAX(items.name) AS name');
+			$builder->select('MAX(items.category) AS category');
+			$builder->select('MAX(items.supplier_id) AS supplier_id');
+			$builder->select('MAX(items.item_number) AS item_number');
+			$builder->select('MAX(items.description) AS description');
+			$builder->select('MAX(items.cost_price) AS cost_price');
+			$builder->select('MAX(items.unit_price) AS unit_price');
+			$builder->select('MAX(items.reorder_level) AS reorder_level');
+			$builder->select('MAX(items.receiving_quantity) AS receiving_quantity');
+			$builder->select('MAX(items.pic_filename) AS pic_filename');
+			$builder->select('MAX(items.allow_alt_description) AS allow_alt_description');
+			$builder->select('MAX(items.is_serialized) AS is_serialized');
+			$builder->select('MAX(items.pack_name) AS pack_name');
+			$builder->select('MAX(items.tax_category_id) AS tax_category_id');
+			$builder->select('MAX(items.deleted) AS deleted');
 
-			$this->db->select('MAX(suppliers.person_id) AS person_id');
-			$this->db->select('MAX(suppliers.company_name) AS company_name');
-			$this->db->select('MAX(suppliers.agency_name) AS agency_name');
-			$this->db->select('MAX(suppliers.account_number) AS account_number');
-			$this->db->select('MAX(suppliers.deleted) AS deleted');
+			$builder->select('MAX(suppliers.person_id) AS person_id');
+			$builder->select('MAX(suppliers.company_name) AS company_name');
+			$builder->select('MAX(suppliers.agency_name) AS agency_name');
+			$builder->select('MAX(suppliers.account_number) AS account_number');
+			$builder->select('MAX(suppliers.deleted) AS deleted');
 
-			$this->db->select('MAX(inventory.trans_id) AS trans_id');
-			$this->db->select('MAX(inventory.trans_items) AS trans_items');
-			$this->db->select('MAX(inventory.trans_user) AS trans_user');
-			$this->db->select('MAX(inventory.trans_date) AS trans_date');
-			$this->db->select('MAX(inventory.trans_comment) AS trans_comment');
-			$this->db->select('MAX(inventory.trans_location) AS trans_location');
-			$this->db->select('MAX(inventory.trans_inventory) AS trans_inventory');
+			$builder->select('MAX(inventory.trans_id) AS trans_id');
+			$builder->select('MAX(inventory.trans_items) AS trans_items');
+			$builder->select('MAX(inventory.trans_user) AS trans_user');
+			$builder->select('MAX(inventory.trans_date) AS trans_date');
+			$builder->select('MAX(inventory.trans_comment) AS trans_comment');
+			$builder->select('MAX(inventory.trans_location) AS trans_location');
+			$builder->select('MAX(inventory.trans_inventory) AS trans_inventory');
 
 			if($filters['stock_location_id'] > -1)
 			{
-				$this->db->select('MAX(item_quantities.item_id) AS qty_item_id');
-				$this->db->select('MAX(item_quantities.location_id) AS location_id');
-				$this->db->select('MAX(item_quantities.quantity) AS quantity');
+				$builder->select('MAX(item_quantities.item_id) AS qty_item_id');
+				$builder->select('MAX(item_quantities.location_id) AS location_id');
+				$builder->select('MAX(item_quantities.quantity) AS quantity');
 			}
 		}
 
-		$this->db->from('items AS items');
-		$this->db->join('suppliers AS suppliers', 'suppliers.person_id = items.supplier_id', 'left');
-		$this->db->join('inventory AS inventory', 'inventory.trans_items = items.item_id');
+		$builder->join('suppliers AS suppliers', 'suppliers.person_id = items.supplier_id', 'left');
+		$builder->join('inventory AS inventory', 'inventory.trans_items = items.item_id');
 
 		if($filters['stock_location_id'] > -1)
 		{
-			$this->db->join('item_quantities AS item_quantities', 'item_quantities.item_id = items.item_id');
-			$this->db->where('location_id', $filters['stock_location_id']);
+			$builder->join('item_quantities AS item_quantities', 'item_quantities.item_id = items.item_id');
+			$builder->where('location_id', $filters['stock_location_id']);
 		}
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: This needs to be replaced with Ternary notation
 		{
-			$this->db->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+			$builder->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
 		}
 		else
 		{
-			$this->db->where('trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+			$builder->where('trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
 		}
 
 		$attributes_enabled = count($filters['definition_ids']) > 0;
@@ -150,239 +165,247 @@ class Item extends CI_Model
 		{
 			if ($attributes_enabled && $filters['search_custom'])
 			{
-				$this->db->having("attribute_values LIKE '%$search%'");
-				$this->db->or_having("attribute_dtvalues LIKE '%$search%'");
-				$this->db->or_having("attribute_dvalues LIKE '%$search%'");
+				$builder->having("attribute_values LIKE '%$search%'");
+				$builder->orHaving("attribute_dtvalues LIKE '%$search%'");
+				$builder->orHaving("attribute_dvalues LIKE '%$search%'");
 			}
 			else
 			{
-				$this->db->group_start();
-					$this->db->like('name', $search);
-					$this->db->or_like('item_number', $search);
-					$this->db->or_like('items.item_id', $search);
-					$this->db->or_like('company_name', $search);
-					$this->db->or_like('items.category', $search);
-				$this->db->group_end();
+				$builder->groupStart();
+					$builder->like('name', $search);
+					$builder->orLike('item_number', $search);
+					$builder->orLike('items.item_id', $search);
+					$builder->orLike('company_name', $search);
+					$builder->orLike('items.category', $search);
+				$builder->groupEnd();
 			}
 		}
 
 		if($attributes_enabled)
 		{
 			$format = $this->db->escape(dateformat_mysql());
-			$this->db->simple_query('SET SESSION group_concat_max_len=49152');
-			$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
-			$this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
-			$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-			$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
-			$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
+			$this->db->simpleQuery('SET SESSION group_concat_max_len=49152');
+			$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
+			$builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
+			$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
+			$builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
+			$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
 		}
 
-		$this->db->where('items.deleted', $filters['is_deleted']);
+		$builder->where('items.deleted', $filters['is_deleted']);
 
-		if($filters['empty_upc'] != FALSE)
+		if($filters['empty_upc'] != FALSE)	//TODO: Avoid the double negative on these... just replace it with `if($filters['empty_upc'])`... same with below.
 		{
-			$this->db->where('item_number', NULL);
+			$builder->where('item_number', NULL);
 		}
 		if($filters['low_inventory'] != FALSE)
 		{
-			$this->db->where('quantity <=', 'reorder_level');
+			$builder->where('quantity <=', 'reorder_level');
 		}
 		if($filters['is_serialized'] != FALSE)
 		{
-			$this->db->where('is_serialized', 1);
+			$builder->where('is_serialized', 1);
 		}
 		if($filters['no_description'] != FALSE)
 		{
-			$this->db->where('items.description', '');
+			$builder->where('items.description', '');
 		}
 		if($filters['temporary'] != FALSE)
 		{
-			$this->db->where('items.item_type', ITEM_TEMP);
+			$builder->where('items.item_type', ITEM_TEMP);
 		}
 		else
 		{
-			$non_temp = array(ITEM, ITEM_KIT, ITEM_AMOUNT_ENTRY);
-			$this->db->where_in('items.item_type', $non_temp);
+			$non_temp = [ITEM, ITEM_KIT, ITEM_AMOUNT_ENTRY];
+			$builder->whereIn('items.item_type', $non_temp);
 		}
 
 		// get_found_rows case
-		if($count_only === TRUE)
+		if($count_only === TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
 		// avoid duplicated entries with same name because of inventory reporting multiple changes on the same item in the same date range
-		$this->db->group_by('items.item_id');
+		$builder->groupBy('items.item_id');
 
 		// order by name of item by default
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Returns all the items
-	*/
-	public function get_all($stock_location_id = -1, $rows = 0, $limit_from = 0)
+	/**
+	 * Returns all the items
+	 */
+	public function get_all(int $stock_location_id = -1, int $rows = 0, int $limit_from = 0): ResultInterface	//TODO: Replace -1 with a constant
 	{
-		$this->db->from('items');
+		$builder = $this->db->table('items');
 
-		if($stock_location_id > -1)
+		if($stock_location_id > -1)	//TODO: Replace -1 with a constant
 		{
-			$this->db->join('item_quantities', 'item_quantities.item_id = items.item_id');
-			$this->db->where('location_id', $stock_location_id);
+			$builder->join('item_quantities', 'item_quantities.item_id = items.item_id');
+			$builder->where('location_id', $stock_location_id);
 		}
 
-		$this->db->where('items.deleted', 0);
+		$builder->where('items.deleted', 0);
 
 		// order by name of item
-		$this->db->order_by('items.name', 'asc');
+		$builder->orderBy('items.name', 'asc');
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Gets information about a particular item
-	*/
-	public function get_info($item_id)
+	/**
+	 * Gets information about a particular item
+	 */
+	public function get_info(int $item_id): object
 	{
-		$this->db->select('items.*');
-		$this->db->select('GROUP_CONCAT(attribute_value SEPARATOR \'|\') AS attribute_values');
-		$this->db->select('GROUP_CONCAT(attribute_decimal SEPARATOR \'|\') AS attribute_dvalues');
-		$this->db->select('GROUP_CONCAT(attribute_date SEPARATOR \'|\') AS attribute_dtvalues');
-		$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id', 'left');
-		$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
-		$this->db->where('items.item_id', $item_id);
-		$this->db->group_by('items.item_id');
+		$builder = $this->db->table('items');
+		$builder->select('items.*');
+		$builder->select('GROUP_CONCAT(attribute_value SEPARATOR \'|\') AS attribute_values');
+		$builder->select('GROUP_CONCAT(attribute_decimal SEPARATOR \'|\') AS attribute_dvalues');
+		$builder->select('GROUP_CONCAT(attribute_date SEPARATOR \'|\') AS attribute_dtvalues');
+		$builder->join('attribute_links', 'attribute_links.item_id = items.item_id', 'left');
+		$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
+		$builder->where('items.item_id', $item_id);
+		$builder->groupBy('items.item_id');
 
-		$query = $this->db->get('items');
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)
 		{
-			return $query->row();
+			return $query->getRow();
 		}
-		else
+
+		//Get empty base parent object, as $item_id is NOT an item
+		$item_obj = new stdClass();
+
+		//Get all the fields from items table
+		foreach($this->db->getFieldNames('items') as $field)
 		{
-			//Get empty base parent object, as $item_id is NOT an item
-			$item_obj = new stdClass();
-
-			//Get all the fields from items table
-			foreach($this->db->list_fields('items') as $field)
-			{
-				$item_obj->$field = '';
-			}
-
-			return $item_obj;
+			$item_obj->$field = '';
 		}
+
+		return $item_obj;
 	}
 
-	/*
-	Gets information about a particular item by item id or number
-	*/
-	public function get_info_by_id_or_number($item_id, $include_deleted = TRUE)
+	/**
+	 * Gets information about a particular item by item id or number
+	 */
+	public function get_info_by_id_or_number(int $item_id, bool $include_deleted = TRUE)
 	{
-		$this->db->group_start();
-		$this->db->where('items.item_number', $item_id);
+		$builder = $this->db->table('items');
+		$builder->groupStart();
+		$builder->where('items.item_number', $item_id);
 
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
 		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')
 		{
-			$this->db->or_where('items.item_id', intval($item_id));
+			$builder->orWhere('items.item_id', $item_id);
 		}
 
-		$this->db->group_end();
+		$builder->groupEnd();
 
 		if(!$include_deleted)
 		{
-			$this->db->where('items.deleted', 0);
+			$builder->where('items.deleted', 0);
 		}
 
 		// limit to only 1 so there is a result in case two are returned
 		// due to barcode and item_id clash
-		$this->db->limit(1);
+		$builder->limit(1);
 
-		$query = $this->db->get('items');
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 
 		return '';
 	}
 
-	/*
-	Get an item id given an item number
-	*/
-	public function get_item_id($item_number, $ignore_deleted = FALSE, $deleted = FALSE)
+	/**
+	 * Get an item id given an item number
+	 */
+	public function get_item_id(string $item_number, bool $ignore_deleted = FALSE, bool $deleted = FALSE): bool
 	{
-		$this->db->from('items');
-		$this->db->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
-		$this->db->where('item_number', $item_number);
-		if($ignore_deleted == FALSE)
+		$builder = $this->db->table('items');
+		$builder->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
+		$builder->where('item_number', $item_number);
+
+		if($ignore_deleted == FALSE)	//TODO: ===
 		{
-			$this->db->where('items.deleted', $deleted);
+			$builder->where('items.deleted', $deleted);
 		}
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row()->item_id;
+			return $query->getRow()->item_id;
 		}
 
 		return FALSE;
 	}
 
-	/*
-	Gets information about multiple items
-	*/
-	public function get_multiple_info($item_ids, $location_id)
+	/**
+	 * Gets information about multiple items
+	 */
+	public function get_multiple_info(array $item_ids, int $location_id): ResultInterface
 	{
 		$format = $this->db->escape(dateformat_mysql());
-		$this->db->select('items.*');
-		$this->db->select('MAX(company_name) AS company_name');
-		$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
-		$this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) ORDER BY definition_id SEPARATOR '|') AS attribute_dtvalues");
-		$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) ORDER BY definition_id SEPARATOR \'|\') AS attribute_dvalues');
-		$this->db->select('MAX(quantity) as quantity');
-		$this->db->from('items');
-		$this->db->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
-		$this->db->join('item_quantities', 'item_quantities.item_id = items.item_id', 'left');
-		$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND sale_id IS NULL AND receiving_id IS NULL', 'left');
-		$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
-		$this->db->where('location_id', $location_id);
-		$this->db->where_in('items.item_id', $item_ids);
-		$this->db->group_by('items.item_id');
 
-		return $this->db->get();
+		$builder = $this->db->table('items');
+		$builder->select('items.*');
+		$builder->select('MAX(company_name) AS company_name');
+		$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
+		$builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) ORDER BY definition_id SEPARATOR '|') AS attribute_dtvalues");
+		$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) ORDER BY definition_id SEPARATOR \'|\') AS attribute_dvalues');
+		$builder->select('MAX(quantity) as quantity');
+
+		$builder->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
+		$builder->join('item_quantities', 'item_quantities.item_id = items.item_id', 'left');
+		$builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND sale_id IS NULL AND receiving_id IS NULL', 'left');
+		$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
+
+		$builder->where('location_id', $location_id);
+		$builder->whereIn('items.item_id', $item_ids);
+
+		$builder->groupBy('items.item_id');
+
+		return $builder->get();
 	}
 
-	/*
-	Inserts or updates a item
-	*/
-	public function save(&$item_data, $item_id = FALSE)
+	/**
+	 * Inserts or updates an item
+	 */
+	public function save_value(array &$item_data, bool $item_id = FALSE): bool	//TODO: need to bring this in line with parent or change the name
 	{
+		$builder = $this->db->table('items');
+
 		if(!$item_id || !$this->exists($item_id, TRUE))
 		{
-			if($this->db->insert('items', $item_data))
+			if($builder->insert($item_data))
 			{
-				$item_data['item_id'] = $this->db->insert_id();
-				if($item_data['low_sell_item_id'] == -1)
+				$item_data['item_id'] = $this->db->insertID();
+				if($item_data['low_sell_item_id'] == -1)	//TODO: Replace -1 with a constant... === ?
 				{
-					$this->db->where('item_id', $item_data['item_id']);
-					$this->db->update('items', array('low_sell_item_id'=>$item_data['item_id']));
+					$builder = $this->db->table('items');
+					$builder->where('item_id', $item_data['item_id']);
+					$builder->update(['low_sell_item_id' => $item_data['item_id']]);
 				}
 
 				return TRUE;
@@ -395,103 +418,117 @@ class Item extends CI_Model
 			$item_data['item_id'] = $item_id;
 		}
 
-		$this->db->where('item_id', $item_id);
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
 
-		return $this->db->update('items', $item_data);
+		return $builder->update($item_data);
 	}
 
-	/*
-	Updates multiple items at once
-	*/
-	public function update_multiple($item_data, $item_ids)
+	/**
+	 * Updates multiple items at once
+	 */
+	public function update_multiple(array $item_data, string $item_ids): bool
 	{
-		$this->db->where_in('item_id', explode(':', $item_ids));
+		$builder = $this->db->table('items');
+		$builder->whereIn('item_id', explode(':', $item_ids));
 
-		return $this->db->update('items', $item_data);
+		return $builder->update($item_data);
 	}
 
-	/*
-	Deletes one item
-	*/
-	public function delete($item_id)
+	/**
+	 * Deletes one item
+	 * @throws ReflectionException
+	 */
+	public function delete(int $item_id = null, bool $purge = false): bool	//TODO: need to figure out what to do with these override functions that don't match our signature.
 	{
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		// set to 0 quantities
-		$this->Item_quantity->reset_quantity($item_id);
-		$this->db->where('item_id', $item_id);
-		$success = $this->db->update('items', array('deleted'=>1));
-		$success &= $this->Inventory->reset_quantity($item_id);
+		$item_quantity = model(Item_quantity::class);
+		$item_quantity->reset_quantity($item_id);
 
-		$this->db->trans_complete();
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
+		$success = $builder->update(['deleted' => 1]);
 
-		$success &= $this->db->trans_status();
+		$inventory = model(Inventory::class);
+		$success &= $inventory->reset_quantity($item_id);
+
+		$this->db->transComplete();
+
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Undeletes one item
-	*/
-	public function undelete($item_id)
+	/**
+	 * Undeletes one item
+	 */
+	public function undelete(int $item_id): bool
 	{
-		$this->db->where('item_id', $item_id);
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
 
-		return $this->db->update('items', array('deleted'=>0));
+		return $builder->update(['deleted' => 0]);
 	}
 
-	/*
-	Deletes a list of items
-	*/
-	public function delete_list($item_ids)
+	/**
+	 * Deletes a list of items
+	 * @throws ReflectionException
+	 */
+	public function delete_list(array $item_ids): bool
 	{
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		// set to 0 quantities
-		$this->Item_quantity->reset_quantity_list($item_ids);
-		$this->db->where_in('item_id', $item_ids);
-		$success = $this->db->update('items', array('deleted'=>1));
+		$item_quantity = model(Item_quantity::class);
+		$item_quantity->reset_quantity_list($item_ids);
+
+		$builder = $this->db->table('items');
+		$builder->whereIn('item_id', $item_ids);
+		$success = $builder->update(['deleted' => 1]);
+
+		$inventory = model(Inventory::class);
 
 		foreach($item_ids as $item_id)
 		{
-			$success &= $this->Inventory->reset_quantity($item_id);
+			$success &= $inventory->reset_quantity($item_id);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	function get_search_suggestion_format($seed = NULL)
+	function get_search_suggestion_format(string $seed = NULL): string
 	{
-		$seed .= ',' . $this->config->item('suggestions_first_column');
+		$seed .= ',' . config('OSPOS')->suggestions_first_column;
 
-		if($this->config->item('suggestions_second_column') !== '')
+		if(config('OSPOS')->suggestions_second_column !== '')
 		{
-			$seed .= ',' . $this->config->item('suggestions_second_column');
+			$seed .= ',' . config('OSPOS')->suggestions_second_column;
 		}
 
-		if($this->config->item('suggestions_third_column') !== '')
+		if(config('OSPOS')->suggestions_third_column !== '')
 		{
-			$seed .= ',' . $this->config->item('suggestions_third_column');
+			$seed .= ',' . config('OSPOS')->suggestions_third_column;
 		}
 
 		return $seed;
 	}
 
-	function get_search_suggestion_label($result_row)
+	function get_search_suggestion_label($result_row): string
 	{
 		$label = '';
-		$label1 = $this->config->item('suggestions_first_column');
-		$label2 = $this->config->item('suggestions_second_column');
-		$label3 = $this->config->item('suggestions_third_column');
+		$label1 = config('OSPOS')->suggestions_first_column;
+		$label2 = config('OSPOS')->suggestions_second_column;
+		$label3 = config('OSPOS')->suggestions_third_column;
 
 		// If multi_pack enabled then if "name" is part of the search suggestions then append pack
-		if($this->config->item('multi_pack_enabled') == '1')
+		if(config('OSPOS')->multi_pack_enabled)
 		{
 			$this->append_label($label, $label1, $result_row);
 			$this->append_label($label, $label2, $result_row);
@@ -515,15 +552,15 @@ class Item extends CI_Model
 		return $label;
 	}
 
-	private function append_label(&$label, $item_field_name, $item_info)
+	private function append_label(string &$label, string $item_field_name, object $item_info): void
 	{
 		if($item_field_name !== '')
 		{
 			if($label == '')
 			{
-				if($item_field_name == 'name')
+				if($item_field_name == 'name')	//TODO: This needs to be replaced with Ternary notation if possible
 				{
-					$label .= implode(NAME_SEPARATOR, array($item_info->name, $item_info->pack_name));
+					$label .= implode(NAME_SEPARATOR, [$item_info->name, $item_info->pack_name]);	//TODO: no need for .= operator.  If it gets here then that means label is an empty string.
 				}
 				else
 				{
@@ -534,7 +571,7 @@ class Item extends CI_Model
 			{
 				if($item_field_name == 'name')
 				{
-					$label .= implode(NAME_SEPARATOR, array('', $item_info->name, $item_info->pack_name));
+					$label .= implode(NAME_SEPARATOR, ['', $item_info->name, $item_info->pack_name]);
 				}
 				else
 				{
@@ -544,88 +581,97 @@ class Item extends CI_Model
 		}
 	}
 
-	public function get_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
+	public function get_search_suggestions(string $search, array $filters = ['is_deleted' => FALSE, 'search_custom' => FALSE], bool $unique = FALSE, int $limit = 25): array
 	{
 		$suggestions = [];
-		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
+		$non_kit = [ITEM, ITEM_AMOUNT_ENTRY];
 
-		$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name'));
-		$this->db->from('items');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-		$this->db->like('name', $search);
-		$this->db->order_by('name', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select($this->get_search_suggestion_format('item_id, name, pack_name'));
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+		$builder->like('name', $search);//TODO: this and the next 11 lines are duplicated directly below.  We should extract a method here.
+		$builder->orderBy('name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+			$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 		}
 
-		$this->db->select($this->get_search_suggestion_format('item_id, item_number, pack_name'));
-		$this->db->from('items');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-		$this->db->like('item_number', $search);
-		$this->db->order_by('item_number', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select($this->get_search_suggestion_format('item_id, item_number, pack_name'));
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+		$builder->like('item_number', $search);
+		$builder->orderBy('item_number', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+			$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 		}
 
 		if(!$unique)
 		{
 			//Search by category
-			$this->db->select('category');
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->distinct();
-			$this->db->like('category', $search);
-			$this->db->order_by('category', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('items');
+			$builder->select('category');
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->distinct();	//TODO: duplicate code.  Refactor method.
+			$builder->like('category', $search);
+			$builder->orderBy('category', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->category);
+				$suggestions[] = ['label' => $row->category];
 			}
 
+			$builder = $this->db->table('suppliers');
+
 			//Search by supplier
-			$this->db->select('company_name');
-			$this->db->from('suppliers');
-			$this->db->like('company_name', $search);
+			$builder->select('company_name');
+			$builder->like('company_name', $search);
+
 			// restrict to non deleted companies only if is_deleted is FALSE
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->distinct();
-			$this->db->order_by('company_name', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->distinct();
+			$builder->orderBy('company_name', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->company_name);
+				$suggestions[] = ['label' => $row->company_name];
 			}
 
 			//Search by description
-			$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name, description'));
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->like('description', $search);
-			$this->db->order_by('description', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('items');
+			$builder->select($this->get_search_suggestion_format('item_id, name, pack_name, description'));
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->like('description', $search);	//TODO: duplicate code, refactor method.
+			$builder->orderBy('description', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$entry = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+				$entry = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
+
 				if(!array_walk($suggestions, function($value, $label) use ($entry) { return $entry['label'] != $label; } ))
 				{
 					$suggestions[] = $entry;
 				}
 			}
 
-			//Search by custom fields
+			//Search in attributes
 			if($filters['search_custom'] !== FALSE)
 			{
-				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
-				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
-				$this->db->like('attribute_value', $search);
-				$this->db->where('definition_type', TEXT);
-				$this->db->where('deleted', $filters['is_deleted']);
-				$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+				$builder = $this->db->table('attribute_links');
+				$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+				$builder->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
+				$builder->like('attribute_value', $search);
+				$builder->where('definition_type', TEXT);
+				$builder->where('deleted', $filters['is_deleted']);
+				$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
 
-				foreach($this->db->get('attribute_links')->result() as $row)
+				foreach($builder->get()->getResult() as $row)
 				{
-					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+					$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 				}
 			}
 		}
@@ -640,75 +686,81 @@ class Item extends CI_Model
 	}
 
 
-	public function get_stock_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
+	public function get_stock_search_suggestions(string $search, array $filters = ['is_deleted' => FALSE, 'search_custom' => FALSE], bool $unique = FALSE, int $limit = 25): array
 	{
 		$suggestions = [];
-		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
+		$non_kit = [ITEM, ITEM_AMOUNT_ENTRY];
 
-		$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name'));
-		$this->db->from('items');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-		$this->db->where('stock_type', '0'); // stocked items only
-		$this->db->like('name', $search);
-		$this->db->order_by('name', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select($this->get_search_suggestion_format('item_id, name, pack_name'));
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+		$builder->where('stock_type', '0'); // stocked items only
+		$builder->like('name', $search);
+		$builder->orderBy('name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+			$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 		}
 
-		$this->db->select($this->get_search_suggestion_format('item_id, item_number, pack_name'));
-		$this->db->from('items');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-		$this->db->where('stock_type', '0'); // stocked items only
-		$this->db->like('item_number', $search);
-		$this->db->order_by('item_number', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select($this->get_search_suggestion_format('item_id, item_number, pack_name'));
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+		$builder->where('stock_type', '0'); // stocked items only
+		$builder->like('item_number', $search);
+		$builder->orderBy('item_number', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+			$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 		}
 
 		if(!$unique)
 		{
 			//Search by category
-			$this->db->select('category');
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-			$this->db->where('stock_type', '0'); // stocked items only
-			$this->db->distinct();
-			$this->db->like('category', $search);
-			$this->db->order_by('category', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('items');
+			$builder->select('category');
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+			$builder->where('stock_type', '0'); // stocked items only
+			$builder->distinct();
+			$builder->like('category', $search);
+			$builder->orderBy('category', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->category);
+				$suggestions[] = ['label' => $row->category];
 			}
 
 			//Search by supplier
-			$this->db->select('company_name');
-			$this->db->from('suppliers');
-			$this->db->like('company_name', $search);
+			$builder = $this->db->table('suppliers');
+			$builder->select('company_name');
+			$builder->like('company_name', $search);
+
 			// restrict to non deleted companies only if is_deleted is FALSE
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->distinct();
-			$this->db->order_by('company_name', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->distinct();
+			$builder->orderBy('company_name', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->company_name);
+				$suggestions[] = ['label' => $row->company_name];
 			}
 
 			//Search by description
-			$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name, description'));
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
-			$this->db->where('stock_type', '0'); // stocked items only
-			$this->db->like('description', $search);
-			$this->db->order_by('description', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('items');
+			$builder->select($this->get_search_suggestion_format('item_id, name, pack_name, description'));
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->whereIn('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
+			$builder->where('stock_type', '0'); // stocked items only
+			$builder->like('description', $search);	//TODO: duplicated code, refactor method.
+			$builder->orderBy('description', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$entry = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+				$entry = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 				if(!array_walk($suggestions, function($value, $label) use ($entry) { return $entry['label'] != $label; } ))
 				{
 					$suggestions[] = $entry;
@@ -716,18 +768,19 @@ class Item extends CI_Model
 			}
 
 			//Search by custom fields
-			if($filters['search_custom'] !== FALSE)
+			if($filters['search_custom'] !== FALSE)	//TODO: duplicated code.  We should refactor out a method... this can be replaced with `if($filters['search_custom']`... no need for the double negative
 			{
-				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
-				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
-				$this->db->like('attribute_value', $search);
-				$this->db->where('definition_type', TEXT);
-				$this->db->where('stock_type', '0'); // stocked items only
-				$this->db->where('deleted', $filters['is_deleted']);
+				$builder = $this->db->table('attribute_links');
+				$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+				$builder->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
+				$builder->like('attribute_value', $search);
+				$builder->where('definition_type', TEXT);
+				$builder->where('stock_type', '0'); // stocked items only
+				$builder->where('deleted', $filters['is_deleted']);
 
-				foreach($this->db->get('attribute_links')->result() as $row)
+				foreach($builder->get()->getResult() as $row)
 				{
-					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+					$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 				}
 			}
 		}
@@ -741,92 +794,97 @@ class Item extends CI_Model
 		return array_unique($suggestions, SORT_REGULAR);
 	}
 
-	public function get_kit_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
+	public function get_kit_search_suggestions(string $search, array $filters = ['is_deleted' => FALSE, 'search_custom' => FALSE], bool $unique = FALSE, int $limit = 25): array
 	{
 		$suggestions = [];
-		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
+		$non_kit = [ITEM, ITEM_AMOUNT_ENTRY];	//TODO: This variable is never used.
 
-		$this->db->select('item_id, name');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->where('item_type', ITEM_KIT);
-		$this->db->like('name', $search);
-		$this->db->order_by('name', 'asc');
-		foreach($this->db->get('items')->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select('item_id, name');
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->where('item_type', ITEM_KIT);
+		$builder->like('name', $search);
+		$builder->orderBy('name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $row->name);
+			$suggestions[] = ['value' => $row->item_id, 'label' => $row->name];
 		}
 
-		$this->db->select('item_id, item_number');
-		$this->db->from('items');
-		$this->db->where('deleted', $filters['is_deleted']);
-		$this->db->like('item_number', $search);
-		$this->db->where('item_type', ITEM_KIT);
-		$this->db->order_by('item_number', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select('item_id, item_number');
+		$builder->where('deleted', $filters['is_deleted']);
+		$builder->like('item_number', $search);
+		$builder->where('item_type', ITEM_KIT);
+		$builder->orderBy('item_number', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $row->item_number);
+			$suggestions[] = ['value' => $row->item_id, 'label' => $row->item_number];
 		}
 
 		if(!$unique)
 		{
 			//Search by category
-			$this->db->select('category');
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->where('item_type', ITEM_KIT);
-			$this->db->distinct();
-			$this->db->like('category', $search);
-			$this->db->order_by('category', 'asc');
+			$builder = $this->db->table('items');
+			$builder->select('category');
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->where('item_type', ITEM_KIT);
+			$builder->distinct();//TODO: duplicated code, refactor method.
+			$builder->like('category', $search);
+			$builder->orderBy('category', 'asc');
 
-			foreach($this->db->get()->result() as $row)
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->category);
+				$suggestions[] = ['label' => $row->category];
 			}
 
 			//Search by supplier
-			$this->db->select('company_name');
-			$this->db->from('suppliers');
-			$this->db->like('company_name', $search);
+			$builder = $this->db->table('suppliers');
+			$builder->select('company_name');
+			$builder->like('company_name', $search);
 
 			// restrict to non deleted companies only if is_deleted is FALSE
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->distinct();
-			$this->db->order_by('company_name', 'asc');
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->distinct();
+			$builder->orderBy('company_name', 'asc');
 
-			foreach($this->db->get()->result() as $row)
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('label' => $row->company_name);
+				$suggestions[] = ['label' => $row->company_name];
 			}
 
 			//Search by description
-			$this->db->select('item_id, name, description');
-			$this->db->from('items');
-			$this->db->where('deleted', $filters['is_deleted']);
-			$this->db->where('item_type', ITEM_KIT);
-			$this->db->like('description', $search);
-			$this->db->order_by('description', 'asc');
-			foreach($this->db->get()->result() as $row)
+			$builder = $this->db->table('items');
+			$builder->select('item_id, name, description');
+			$builder->where('deleted', $filters['is_deleted']);
+			$builder->where('item_type', ITEM_KIT);
+			$builder->like('description', $search);
+			$builder->orderBy('description', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
 			{
-				$entry = array('value' => $row->item_id, 'label' => $row->name);
+				$entry = ['value' => $row->item_id, 'label' => $row->name];
 				if(!array_walk($suggestions, function($value, $label) use ($entry) { return $entry['label'] != $label; } ))
 				{
 					$suggestions[] = $entry;
 				}
 			}
 
-			//Search by custom fields
-			if($filters['search_custom'] !== FALSE)
+			//Search in attributes
+			if($filters['search_custom'] !== FALSE)	//TODO: Duplicate code... same as above... no double negatives
 			{
-				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
-				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
-				$this->db->like('attribute_value', $search);
-				$this->db->where('definition_type', TEXT);
-				$this->db->where('stock_type', '0'); // stocked items only
-				$this->db->where('deleted', $filters['is_deleted']);
+				$builder = $this->db->table('attribute_links');
+				$builder->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+				$builder->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
+				$builder->like('attribute_value', $search);
+				$builder->where('definition_type', TEXT);
+				$builder->where('stock_type', '0'); // stocked items only
+				$builder->where('deleted', $filters['is_deleted']);
 
-				foreach($this->db->get('attribute_links')->result() as $row)
+				foreach($builder->get()->getResult() as $row)
 				{
-					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+					$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 				}
 			}
 		}
@@ -840,70 +898,74 @@ class Item extends CI_Model
 		return array_unique($suggestions, SORT_REGULAR);
 	}
 
-	public function get_low_sell_suggestions($search)
+	public function get_low_sell_suggestions(string $search): array
 	{
 		$suggestions = [];
 
-		$this->db->select($this->get_search_suggestion_format('item_id, pack_name'));
-		$this->db->from('items');
-		$this->db->where('deleted', '0');
-		$this->db->where('stock_type', '0'); // stocked items only
-		$this->db->like('name', $search);
-		$this->db->order_by('name', 'asc');
-		foreach($this->db->get()->result() as $row)
+		$builder = $this->db->table('items');
+		$builder->select($this->get_search_suggestion_format('item_id, pack_name'));
+		$builder->where('deleted', '0');
+		$builder->where('stock_type', '0'); // stocked items only	//TODO: '0' should be replaced with a constant.
+		$builder->like('name', $search);
+		$builder->orderBy('name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
+			$suggestions[] = ['value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row)];
 		}
 
 		return $suggestions;
 	}
 
-	public function get_category_suggestions($search)
+	public function get_category_suggestions(string $search): array
 	{
 		$suggestions = [];
-		$this->db->distinct();
-		$this->db->select('category');
-		$this->db->from('items');
-		$this->db->like('category', $search);
-		$this->db->where('deleted', 0);
-		$this->db->order_by('category', 'asc');
-		foreach($this->db->get()->result() as $row)
+
+		$builder = $this->db->table('items');
+		$builder->distinct();
+		$builder->select('category');
+		$builder->like('category', $search);
+		$builder->where('deleted', 0);
+		$builder->orderBy('category', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('label' => $row->category);
+			$suggestions[] = ['label' => $row->category];
 		}
 
 		return $suggestions;
 	}
 
-	public function get_location_suggestions($search)
+	public function get_location_suggestions(string $search): array
 	{
 		$suggestions = [];
-		$this->db->distinct();
-		$this->db->select('location');
-		$this->db->from('items');
-		$this->db->like('location', $search);
-		$this->db->where('deleted', 0);
-		$this->db->order_by('location', 'asc');
-		foreach($this->db->get()->result() as $row)
+
+		$builder = $this->db->table('items');
+		$builder->distinct();
+		$builder->select('location');
+		$builder->like('location', $search);
+		$builder->where('deleted', 0);
+		$builder->orderBy('location', 'asc');
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('label' => $row->location);
+			$suggestions[] = ['label' => $row->location];
 		}
 
 		return $suggestions;
 	}
 
-	public function get_categories()
+	public function get_categories()	//TODO: This function is never called in the code.
 	{
-		$this->db->select('category');
-		$this->db->from('items');
-		$this->db->where('deleted', 0);
-		$this->db->distinct();
-		$this->db->order_by('category', 'asc');
+		$builder = $this->db->table('items');
+		$builder->select('category');
+		$builder->where('deleted', 0);
+		$builder->distinct();
+		$builder->orderBy('category', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
+	/**
 	 * changes the cost price of a given item
 	 * calculates the average price between received items and items on stock
 	 * $item_id : the item which price should be changed
@@ -915,7 +977,7 @@ class Item extends CI_Model
 	 * caution: must be used before item_quantities gets updated, otherwise the average price is wrong!
 	 *
 	 */
-	public function change_cost_price($item_id, $items_received, $new_price, $old_price = NULL)
+	public function change_cost_price(int $item_id, float $items_received, float $new_price, float $old_price = NULL): bool
 	{
 		if($old_price === NULL)
 		{
@@ -923,37 +985,40 @@ class Item extends CI_Model
 			$old_price = $item_info->cost_price;
 		}
 
-		$this->db->from('item_quantities');
-		$this->db->select_sum('quantity');
-		$this->db->where('item_id', $item_id);
-		$this->db->join('stock_locations', 'stock_locations.location_id=item_quantities.location_id');
-		$this->db->where('stock_locations.deleted', 0);
-		$old_total_quantity = $this->db->get()->row()->quantity;
+		$builder = $this->db->table('item_quantities');
+		$builder->selectSum('quantity');
+		$builder->where('item_id', $item_id);
+		$builder->join('stock_locations', 'stock_locations.location_id=item_quantities.location_id');
+		$builder->where('stock_locations.deleted', 0);
+		$old_total_quantity = $builder->get()->getRow()->quantity;
 
 		$total_quantity = $old_total_quantity + $items_received;
-		$average_price = bcdiv(bcadd(bcmul($items_received, $new_price), bcmul($old_total_quantity, $old_price)), $total_quantity);
+		$average_price = bcdiv(bcadd(bcmul((string)$items_received, (string)$new_price), bcmul((string)$old_total_quantity, (string)$old_price)), (string)$total_quantity);
 
-		$data = array('cost_price' => $average_price);
+		$data = ['cost_price' => $average_price];
 
-		return $this->save($data, $item_id);
+		return $this->save_value($data, $item_id);
 	}
 
-	public function update_item_number($item_id, $item_number)
+	public function update_item_number(int $item_id, string $item_number): void
 	{
-		$this->db->where('item_id', $item_id);
-		$this->db->update('items', array('item_number'=>$item_number));
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
+		$builder->update(['item_number' => $item_number]);	//TODO: this function should probably return the result of update() and add ": bool" to the function signature
 	}
 
-	public function update_item_name($item_id, $item_name)
+	public function update_item_name(int $item_id, string $item_name): void	//TODO: this function should probably return the result of update() and add ": bool" to the function signature
 	{
-		$this->db->where('item_id', $item_id);
-		$this->db->update('items', array('name'=>$item_name));
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
+		$builder->update(['name' => $item_name]);
 	}
 
-	public function update_item_description($item_id, $item_description)
+	public function update_item_description(int $item_id, string $item_description): void	//TODO: this function should probably return the result of update() and add ": bool" to the function signature
 	{
-		$this->db->where('item_id', $item_id);
-		$this->db->update('items', array('description'=>$item_description));
+		$builder = $this->db->table('items');
+		$builder->where('item_id', $item_id);
+		$builder->update(['description' => $item_description]);
 	}
 
 	/**
@@ -961,9 +1026,9 @@ class Item extends CI_Model
 	 * for a multipack environment then the item name should have the
 	 * pack appended to it
 	 */
-	function get_item_name($as_name = NULL)
+	function get_item_name(string $as_name = NULL): string
 	{
-		if($as_name == NULL)
+		if($as_name == NULL)	//TODO: Replace with ternary notation
 		{
 			$as_name = '';
 		}
@@ -972,7 +1037,7 @@ class Item extends CI_Model
 			$as_name = ' AS ' . $as_name;
 		}
 
-		if($this->config->item('multi_pack_enabled') == '1')
+		if(config('OSPOS')->multi_pack_enabled)	//TODO: Replace with ternary notation
 		{
 			$item_name = "concat(items.name,'" . NAME_SEPARATOR . '\', items.pack_name)' . $as_name;
 		}
@@ -980,7 +1045,7 @@ class Item extends CI_Model
 		{
 			$item_name = 'items.name' . $as_name;
 		}
+
 		return $item_name;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Item_kit.php b/app/Models/Item_kit.php
index 41bfdcabd..008ceca66 100644
--- a/app/Models/Item_kit.php
+++ b/app/Models/Item_kit.php
@@ -1,33 +1,38 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Item_kit class
  */
-
-class Item_kit extends CI_Model
+class Item_kit extends Model
 {
-	/*
-	Determines if a given item_id is an item kit
-	*/
-	public function exists($item_kit_id)
+	/**
+	 * Determines if a given item_id is an item kit
+	 */
+	public function exists(int $item_kit_id): bool
 	{
-		$this->db->from('item_kits');
-		$this->db->where('item_kit_id', $item_kit_id);
+		$builder = $this->db->table('item_kits');
+		$builder->where('item_kit_id', $item_kit_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	/*
-	Check if a given item_id is an item kit
-	*/
-	public function is_valid_item_kit($item_kit_id)
+	/**
+	 * Check if a given item_id is an item kit
+	 */
+	public function is_valid_item_kit(int $item_kit_id): bool
 	{
 		if(!empty($item_kit_id))
 		{
 			//KIT #
 			$pieces = explode(' ', $item_kit_id);
 
-			if(count($pieces) == 2 && preg_match('/(KIT)/i', $pieces[0]))
+			if((count($pieces) == 2) && preg_match('/(KIT)/i', $pieces[0]))	//TODO: === ... perhaps think about converting this to ternary notation
 			{
 				return $this->exists($pieces[1]);
 			}
@@ -40,78 +45,81 @@ class Item_kit extends CI_Model
 		return FALSE;
 	}
 
-	/*
-	Determines if a given item_number exists
-	*/
-	public function item_number_exists($item_kit_number, $item_kit_id = '')
+	/**
+	 * Determines if a given item_number exists
+	 */
+	public function item_number_exists(string $item_kit_number, string $item_kit_id = ''): bool
 	{
-		if($this->config->item('allow_duplicate_barcodes') != FALSE)
+		if(config('OSPOS')->allow_duplicate_barcodes)
 		{
 			return FALSE;
 		}
 
-		$this->db->where('item_kit_number', (string) $item_kit_number);
+		$builder = $this->db->table('item_kits');
+		$builder->where('item_kit_number', $item_kit_number);
+
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
 		if(ctype_digit($item_kit_id) && substr($item_kit_id, 0, 1) !== '0')
 		{
-			$this->db->where('item_kit_id !=', (int) $item_kit_id);
+			$builder->where('item_kit_id !=', (int) $item_kit_id);
 		}
 
-		return ($this->db->get('item_kits')->num_rows() >= 1);
+		return ($builder->get()->getNumRows() >= 1);
 	}
 
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
 	{
-		$this->db->from('item_kits');
+		$builder = $this->db->table('item_kits');
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/*
-	Gets information about a particular item kit
-	*/
-	public function get_info($item_kit_id)
+	/**
+	 * Gets information about a particular item kit
+	 */
+	public function get_info(int $item_kit_id): object
 	{
-		$this->db->select('
-		item_kit_id,
-		item_kits.name as name,
-		item_kit_number,
-		items.name as item_name,
-		item_kits.description,
-		items.description as item_description,
-		item_kits.item_id as kit_item_id,
-		kit_discount,
-		kit_discount_type,
-		price_option,
-		print_option,
-		category,
-		supplier_id,
-		item_number,
-		cost_price,
-		unit_price,
-		reorder_level,
-		receiving_quantity,
-		pic_filename,
-		allow_alt_description,
-		is_serialized,
-		items.deleted,
-		item_type,
-		stock_type');
+		$builder = $this->db->table('item_kits');
+		$builder->select('
+			item_kit_id,
+			item_kits.name as name,
+			item_kit_number,
+			items.name as item_name,
+			item_kits.description,
+			items.description as item_description,
+			item_kits.item_id as kit_item_id,
+			kit_discount,
+			kit_discount_type,
+			price_option,
+			print_option,
+			category,
+			supplier_id,
+			item_number,
+			cost_price,
+			unit_price,
+			reorder_level,
+			receiving_quantity,
+			pic_filename,
+			allow_alt_description,
+			is_serialized,
+			items.deleted,
+			item_type,
+			stock_type
+		');
 
-		$this->db->from('item_kits');
-		$this->db->join('items', 'item_kits.item_id = items.item_id', 'left');
-		$this->db->where('item_kit_id', $item_kit_id);
-		$this->db->or_where('item_kit_number', $item_kit_id);
+		$builder->join('items', 'item_kits.item_id = items.item_id', 'left');
+		$builder->where('item_kit_id', $item_kit_id);
+		$builder->orWhere('item_kit_number', $item_kit_id);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows()==1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -119,7 +127,7 @@ class Item_kit extends CI_Model
 			$item_obj = new stdClass();
 
 			//Get all the fields from items table
-			foreach($this->db->list_fields('item_kits') as $field)
+			foreach($this->db->getFieldNames('item_kits') as $field)
 			{
 				$item_obj->$field = '';
 			}
@@ -128,28 +136,29 @@ class Item_kit extends CI_Model
 		}
 	}
 
-	/*
-	Gets information about multiple item kits
-	*/
-	public function get_multiple_info($item_kit_ids)
+	/**
+	 * Gets information about multiple item kits
+	 */
+	public function get_multiple_info(array $item_kit_ids): ResultInterface
 	{
-		$this->db->from('item_kits');
-		$this->db->where_in('item_kit_id', $item_kit_ids);
-		$this->db->order_by('name', 'asc');
+		$builder = $this->db->table('item_kits');
+		$builder->whereIn('item_kit_id', $item_kit_ids);
+		$builder->orderBy('name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	/*
-	Inserts or updates an item kit
-	*/
-	public function save(&$item_kit_data, $item_kit_id = FALSE)
+	/**
+	 * Inserts or updates an item kit
+	 */
+	public function save_value(array &$item_kit_data, bool $item_kit_id = FALSE): bool
 	{
+		$builder = $this->db->table('item_kits');
 		if(!$item_kit_id || !$this->exists($item_kit_id))
 		{
-			if($this->db->insert('item_kits', $item_kit_data))
+			if($builder->insert($item_kit_data))
 			{
-				$item_kit_data['item_kit_id'] = $this->db->insert_id();
+				$item_kit_data['item_kit_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -157,55 +166,58 @@ class Item_kit extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('item_kit_id', $item_kit_id);
+		$builder->where('item_kit_id', $item_kit_id);
 
-		return $this->db->update('item_kits', $item_kit_data);
+		return $builder->update($item_kit_data);
 	}
 
-	/*
-	Deletes one item kit
-	*/
-	public function delete($item_kit_id)
+	/**
+	 * Deletes one item kit
+	 */
+	public function delete(int $item_kit_id = null, bool $purge = false): bool
 	{
-		return $this->db->delete('item_kits', array('item_kit_id' => $item_kit_id));
+		$builder = $this->db->table('item_kits');
+
+		return $builder->delete(['item_kit_id' => $item_kit_id]);
 	}
 
-	/*
-	Deletes a list of item kits
-	*/
-	public function delete_list($item_kit_ids)
+	/**
+	 * Deletes a list of item kits
+	 */
+	public function delete_list(array $item_kit_ids): bool
 	{
-		$this->db->where_in('item_kit_id', $item_kit_ids);
+		$builder = $this->db->table('item_kits');
+		$builder->whereIn('item_kit_id', $item_kit_ids);
 
-		return $this->db->delete('item_kits');
+		return $builder->delete();
 	}
 
-	public function get_search_suggestions($search, $limit = 25)
+	public function get_search_suggestions(string $search, int $limit = 25): array
 	{
-		$suggestions = array();
+		$suggestions = [];
 
-		$this->db->from('item_kits');
+		$builder = $this->db->table('item_kits');
 
 		//KIT #
 		if(stripos($search, 'KIT ') !== FALSE)
 		{
-			$this->db->like('item_kit_id', str_ireplace('KIT ', '', $search));
-			$this->db->order_by('item_kit_id', 'asc');
+			$builder->like('item_kit_id', str_ireplace('KIT ', '', $search));
+			$builder->orderBy('item_kit_id', 'asc');
 
-			foreach($this->db->get()->result() as $row)
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => 'KIT '. $row->item_kit_id, 'label' => 'KIT ' . $row->item_kit_id);
+				$suggestions[] = ['value' => 'KIT '. $row->item_kit_id, 'label' => 'KIT ' . $row->item_kit_id];
 			}
 		}
 		else
 		{
-			$this->db->like('name', $search);
-			$this->db->or_like('item_kit_number', $search);
-			$this->db->order_by('name', 'asc');
+			$builder->like('name', $search);
+			$builder->orLike('item_kit_number', $search);
+			$builder->orderBy('name', 'asc');
 
-			foreach($this->db->get()->result() as $row)
+			foreach($builder->get()->getResult() as $row)
 			{
-				$suggestions[] = array('value' => 'KIT ' . $row->item_kit_id, 'label' => $row->name);
+				$suggestions[] = ['value' => 'KIT ' . $row->item_kit_id, 'label' => $row->name];
 			}
 		}
 
@@ -218,50 +230,50 @@ class Item_kit extends CI_Model
 		return $suggestions;
 	}
 
- 	/*
-	Gets rows
-	*/
-	public function get_found_rows($search)
+ 	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'name', 'asc', TRUE);
 	}
 
-	/*
-	Perform a search on items
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'name', $order = 'asc', $count_only = FALSE)
+	/**
+	 * Perform a search on items
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
+		$builder = $this->db->table('item_kits AS item_kits');	//TODO: Can we just say 'item_kits' here?
+
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			$this->db->select('COUNT(item_kits.item_kit_id) as count');
+			$builder->select('COUNT(item_kits.item_kit_id) as count');
 		}
 
-		$this->db->from('item_kits AS item_kits');
-		$this->db->like('name', $search);
-		$this->db->or_like('description', $search);
-		$this->db->or_like('item_kit_number', $search);
+		$builder->like('name', $search);
+		$builder->orLike('description', $search);
+		$builder->orLike('item_kit_number', $search);
 
 		//KIT #
 		if(stripos($search, 'KIT ') !== FALSE)
 		{
-			$this->db->or_like('item_kit_id', str_ireplace('KIT ', '', $search));
+			$builder->orLike('item_kit_id', str_ireplace('KIT ', '', $search));
 		}
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Item_kit_items.php b/app/Models/Item_kit_items.php
index cd47e4b76..7ccbcae5b 100644
--- a/app/Models/Item_kit_items.php
+++ b/app/Models/Item_kit_items.php
@@ -1,76 +1,81 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
 
 /**
  * Item_kit_items class
  */
-
-class Item_kit_items extends CI_Model
+class Item_kit_items extends Model
 {
-	/*
-	Gets item kit items for a particular item kit
-	*/
-	public function get_info($item_kit_id)
+	/**
+	 * Gets item kit items for a particular item kit
+	 */
+	public function get_info(int $item_kit_id): array
 	{
-		$this->db->select('item_kits.item_kit_id, item_kit_items.item_id, quantity, kit_sequence, unit_price, item_type, stock_type');
-		$this->db->from('item_kit_items as item_kit_items');
-		$this->db->join('items as items', 'item_kit_items.item_id = items.item_id');
-		$this->db->join('item_kits as item_kits', 'item_kits.item_kit_id = item_kit_items.item_kit_id');
-		$this->db->where('item_kits.item_kit_id', $item_kit_id);
-		$this->db->or_where('item_kit_number', $item_kit_id);
-		$this->db->order_by('kit_sequence', 'asc');
+		$builder = $this->db->table('item_kit_items as item_kit_items');
+		$builder->select('item_kits.item_kit_id, item_kit_items.item_id, quantity, kit_sequence, unit_price, item_type, stock_type');
+		$builder->join('items as items', 'item_kit_items.item_id = items.item_id');
+		$builder->join('item_kits as item_kits', 'item_kits.item_kit_id = item_kit_items.item_kit_id');
+		$builder->where('item_kits.item_kit_id', $item_kit_id);
+		$builder->orWhere('item_kit_number', $item_kit_id);
+		$builder->orderBy('kit_sequence', 'asc');
 
 		//return an array of item kit items for an item
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	/*
-	Gets item kit items for a particular item kit
-	*/
-	public function get_info_for_sale($item_kit_id)
+	/**
+	 * Gets item kit items for a particular item kit
+	 */
+	public function get_info_for_sale(int $item_kit_id): array	//TODO: This function does not seem to be called anywhere in the code
 	{
-		$this->db->from('item_kit_items');
-		$this->db->where('item_kit_id', $item_kit_id);
+		$builder = $this->db->table('item_kit_items');
+		$builder->where('item_kit_id', $item_kit_id);
 
-		$this->db->order_by('kit_sequence', 'desc');
+		$builder->orderBy('kit_sequence', 'desc');
 
 		//return an array of item kit items for an item
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
-	/*
-	Inserts or updates an item kit's items
-	*/
-	public function save(&$item_kit_items_data, $item_kit_id)
+
+	/**
+	 * Inserts or updates an item kit's items
+	 */
+	public function save_value(array &$item_kit_items_data, int $item_kit_id): bool
 	{
 		$success = TRUE;
 
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		$this->delete($item_kit_id);
 
 		if($item_kit_items_data != NULL)
 		{
+			$builder = $this->db->table('item_kit_items');
+
 			foreach($item_kit_items_data as $row)
 			{
 				$row['item_kit_id'] = $item_kit_id;
-				$success &= $this->db->insert('item_kit_items', $row);
+				$success &= $builder->insert($row);
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Deletes item kit items given an item kit
-	*/
-	public function delete($item_kit_id)
+	/**
+	 * Deletes item kit items given an item kit
+	 */
+	public function delete(int $item_kit_id = null, bool $purge = false): bool
 	{
-		return $this->db->delete('item_kit_items', array('item_kit_id' => $item_kit_id));
+		$builder = $this->db->table('item_kit_items');
+
+		return $builder->delete(['item_kit_id' => $item_kit_id]);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Item_quantity.php b/app/Models/Item_quantity.php
index 403452327..5564e362c 100644
--- a/app/Models/Item_quantity.php
+++ b/app/Models/Item_quantity.php
@@ -1,46 +1,53 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Item_quantity class
  */
-
-class Item_quantity extends CI_Model
+class Item_quantity extends Model
 {
-    public function exists($item_id, $location_id)
+    public function exists(int $item_id, int $location_id): bool
     {
-        $this->db->from('item_quantities');
-        $this->db->where('item_id', $item_id);
-        $this->db->where('location_id', $location_id);
+        $builder = $this->db->table('item_quantities');
+        $builder->where('item_id', $item_id);
+        $builder->where('location_id', $location_id);
 
-        return ($this->db->get()->num_rows() == 1);
+        return ($builder->get()->getNumRows() == 1);	//TODO: ===
     }
 
-    public function save($location_detail, $item_id, $location_id)
+    public function save_value(array $location_detail, int $item_id, int $location_id): bool
     {
         if(!$this->exists($item_id, $location_id))
         {
-            return $this->db->insert('item_quantities', $location_detail);
+			$builder = $this->db->table('item_quantities');
+        	return $builder->insert($location_detail);
         }
 
-        $this->db->where('item_id', $item_id);
-        $this->db->where('location_id', $location_id);
+		$builder = $this->db->table('item_quantities');
+        $builder->where('item_id', $item_id);
+        $builder->where('location_id', $location_id);
 
-        return $this->db->update('item_quantities', $location_detail);
+        return $builder->update($location_detail);
     }
 
-    public function get_item_quantity($item_id, $location_id)
+    public function get_item_quantity(int $item_id, int $location_id)
     {
-        $this->db->from('item_quantities');
-        $this->db->where('item_id', $item_id);
-        $this->db->where('location_id', $location_id);
-        $result = $this->db->get()->row();
+        $builder = $this->db->table('item_quantities');
+        $builder->where('item_id', $item_id);
+        $builder->where('location_id', $location_id);
+        $result = $builder->get()->getRow();
+
         if(empty($result) == TRUE)
         {
             //Get empty base parent object, as $item_id is NOT an item
             $result = new stdClass();
 
-            //Get all the fields from items table (TODO to be reviewed)
-            foreach($this->db->list_fields('item_quantities') as $field)
+            //Get all the fields from items table (TODO: to be reviewed)
+            foreach($this->db->getFieldNames('item_quantities') as $field)
             {
                 $result->$field = '';
             }
@@ -51,38 +58,39 @@ class Item_quantity extends CI_Model
         return $result;
     }
 
-	/*
+	/**
 	 * changes to quantity of an item according to the given amount.
 	 * if $quantity_change is negative, it will be subtracted,
 	 * if it is positive, it will be added to the current quantity
 	 */
-	public function change_quantity($item_id, $location_id, $quantity_change)
+	public function change_quantity(int $item_id, int $location_id, int $quantity_change): bool
 	{
 		$quantity_old = $this->get_item_quantity($item_id, $location_id);
 		$quantity_new = $quantity_old->quantity + $quantity_change;
-		$location_detail = array('item_id' => $item_id, 'location_id' => $location_id, 'quantity' => $quantity_new);
+		$location_detail = ['item_id' => $item_id, 'location_id' => $location_id, 'quantity' => $quantity_new];
 
-		return $this->save($location_detail, $item_id, $location_id);
+		return $this->save_value($location_detail, $item_id, $location_id);
 	}
 
-	/*
-	* Set to 0 all quantity in the given item
-	*/
-	public function reset_quantity($item_id)
+	/**
+	 * Set to 0 all quantity in the given item
+	 */
+	public function reset_quantity(int $item_id): bool
 	{
-        $this->db->where('item_id', $item_id);
+		$builder = $this->db->table('item_quantities');
+		$builder->where('item_id', $item_id);
 
-        return $this->db->update('item_quantities', array('quantity' => 0));
+        return $builder->update(['quantity' => 0]);
 	}
 
-	/*
-	* Set to 0 all quantity in the given list of items
-	*/
-	public function reset_quantity_list($item_ids)
+	/**
+	 * Set to 0 all quantity in the given list of items
+	 */
+	public function reset_quantity_list(array $item_ids): bool
 	{
-        $this->db->where_in('item_id', $item_ids);
+		$builder = $this->db->table('item_quantities');
+		$builder->whereIn('item_id', $item_ids);
 
-        return $this->db->update('item_quantities', array('quantity' => 0));
+        return $builder->update(['quantity' => 0]);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Item_taxes.php b/app/Models/Item_taxes.php
index 49e6598f3..4eed703f4 100644
--- a/app/Models/Item_taxes.php
+++ b/app/Models/Item_taxes.php
@@ -1,82 +1,90 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
 
 /**
  * Item_taxes class
  */
-
-class Item_taxes extends CI_Model
+class Item_taxes extends Model
 {
-	/*
-	Gets tax info for a particular item
-	*/
-	public function get_info($item_id)
+	/**
+	 * Gets tax info for a particular item
+	 */
+	public function get_info(int $item_id): array
 	{
-		$this->db->from('items_taxes');
-		$this->db->where('item_id',$item_id);
+		$builder = $this->db->table('items_taxes');
+		$builder->where('item_id', $item_id);
 
 		//return an array of taxes for an item
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	/*
-	Inserts or updates an item's taxes
-	*/
-	public function save(&$items_taxes_data, $item_id)
+	/**
+	 * Inserts or updates an item's taxes
+	 */
+	public function save_value(array &$items_taxes_data, int $item_id): bool
 	{
 		$success = TRUE;
 
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		$this->delete($item_id);
 
+		$builder = $this->db->table('items_taxes');
+
 		foreach($items_taxes_data as $row)
 		{
 			$row['item_id'] = $item_id;
-			$success &= $this->db->insert('items_taxes', $row);
+			$success &= $builder->insert($row);
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Saves taxes for multiple items
-	*/
-	public function save_multiple(&$items_taxes_data, $item_ids)
+	/**
+	 * Saves taxes for multiple items
+	 */
+	public function save_multiple(array &$items_taxes_data, string $item_ids): bool	//TODO: investigate why this is sent as a : delimited string rather than an array.
 	{
 		$success = TRUE;
 
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		foreach(explode(':', $item_ids) as $item_id)
 		{
 			$this->delete($item_id);
 
+			$builder = $this->db->table('items_taxes');
+
 			foreach($items_taxes_data as $row)
 			{
 				$row['item_id'] = $item_id;
-				$success &= $this->db->insert('items_taxes', $row);
+				$success &= $builder->insert($row);
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		$success &= $this->db->trans_status();
+		$success &= $this->db->transStatus();
 
 		return $success;
 	}
 
-	/*
-	Deletes taxes given an item
-	*/
-	public function delete($item_id)
+	/**
+	 * Deletes taxes given an item
+	 */
+	public function delete(int $item_id = null, bool $purge = false): bool
 	{
-		return $this->db->delete('items_taxes', array('item_id' => $item_id));
+		$builder = $this->db->table('items_taxes');
+
+		return $builder->delete(['item_id' => $item_id]);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Module.php b/app/Models/Module.php
index c4a916863..8e61cc686 100644
--- a/app/Models/Module.php
+++ b/app/Models/Module.php
@@ -1,101 +1,106 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
 
 /**
  * Module class
  */
-
-class Module extends CI_Model
+class Module extends Model
 {
-	function __construct()
+	public function get_module_name(string $module_id): string
 	{
-		parent::__construct();
-	}
+		$builder = $this->db->table('modules');
+		$query = $builder->getWhere(['module_id' => $module_id], 1);
 
-	public function get_module_name($module_id)
-	{
-		$query = $this->db->get_where('modules', array('module_id' => $module_id), 1);
-
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			$row = $query->row();
+			$row = $query->getRow();
 
-			return $this->lang->line($row->name_lang_key);
+			return lang($row->name_lang_key);
 		}
 
-		return $this->lang->line('error_unknown');
+		return lang('Error.unknown');
 	}
 
-	public function get_module_desc($module_id)
+	public function get_module_desc(string $module_id): string	//TODO: This method doesn't seem to be called in the code.  Is it needed?  Also, probably should change the name to get_module_description()
 	{
-		$query = $this->db->get_where('modules', array('module_id' => $module_id), 1);
+		$builder = $this->db->table('modules');
+		$query = $builder->getWhere(['module_id' => $module_id], 1);
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			$row = $query->row();
+			$row = $query->getRow();
 
-			return $this->lang->line($row->desc_lang_key);
+			return lang($row->desc_lang_key);
 		}
 
-		return $this->lang->line('error_unknown');
+		return lang('Error.unknown');
 	}
 
-	public function get_all_permissions()
+	public function get_all_permissions(): ResultInterface
 	{
-		$this->db->from('permissions');
+		$builder = $this->db->table('permissions');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_all_subpermissions()
+	public function get_all_subpermissions(): ResultInterface
 	{
-		$this->db->from('permissions');
-		$this->db->join('modules AS modules', 'modules.module_id = permissions.module_id');
+		$builder = $this->db->table('permissions');
+		$builder->join('modules AS modules', 'modules.module_id = permissions.module_id');	//TODO: can the table parameter just be modules instead of modules AS modules?
+
 		// can't quote the parameters correctly when using different operators..
-		$this->db->where('modules.module_id != ', 'permission_id', FALSE);
+		$builder->where('modules.module_id != ', 'permission_id', FALSE);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_all_modules()
+	public function get_all_modules(): ResultInterface
 	{
-		$this->db->from('modules');
-		$this->db->order_by('sort', 'asc');
-		return $this->db->get();
+		$builder = $this->db->table('modules');
+		$builder->orderBy('sort', 'asc');
+
+		return $builder->get();
 	}
 
-	public function get_allowed_home_modules($person_id)
+	public function get_allowed_home_modules(int $person_id): ResultInterface
 	{
-		$menus = array('home', 'both');
-		$this->db->from('modules');
-		$this->db->join('permissions', 'permissions.permission_id = modules.module_id');
-		$this->db->join('grants', 'permissions.permission_id = grants.permission_id');
-		$this->db->where('person_id', $person_id);
-		$this->db->where_in('menu_group', $menus);
-		$this->db->where('sort !=', 0);
-		$this->db->order_by('sort', 'asc');
-		return $this->db->get();
+		$menus = ['home', 'both'];
+		$builder = $this->db->table('modules');	//TODO: this is duplicated with the code below... probably refactor a method and just pass through whether home/office modules are needed.
+		$builder->join('permissions', 'permissions.permission_id = modules.module_id');
+		$builder->join('grants', 'permissions.permission_id = grants.permission_id');
+		$builder->where('person_id', $person_id);
+		$builder->whereIn('menu_group', $menus);
+		$builder->where('sort !=', 0);
+		$builder->orderBy('sort', 'asc');
+
+		return $builder->get();
 	}
 
-	public function get_allowed_office_modules($person_id)
+	public function get_allowed_office_modules(int $person_id): ResultInterface
 	{
-		$menus = array('office', 'both');
-		$this->db->from('modules');
-		$this->db->join('permissions', 'permissions.permission_id = modules.module_id');
-		$this->db->join('grants', 'permissions.permission_id = grants.permission_id');
-		$this->db->where('person_id', $person_id);
-		$this->db->where_in('menu_group', $menus);
-		$this->db->where('sort !=', 0);
-		$this->db->order_by('sort', 'asc');
-		return $this->db->get();
+		$menus = ['office', 'both'];
+		$builder = $this->db->table('modules');	//TODO: Duplicated code
+		$builder->join('permissions', 'permissions.permission_id = modules.module_id');
+		$builder->join('grants', 'permissions.permission_id = grants.permission_id');
+		$builder->where('person_id', $person_id);
+		$builder->whereIn('menu_group', $menus);
+		$builder->where('sort !=', 0);
+		$builder->orderBy('sort', 'asc');
+
+		return $builder->get();
 	}
 
 	/**
 	 * This method is used to set the show the office navigation icon on the home page
 	 * which happens when the sort value is greater than zero
 	 */
-	public function set_show_office_group($show_office_group)
+	public function set_show_office_group(bool $show_office_group): void	//TODO: Should we return the value of update() as a bool for consistency?
 	{
-		if($show_office_group)
+		if($show_office_group)	//TODO: This should be replaced with ternary notation
 		{
 			$sort = 999;
 		}
@@ -104,24 +109,23 @@ class Module extends CI_Model
 			$sort = 0;
 		}
 
-		$modules_data = array(
-			'sort' => $sort
-		);
-		$this->db->where('module_id', 'office');
-		$this->db->update('modules', $modules_data);
+		$modules_data = ['sort' => $sort];
+
+		$builder = $this->db->table('modules');
+		$builder->where('module_id', 'office');
+		$builder->update($modules_data);
 	}
 
 	/**
 	 * This method is used to show the office navigation icon on the home page
 	 * which happens when the sort value is greater than zero
 	 */
-	public function get_show_office_group()
+	public function get_show_office_group(): int
 	{
-		$this->db->select('sort');
-		$this->db->from('grants');
-		$this->db->where('module_id', 'office');
-		$this->db->from('modules');
-		return $this->db->get()->row()->sort;
+		$builder = $this->db->table('modules');
+		$builder->select('sort');
+		$builder->where('module_id', 'office');
+
+		return $builder->get()->getRow()->sort;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Person.php b/app/Models/Person.php
index cf5c773ae..2afeb09a6 100644
--- a/app/Models/Person.php
+++ b/app/Models/Person.php
@@ -1,10 +1,15 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Base class for People classes
  */
-
-class Person extends CI_Model
+class Person extends Model
 {
 	/**
 	 * Determines whether the given person exists in the people database table
@@ -13,31 +18,28 @@ class Person extends CI_Model
 	 *
 	 * @return boolean TRUE if the person exists, FALSE if not
 	 */
-	public function exists($person_id)
+	public function exists(int $person_id): bool
 	{
-		$this->db->from('people');
-		$this->db->where('people.person_id', $person_id);
+		$builder = $this->db->table('people');
+		$builder->where('people.person_id', $person_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Gets all people from the database table
 	 *
 	 * @param integer $limit limits the query return rows
-	 *
 	 * @param integer $offset offset the query
-	 *
-	 * @return array array of people table rows
 	 */
-	public function get_all($limit = 10000, $offset = 0)
+	public function get_all(int $limit = 10000, int $offset = 0): ResultInterface
 	{
-		$this->db->from('people');
-		$this->db->order_by('last_name', 'asc');
-		$this->db->limit($limit);
-		$this->db->offset($offset);
+		$builder = $this->db->table('people');
+		$builder->orderBy('last_name', 'asc');
+		$builder->limit($limit);
+		$builder->offset($offset);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
@@ -45,12 +47,12 @@ class Person extends CI_Model
 	 *
 	 * @return integer row counter
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('people');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('people');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
@@ -58,22 +60,23 @@ class Person extends CI_Model
 	 *
 	 * @param integer $person_id identifier of the person
 	 *
-	 * @return array containing all the fields of the table row
+	 * @return object containing all the fields of the table row
 	 */
-	public function get_info($person_id)
+	public function get_info(int $person_id): object
 	{
-		$query = $this->db->get_where('people', array('person_id' => $person_id), 1);
+		$builder = $this->db->table('people');
+		$query = $builder->getWhere(['person_id' => $person_id], 1);
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
 			//create object with empty properties.
-			$person_obj = new stdClass;
+			$person_obj = new stdClass();
 
-			foreach($this->db->list_fields('people') as $field)
+			foreach($this->db->getFieldNames('people') as $field)
 			{
 				$person_obj->$field = '';
 			}
@@ -87,33 +90,32 @@ class Person extends CI_Model
 	 *
 	 * @param array $person_ids array of people identifiers
 	 *
-	 * @return array containing all the fields of the table row
 	 */
-	public function get_multiple_info($person_ids)
+	public function get_multiple_info(array $person_ids): ResultInterface
 	{
-		$this->db->from('people');
-		$this->db->where_in('person_id', $person_ids);
-		$this->db->order_by('last_name', 'asc');
+		$builder = $this->db->table('people');
+		$builder->whereIn('person_id', $person_ids);
+		$builder->orderBy('last_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Inserts or updates a person
 	 *
 	 * @param array $person_data array containing person information
-	 *
-	 * @param var $person_id identifier of the person to update the information
-	 *
+	 * @param bool $person_id identifier of the person to update the information
 	 * @return boolean TRUE if the save was successful, FALSE if not
 	 */
-	public function save(&$person_data, $person_id = FALSE)
+	public function save_value(array &$person_data, bool $person_id = FALSE): bool
 	{
+		$builder = $this->db->table('people');
+
 		if(!$person_id || !$this->exists($person_id))
 		{
-			if($this->db->insert('people', $person_data))
+			if($builder->insert($person_data))
 			{
-				$person_data['person_id'] = $this->db->insert_id();
+				$person_data['person_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -121,40 +123,40 @@ class Person extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('person_id', $person_id);
+		$builder->where('person_id', $person_id);
 
-		return $this->db->update('people', $person_data);
+		return $builder->update($person_data);
 	}
 
 	/**
 	 * Get search suggestions to find person
 	 *
 	 * @param string $search string containing the term to search in the people table
-	 *
-	 * @param integer $limit limit the search
-	 *
+	 * @param int $limit limit the search
 	 * @return array array with the suggestion strings
 	 */
-	public function get_search_suggestions($search, $limit = 25)
+	public function get_search_suggestions(string $search, int $limit = 25): array
 	{
-		$suggestions = array();
+		$suggestions = [];
 
-//		$this->db->select('person_id');
-//		$this->db->from('people');
-//		$this->db->where('deleted', 0);
-//		$this->db->where('person_id', $search);
-//		$this->db->group_start();
-//			$this->db->like('first_name', $search);
-//			$this->db->or_like('last_name', $search);
-//			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-//			$this->db->or_like('email', $search);
-//			$this->db->or_like('phone_number', $search);
-//			$this->db->group_end();
-//		$this->db->order_by('last_name', 'asc');
+		$builder = $this->db->table('people');
 
-		foreach($this->db->get()->result() as $row)
+//TODO: If this won't be added back into the code later, we should delete this commented section of code
+//		$builder->select('person_id');
+//		$builder->where('deleted', 0);
+//		$builder->where('person_id', $search);
+//		$builder->groupStart();
+//			$builder->like('first_name', $search);
+//			$builder->orLike('last_name', $search);
+//			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+//			$builder->orLike('email', $search);
+//			$builder->orLike('phone_number', $search);
+//			$builder->groupEnd();
+//		$builder->orderBy('last_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('label' => $row->person_id);
+			$suggestions[] = ['label' => $row->person_id];
 		}
 
 		//only return $limit suggestions
@@ -169,11 +171,10 @@ class Person extends CI_Model
 	/**
 	 * Deletes one Person (dummy base function)
 	 *
-	 * @param integer $person_id person identificator
-	 *
+	 * @param integer $person_id person identifier
 	 * @return boolean always TRUE
 	 */
-	public function delete($person_id)
+	public function delete($person_id = null, bool $purge = false): bool
 	{
 		return TRUE;
 	}
@@ -181,13 +182,11 @@ class Person extends CI_Model
 	/**
 	 * Deletes a list of people (dummy base function)
 	 *
-	 * @param array $person_ids list of person identificators
-	 *
+	 * @param array $person_ids list of person identifiers
 	 * @return boolean always TRUE
 	 */
-	public function delete_list($person_ids)
+	public function delete_list(array $person_ids): bool
 	{
 		return TRUE;
  	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Receiving.php b/app/Models/Receiving.php
index 6705d0fb7..b383892be 100644
--- a/app/Models/Receiving.php
+++ b/app/Models/Receiving.php
@@ -1,293 +1,334 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Receiving class
- */
-
-class Receiving extends CI_Model
-{
-	public function get_info($receiving_id)
-	{
-		$this->db->from('receivings');
-		$this->db->join('people', 'people.person_id = receivings.supplier_id', 'LEFT');
-		$this->db->join('suppliers', 'suppliers.person_id = receivings.supplier_id', 'LEFT');
-		$this->db->where('receiving_id', $receiving_id);
-
-		return $this->db->get();
-	}
-
-	public function get_receiving_by_reference($reference)
-	{
-		$this->db->from('receivings');
-		$this->db->where('reference', $reference);
-
-		return $this->db->get();
-	}
-
-	public function is_valid_receipt($receipt_receiving_id)
-	{
-		if(!empty($receipt_receiving_id))
-		{
-			//RECV #
-			$pieces = explode(' ', $receipt_receiving_id);
-
-			if(count($pieces) == 2 && preg_match('/(RECV|KIT)/', $pieces[0]))
-			{
-				return $this->exists($pieces[1]);
-			}
-			else
-			{
-				return $this->get_receiving_by_reference($receipt_receiving_id)->num_rows() > 0;
-			}
-		}
-
-		return FALSE;
-	}
-
-	public function exists($receiving_id)
-	{
-		$this->db->from('receivings');
-		$this->db->where('receiving_id', $receiving_id);
-
-		return ($this->db->get()->num_rows() == 1);
-	}
-
-	public function update($receiving_data, $receiving_id)
-	{
-		$this->db->where('receiving_id', $receiving_id);
-
-		return $this->db->update('receivings', $receiving_data);
-	}
-
-	public function save($items, $supplier_id, $employee_id, $comment, $reference, $payment_type, $receiving_id = FALSE)
-	{
-		if(count($items) == 0)
-		{
-			return -1;
-		}
-
-		$receivings_data = array(
-			'receiving_time' => date('Y-m-d H:i:s'),
-			'supplier_id' => $this->Supplier->exists($supplier_id) ? $supplier_id : NULL,
-			'employee_id' => $employee_id,
-			'payment_type' => $payment_type,
-			'comment' => $comment,
-			'reference' => $reference
-		);
-
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
-
-		$this->db->insert('receivings', $receivings_data);
-		$receiving_id = $this->db->insert_id();
-
-		foreach($items as $line=>$item)
-		{
-			$cur_item_info = $this->Item->get_info($item['item_id']);
-
-			$receivings_items_data = array(
-				'receiving_id' => $receiving_id,
-				'item_id' => $item['item_id'],
-				'line' => $item['line'],
-				'description' => $item['description'],
-				'serialnumber' => $item['serialnumber'],
-				'quantity_purchased' => $item['quantity'],
-				'receiving_quantity' => $item['receiving_quantity'],
-				'discount' => $item['discount'],
-				'discount_type' => $item['discount_type'],
-				'item_cost_price' => $cur_item_info->cost_price,
-				'item_unit_price' => $item['price'],
-				'item_location' => $item['item_location']
-			);
-
-			$this->db->insert('receivings_items', $receivings_items_data);
-
-			$items_received = $item['receiving_quantity'] != 0 ? $item['quantity'] * $item['receiving_quantity'] : $item['quantity'];
-
-			// update cost price, if changed AND is set in config as wanted
-			if($cur_item_info->cost_price != $item['price'] && $this->config->item('receiving_calculate_average_price') != FALSE)
-			{
-				$this->Item->change_cost_price($item['item_id'], $items_received, $item['price'], $cur_item_info->cost_price);
-			}
-
-			//Update stock quantity
-			$item_quantity = $this->Item_quantity->get_item_quantity($item['item_id'], $item['item_location']);
-			$this->Item_quantity->save(array('quantity' => $item_quantity->quantity + $items_received, 'item_id' => $item['item_id'],
-											  'location_id' => $item['item_location']), $item['item_id'], $item['item_location']);
-
-			$recv_remarks = 'RECV ' . $receiving_id;
-			$inv_data = array(
-				'trans_date' => date('Y-m-d H:i:s'),
-				'trans_items' => $item['item_id'],
-				'trans_user' => $employee_id,
-				'trans_location' => $item['item_location'],
-				'trans_comment' => $recv_remarks,
-				'trans_inventory' => $items_received
-			);
-
-			$this->Inventory->insert($inv_data);
-
-			$this->Attribute->copy_attribute_links($item['item_id'], 'receiving_id', $receiving_id);
-
-			$supplier = $this->Supplier->get_info($supplier_id);
-		}
-
-		$this->db->trans_complete();
-
-		if($this->db->trans_status() === FALSE)
-		{
-			return -1;
-		}
-
-		return $receiving_id;
-	}
-
-	public function delete_list($receiving_ids, $employee_id, $update_inventory = TRUE)
-	{
-		$success = TRUE;
-
-		// start a transaction to assure data integrity
-		$this->db->trans_start();
-
-		foreach($receiving_ids as $receiving_id)
-		{
-			$success &= $this->delete($receiving_id, $employee_id, $update_inventory);
-		}
-
-		// execute transaction
-		$this->db->trans_complete();
-
-		$success &= $this->db->trans_status();
-
-		return $success;
-	}
-
-	public function delete($receiving_id, $employee_id, $update_inventory = TRUE)
-	{
-		// start a transaction to assure data integrity
-		$this->db->trans_start();
-
-		if($update_inventory)
-		{
-			// defect, not all item deletions will be undone??
-			// get array with all the items involved in the sale to update the inventory tracking
-			$items = $this->get_receiving_items($receiving_id)->result_array();
-			foreach($items as $item)
-			{
-				// create query to update inventory tracking
-				$inv_data = array(
-					'trans_date' => date('Y-m-d H:i:s'),
-					'trans_items' => $item['item_id'],
-					'trans_user' => $employee_id,
-					'trans_comment' => 'Deleting receiving ' . $receiving_id,
-					'trans_location' => $item['item_location'],
-					'trans_inventory' => $item['quantity_purchased'] * (-$item['receiving_quantity'])
-				);
-				// update inventory
-				$this->Inventory->insert($inv_data);
-
-				// update quantities
-				$this->Item_quantity->change_quantity($item['item_id'], $item['item_location'], $item['quantity_purchased'] * (-$item['receiving_quantity']));
-			}
-		}
-
-		// delete all items
-		$this->db->delete('receivings_items', array('receiving_id' => $receiving_id));
-		// delete sale itself
-		$this->db->delete('receivings', array('receiving_id' => $receiving_id));
-
-		// execute transaction
-		$this->db->trans_complete();
-	
-		return $this->db->trans_status();
-	}
-
-	public function get_receiving_items($receiving_id)
-	{
-		$this->db->from('receivings_items');
-		$this->db->where('receiving_id', $receiving_id);
-
-		return $this->db->get();
-	}
-	
-	public function get_supplier($receiving_id)
-	{
-		$this->db->from('receivings');
-		$this->db->where('receiving_id', $receiving_id);
-
-		return $this->Supplier->get_info($this->db->get()->row()->supplier_id);
-	}
-
-	public function get_payment_options()
-	{
-		return array(
-			$this->lang->line('sales_cash') => $this->lang->line('sales_cash'),
-			$this->lang->line('sales_check') => $this->lang->line('sales_check'),
-			$this->lang->line('sales_debit') => $this->lang->line('sales_debit'),
-			$this->lang->line('sales_credit') => $this->lang->line('sales_credit'),
-			$this->lang->line('sales_due') => $this->lang->line('sales_due')
-		);
-	}
-
-	/*
-	We create a temp table that allows us to do easy report/receiving queries
-	*/
-	public function create_temp_table(array $inputs)
-	{
-		if(empty($inputs['receiving_id']))
-		{
-			if(empty($this->config->item('date_or_time_format')))
-			{
-				$where = 'WHERE DATE(receiving_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
-			}
-			else
-			{
-				$where = 'WHERE receiving_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
-			}
-		}
-		else
-		{
-			$where = 'WHERE receivings_items.receiving_id = ' . $this->db->escape($inputs['receiving_id']);
-		}
-
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('receivings_items_temp') .
-			' (INDEX(receiving_date), INDEX(receiving_time), INDEX(receiving_id))
-			(
-				SELECT 
-					MAX(DATE(receiving_time)) AS receiving_date,
-					MAX(receiving_time) AS receiving_time,
-					receivings_items.receiving_id AS receiving_id,
-					MAX(comment) AS comment,
-					MAX(item_location) AS item_location,
-					MAX(reference) AS reference,
-					MAX(payment_type) AS payment_type,
-					MAX(employee_id) AS employee_id, 
-					items.item_id AS item_id,
-					MAX(receivings.supplier_id) AS supplier_id,
-					MAX(quantity_purchased) AS quantity_purchased,
-					MAX(receivings_items.receiving_quantity) AS item_receiving_quantity,
-					MAX(item_cost_price) AS item_cost_price,
-					MAX(item_unit_price) AS item_unit_price,
-					MAX(discount) AS discount,
-					MAX(discount_type) AS discount_type,
-					receivings_items.line AS line,
-					MAX(serialnumber) AS serialnumber,
-					MAX(receivings_items.description) AS description,
-					MAX(CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) AS subtotal,
-					MAX(CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) AS total,
-					MAX((CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) - (item_cost_price * quantity_purchased)) AS profit,
-					MAX(item_cost_price * quantity_purchased * receivings_items.receiving_quantity ) AS cost
-				FROM ' . $this->db->dbprefix('receivings_items') . ' AS receivings_items
-				INNER JOIN ' . $this->db->dbprefix('receivings') . ' AS receivings
-					ON receivings_items.receiving_id = receivings.receiving_id
-				INNER JOIN ' . $this->db->dbprefix('items') . ' AS items
-					ON receivings_items.item_id = items.item_id
-				' . "
-				$where
-				" . '
-				GROUP BY receivings_items.receiving_id, items.item_id, receivings_items.line
-			)'
-		);
-	}
-}
-?>
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use ReflectionException;
+
+/**
+ * Receiving class
+ *
+ * @property attribute attribute
+ * @property inventory inventory
+ * @property item item
+ * @property item_quantity item_quantity
+ * @property supplier supplier
+ */
+class Receiving extends Model
+{
+	public function get_info(int $receiving_id): ResultInterface
+	{
+		$builder = $this->db->table('receivings');
+		$builder->join('people', 'people.person_id = receivings.supplier_id', 'LEFT');
+		$builder->join('suppliers', 'suppliers.person_id = receivings.supplier_id', 'LEFT');
+		$builder->where('receiving_id', $receiving_id);
+
+		return $builder->get();
+	}
+
+	public function get_receiving_by_reference(string $reference): ResultInterface
+	{
+		$builder = $this->db->table('receivings');
+		$builder->where('reference', $reference);
+
+		return $builder->get();
+	}
+
+	public function is_valid_receipt(string $receipt_receiving_id): bool	//TODO: maybe receipt_receiving_id should be an array rather than a space delimited string
+	{
+		if(!empty($receipt_receiving_id))
+		{
+			//RECV #
+			$pieces = explode(' ', $receipt_receiving_id);
+
+			if(count($pieces) == 2 && preg_match('/(RECV|KIT)/', $pieces[0]))
+			{
+				return $this->exists($pieces[1]);
+			}
+			else
+			{
+				return $this->get_receiving_by_reference($receipt_receiving_id)->getNumRows() > 0;
+			}
+		}
+
+		return FALSE;
+	}
+
+	public function exists(int $receiving_id): bool
+	{
+		$builder = $this->db->table('receivings');
+		$builder->where('receiving_id', $receiving_id);
+
+		return ($builder->get()->getNumRows() == 1);
+	}
+
+	public function update(int $receiving_id = NULL, array $receiving_data = NULL): bool
+	{
+		$builder = $this->db->table('receivings');
+		$builder->where('receiving_id', $receiving_id);
+
+		return $builder->update($receiving_data);
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function save_value(array $items, int $supplier_id, int $employee_id, string $comment, string $reference, string $payment_type, bool $receiving_id = FALSE): int	//TODO: $receiving_id gets overwritten before it's evaluated. It doesn't make sense to pass this here.
+	{
+		$attribute = model(Attribute::class);
+		$inventory = model('Inventory');
+		$item = model(Item::class);
+		$item_quantity = model(Item_quantity::class);
+		$supplier = model(Supplier::class);
+
+		if(count($items) == 0)
+		{
+			return -1;	//TODO: Replace -1 with a constant
+		}
+
+		$receivings_data = [
+			'receiving_time' => date('Y-m-d H:i:s'),
+			'supplier_id' => $supplier->exists($supplier_id) ? $supplier_id : NULL,
+			'employee_id' => $employee_id,
+			'payment_type' => $payment_type,
+			'comment' => $comment,
+			'reference' => $reference
+		];
+
+		//Run these queries as a transaction, we want to make sure we do all or nothing
+		$this->db->transStart();
+
+		$builder = $this->db->table('receivings');
+		$builder->insert($receivings_data);
+		$receiving_id = $this->db->insertID();
+
+		$builder = $this->db->table('receivings_items');
+
+		foreach($items as $line => $item_data)
+		{
+			$cur_item_info = $item->get_info($item['item_id']);
+
+			$receivings_items_data = [
+				'receiving_id' => $receiving_id,
+				'item_id' => $item_data['item_id'],
+				'line' => $item_data['line'],
+				'description' => $item_data['description'],
+				'serialnumber' => $item_data['serialnumber'],
+				'quantity_purchased' => $item_data['quantity'],
+				'receiving_quantity' => $item_data['receiving_quantity'],
+				'discount' => $item_data['discount'],
+				'discount_type' => $item_data['discount_type'],
+				'item_cost_price' => $cur_item_info->cost_price,
+				'item_unit_price' => $item_data['price'],
+				'item_location' => $item_data['item_location']
+			];
+
+			$builder->insert($receivings_items_data);
+
+			$items_received = $item_data['receiving_quantity'] != 0 ? $item_data['quantity'] * $item_data['receiving_quantity'] : $item_data['quantity'];
+
+			// update cost price, if changed AND is set in config as wanted
+			if($cur_item_info->cost_price != $item_data['price'] && config('OSPOS')->receiving_calculate_average_price)
+			{
+				$item->change_cost_price($item_data['item_id'], $items_received, $item_data['price'], $cur_item_info->cost_price);
+			}
+
+			//Update stock quantity
+			$item_quantity = $item_quantity->get_item_quantity($item['item_id'], $item['item_location']);
+			$item_quantity->save_value([
+				'quantity' => $item_quantity->quantity + $items_received,
+				'item_id' => $item_data['item_id'],
+				'location_id' => $item_data['item_location']],
+				$item_data['item_id'],
+				$item_data['item_location']
+			);
+
+			$recv_remarks = 'RECV ' . $receiving_id;
+			$inv_data = [
+				'trans_date' => date('Y-m-d H:i:s'),
+				'trans_items' => $item_data['item_id'],
+				'trans_user' => $employee_id,
+				'trans_location' => $item['item_location'],
+				'trans_comment' => $recv_remarks,
+				'trans_inventory' => $items_received
+			];
+
+			$inventory->insert($inv_data);
+			$attribute->copy_attribute_links($item_data['item_id'], 'receiving_id', $receiving_id);
+			$supplier = $supplier->get_info($supplier_id);	//TODO: supplier is never used after this.
+		}
+
+		$this->db->transComplete();
+
+		if($this->db->transStatus() === FALSE)	//TODO: Probably better written as return $this->db->transStatus() ? $receiving_id : -1;
+		{
+			return -1;
+		}
+
+		return $receiving_id;
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function delete_list(array $receiving_ids, int $employee_id, bool $update_inventory = TRUE): bool
+	{
+		$success = TRUE;
+
+		// start a transaction to assure data integrity
+		$this->db->transStart();
+
+		foreach($receiving_ids as $receiving_id)
+		{
+			$success &= $this->delete_value($receiving_id, $employee_id, $update_inventory);
+		}
+
+		// execute transaction
+		$this->db->transComplete();
+
+		$success &= $this->db->transStatus();
+
+		return $success;
+	}
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function delete_value(int $receiving_id, int $employee_id, bool $update_inventory = TRUE): bool
+	{
+		// start a transaction to assure data integrity
+		$this->db->transStart();
+
+		if($update_inventory)
+		{
+			//TODO: defect, not all item deletions will be undone? get array with all the items involved in the sale to update the inventory tracking
+			$items = $this->get_receiving_items($receiving_id)->getResultArray();
+
+			$inventory = model('Inventory');
+			$item_quantity = model(Item_quantity::class);
+
+			foreach($items as $item)
+			{
+				// create query to update inventory tracking
+				$inv_data = [
+					'trans_date' => date('Y-m-d H:i:s'),
+					'trans_items' => $item['item_id'],
+					'trans_user' => $employee_id,
+					'trans_comment' => 'Deleting receiving ' . $receiving_id,
+					'trans_location' => $item['item_location'],
+					'trans_inventory' => $item['quantity_purchased'] * (-$item['receiving_quantity'])
+				];
+				// update inventory
+				$inventory->insert($inv_data);
+
+				// update quantities
+				$item_quantity->change_quantity($item['item_id'], $item['item_location'], $item['quantity_purchased'] * (-$item['receiving_quantity']));
+			}
+		}
+
+		//delete all items
+		$builder = $this->db->table('receivings_items');
+		$builder->delete(['receiving_id' => $receiving_id]);
+
+		//delete sale itself
+		$builder = $this->db->table('receivings');
+		$builder->delete(['receiving_id' => $receiving_id]);
+
+		// execute transaction
+		$this->db->transComplete();
+	
+		return $this->db->transStatus();
+	}
+
+	public function get_receiving_items(int $receiving_id): ResultInterface
+	{
+		$builder = $this->db->table('receivings_items');
+		$builder->where('receiving_id', $receiving_id);
+
+		return $builder->get();
+	}
+	
+	public function get_supplier(int $receiving_id): object
+	{
+		$builder = $this->db->table('receivings');
+		$builder->where('receiving_id', $receiving_id);
+
+		$supplier = model(Supplier::class);
+		return $supplier->get_info($builder->get()->getRow()->supplier_id);
+	}
+
+	public function get_payment_options(): array
+	{
+		return [
+			lang('Sales.cash') => lang('Sales.cash'),
+			lang('Sales.check') => lang('Sales.check'),
+			lang('Sales.debit') => lang('Sales.debit'),
+			lang('Sales.credit') => lang('Sales.credit'),
+			lang('Sales.due') => lang('Sales.due')
+		];
+	}
+
+	/**
+	 * Create a temp table that allows us to do easy report/receiving queries
+	 */
+	public function create_temp_table(array $inputs): void
+	{
+		if(empty($inputs['receiving_id']))
+		{
+			if(empty(config('OSPOS')->date_or_time_format))
+			{
+				$where = 'WHERE DATE(receiving_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
+			}
+			else
+			{
+				$where = 'WHERE receiving_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
+			}
+		}
+		else
+		{
+			$where = 'WHERE receivings_items.receiving_id = ' . $this->db->escape($inputs['receiving_id']);
+		}
+
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('receivings_items_temp') .
+			' (INDEX(receiving_date), INDEX(receiving_time), INDEX(receiving_id))
+			(
+				SELECT 
+					MAX(DATE(receiving_time)) AS receiving_date,
+					MAX(receiving_time) AS receiving_time,
+					receivings_items.receiving_id AS receiving_id,
+					MAX(comment) AS comment,
+					MAX(item_location) AS item_location,
+					MAX(reference) AS reference,
+					MAX(payment_type) AS payment_type,
+					MAX(employee_id) AS employee_id, 
+					items.item_id AS item_id,
+					MAX(receivings.supplier_id) AS supplier_id,
+					MAX(quantity_purchased) AS quantity_purchased,
+					MAX(receivings_items.receiving_quantity) AS item_receiving_quantity,
+					MAX(item_cost_price) AS item_cost_price,
+					MAX(item_unit_price) AS item_unit_price,
+					MAX(discount) AS discount,
+					MAX(discount_type) AS discount_type,
+					receivings_items.line AS line,
+					MAX(serialnumber) AS serialnumber,
+					MAX(receivings_items.description) AS description,
+					MAX(CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) AS subtotal,
+					MAX(CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) AS total,
+					MAX((CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) - (item_cost_price * quantity_purchased)) AS profit,
+					MAX(item_cost_price * quantity_purchased * receivings_items.receiving_quantity ) AS cost
+				FROM ' . $this->db->prefixTable('receivings_items') . ' AS receivings_items
+				INNER JOIN ' . $this->db->prefixTable('receivings') . ' AS receivings
+					ON receivings_items.receiving_id = receivings.receiving_id
+				INNER JOIN ' . $this->db->prefixTable('items') . ' AS items
+					ON receivings_items.item_id = items.item_id
+				' . "
+				$where
+				" . '
+				GROUP BY receivings_items.receiving_id, items.item_id, receivings_items.line
+			)';
+
+		$this->db->query($sql);
+	}
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Detailed_receivings.php b/app/Models/Reports/Detailed_receivings.php
index cfa6d3508..f7a4bd749 100644
--- a/app/Models/Reports/Detailed_receivings.php
+++ b/app/Models/Reports/Detailed_receivings.php
@@ -1,42 +1,54 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Receiving;
+
+/**
+ * 
+ * 
+ * @property receiving receiving
+ * 
+ */
 class Detailed_receivings extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Receiving->create_temp_table($inputs);
+		$receiving = model(Receiving::class);
+		$receiving->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			'summary' => array(
-				array('id' => $this->lang->line('reports_receiving_id')),
-				array('receiving_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-				array('quantity' => $this->lang->line('reports_quantity')),
-				array('employee_name' => $this->lang->line('reports_received_by')),
-				array('supplier_name' => $this->lang->line('reports_supplied_by')),
-				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-				array('payment_type' => $this->lang->line('reports_payment_type')),
-				array('comment' => $this->lang->line('reports_comments')),
-				array('reference' => $this->lang->line('receivings_reference'))),
-			'details' => array(
-				$this->lang->line('reports_item_number'),
-				$this->lang->line('reports_name'),
-				$this->lang->line('reports_category'),
-				$this->lang->line('reports_quantity'),
-				$this->lang->line('reports_total'),
-				$this->lang->line('reports_discount'))
-		);
+		return [
+			'summary' => [
+				['id' => lang('Reports.receiving_id')],
+				['receiving_date' => lang('Reports.date'), 'sortable' => FALSE],
+				['quantity' => lang('Reports.quantity')],
+				['employee_name' => lang('Reports.received_by')],
+				['supplier_name' => lang('Reports.supplied_by')],
+				['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+				['payment_type' => lang('Reports.payment_type')],
+				['comment' => lang('Reports.comments')],
+				['reference' => lang('Receivings.reference')]
+			],
+			'details' => [
+				lang('Reports.item_number'),
+				lang('Reports.name'),
+				lang('Reports.category'),
+				lang('Reports.quantity'),
+				lang('Reports.total'),
+				lang('Reports.discount')
+			]
+		];
 	}
 
-	public function getDataByReceivingId($receiving_id)
+	public function getDataByReceivingId(string $receiving_id): array
 	{
-		$this->db->select('receiving_id,
-			MAX(receiving_time) as receiving_time,
+		$builder = $this->db->table('receivings_items_temp');
+		$builder->select('receiving_id,
+			MAX(receiving_date) as receiving_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(CONCAT(employee.first_name, " ", employee.last_name)) AS employee_name,
 			MAX(supplier.company_name) AS supplier_name,
@@ -46,19 +58,19 @@ class Detailed_receivings extends Report
 			MAX(payment_type) as payment_type,
 			MAX(comment) as comment,
 			MAX(reference) as reference');
-		$this->db->from('receivings_items_temp');
-		$this->db->join('people AS employee', 'receivings_items_temp.employee_id = employee.person_id');
-		$this->db->join('suppliers AS supplier', 'receivings_items_temp.supplier_id = supplier.person_id', 'left');
-		$this->db->where('receiving_id', $receiving_id);
-		$this->db->group_by('receiving_id');
+		$builder->join('people AS employee', 'receivings_items_temp.employee_id = employee.person_id');
+		$builder->join('suppliers AS supplier', 'receivings_items_temp.supplier_id = supplier.person_id', 'left');
+		$builder->where('receiving_id', $receiving_id);
+		$builder->groupBy('receiving_id');
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('receiving_id,
-			MAX(receiving_time) as receiving_time,
+		$builder = $this->db->table('receivings_items_temp AS receivings_items_temp');
+		$builder->select('receiving_id,
+			MAX(receiving_date) as receiving_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(CONCAT(employee.first_name," ",employee.last_name)) AS employee_name,
 			MAX(supplier.company_name) AS supplier_name,
@@ -67,37 +79,39 @@ class Detailed_receivings extends Report
 			MAX(payment_type) AS payment_type,
 			MAX(comment) AS comment,
 			MAX(reference) AS reference');
-		$this->db->from('receivings_items_temp AS receivings_items_temp');
-		$this->db->join('people AS employee', 'receivings_items_temp.employee_id = employee.person_id');
-		$this->db->join('suppliers AS supplier', 'receivings_items_temp.supplier_id = supplier.person_id', 'left');
+		$builder->join('people AS employee', 'receivings_items_temp.employee_id = employee.person_id');
+		$builder->join('suppliers AS supplier', 'receivings_items_temp.supplier_id = supplier.person_id', 'left');
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$builder->where('item_location', $inputs['location_id']);
 		}
 
-		if($inputs['receiving_type'] == 'receiving')
+		if($inputs['receiving_type'] == 'receiving')	//TODO: These if statements should be replaced with a switch statement
 		{
-			$this->db->where('quantity_purchased >', 0);
+			$builder->where('quantity_purchased >', 0);
 		}
 		elseif($inputs['receiving_type'] == 'returns')
 		{
-			$this->db->where('quantity_purchased <', 0);
+			$builder->where('quantity_purchased <', 0);
 		}
 		elseif($inputs['receiving_type'] == 'requisitions')
 		{
-			$this->db->having('items_purchased = 0');
+			$builder->having('items_purchased = 0');
 		}
-		$this->db->group_by('receiving_id', 'receiving_time');
-		$this->db->order_by('receiving_id');
 
-		$data = array();
-		$data['summary'] = $this->db->get()->result_array();
-		$data['details'] = array();
+		$builder->groupBy('receiving_id', 'receiving_date');
+		$builder->orderBy('receiving_id');
 
-		foreach($data['summary'] as $key=>$value)
+		$data = [];
+		$data['summary'] = $builder->get()->getResultArray();
+		$data['details'] = [];
+
+		$builder = $this->db->table('receivings_items_temp');
+
+		foreach($data['summary'] as $key => $value)
 		{
-			$this->db->select('
+			$builder->select('
 				MAX(name) AS name, 
 				MAX(item_number) AS item_number, 
 				MAX(category) AS category, 
@@ -108,49 +122,50 @@ class Detailed_receivings extends Report
 				MAX(discount_type) AS discount_type, 
 				MAX(item_location) AS item_location, 
 				MAX(item_receiving_quantity) AS receiving_quantity');
-			$this->db->from('receivings_items_temp');
-			$this->db->join('items', 'receivings_items_temp.item_id = items.item_id');
+			$builder->join('items', 'receivings_items_temp.item_id = items.item_id');
+
 			if(count($inputs['definition_ids']) > 0)
 			{
 				$format = $this->db->escape(dateformat_mysql());
-				$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
-				$this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
-				$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-				$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id = receivings_items_temp.receiving_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
-				$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
+				$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
+				$builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
+				$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
+				$builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id = receivings_items_temp.receiving_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
+				$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
 			}
-			$this->db->where('receivings_items_temp.receiving_id', $value['receiving_id']);
-			$this->db->group_by('receivings_items_temp.receiving_id, receivings_items_temp.item_id');
-			$data['details'][$key] = $this->db->get()->result_array();
+
+			$builder->where('receivings_items_temp.receiving_id', $value['receiving_id']);
+			$builder->groupBy('receivings_items_temp.receiving_id, receivings_items_temp.item_id');
+			$data['details'][$key] = $builder->get()->getResultArray();
 		}
 
 		return $data;
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(total) AS total');
-		$this->db->from('receivings_items_temp');
+		$builder = $this->db->table('receivings_items_temp');
+		$builder->select('SUM(total) AS total');
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$builder->where('item_location', $inputs['location_id']);
 		}
 
+		//TODO: These if statements should be replaced with a switch statement
 		if($inputs['receiving_type'] == 'receiving')
 		{
-			$this->db->where('quantity_purchased >', 0);
+			$builder->where('quantity_purchased >', 0);
 		}
 		elseif($inputs['receiving_type'] == 'returns')
 		{
-			$this->db->where('quantity_purchased <', 0);
+			$builder->where('quantity_purchased <', 0);
 		}
 		elseif($inputs['receiving_type'] == 'requisitions')
 		{
-			$this->db->where('quantity_purchased', 0);
+			$builder->where('quantity_purchased', 0);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Detailed_sales.php b/app/Models/Reports/Detailed_sales.php
index 6aaae9bed..7dd65c2de 100644
--- a/app/Models/Reports/Detailed_sales.php
+++ b/app/Models/Reports/Detailed_sales.php
@@ -1,54 +1,67 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Sale;
+
+/**
+ *
+ *
+ * @property sale sale
+ *
+ */
 class Detailed_sales extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Sale->create_temp_table($inputs);
+		$sale = model(Sale::class);
+		$sale->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			'summary' => array(
-				array('id' => $this->lang->line('reports_sale_id')),
-				array('type_code' => $this->lang->line('reports_code_type')),
-				array('sale_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-				array('quantity' => $this->lang->line('reports_quantity')),
-				array('employee_name' => $this->lang->line('reports_sold_by')),
-				array('customer_name' => $this->lang->line('reports_sold_to')),
-				array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-				array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-				array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-				array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
-				array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
-				array('comment' => $this->lang->line('reports_comments'))),
-			'details' => array(
-				$this->lang->line('reports_name'),
-				$this->lang->line('reports_category'),
-				$this->lang->line('reports_item_number'),
-				$this->lang->line('reports_description'),
-				$this->lang->line('reports_quantity'),
-				$this->lang->line('reports_subtotal'),
-				$this->lang->line('reports_tax'),
-				$this->lang->line('reports_total'),
-				$this->lang->line('reports_cost'),
-				$this->lang->line('reports_profit'),
-				$this->lang->line('reports_discount')),
-			'details_rewards' => array(
-				$this->lang->line('reports_used'),
-				$this->lang->line('reports_earned'))
-		);
+		return [	//TODO: Duplicated code
+			'summary' => [
+				['id' => lang('Reports.sale_id')],
+				['type_code' => lang('Reports.code_type')],
+				['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+				['quantity' => lang('Reports.quantity')],
+				['employee_name' => lang('Reports.sold_by')],
+				['customer_name' => lang('Reports.sold_to')],
+				['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+				['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+				['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+				['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+				['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter'],
+				['payment_type' => lang('Reports.payment_type'), 'sortable' => FALSE],
+				['comment' => lang('Reports.comments')]
+			],
+			'details' => [
+				lang('Reports.name'),
+				lang('Reports.category'),
+				lang('Reports.item_number'),
+				lang('Reports.description'),
+				lang('Reports.quantity'),
+				lang('Reports.subtotal'),
+				lang('Reports.tax'),
+				lang('Reports.total'),
+				lang('Reports.cost'),
+				lang('Reports.profit'),
+				lang('Reports.discount')
+			],
+			'details_rewards' => [
+				lang('Reports.used'),
+				lang('Reports.earned')
+			]
+		];
 	}
 
-	public function getDataBySaleId($sale_id)
+	public function getDataBySaleId(int $sale_id): array
 	{
-		$this->db->select('sale_id,
-			sale_time as sale_time,
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('sale_id,
+			sale_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(employee_name) AS employee_name,
 			MAX(customer_name) AS customer_name,
@@ -60,26 +73,26 @@ class Detailed_sales extends Report
 			MAX(payment_type) AS payment_type,
 			MAX(sale_status) AS sale_status,
 			comment');
-		$this->db->from('sales_items_temp');
-		$this->db->where('sale_id', $sale_id);
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('sale_id, 
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('sale_id, 
 			MAX(CASE
-			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\'			
-			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\'
-			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\'
-			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\'
-			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_return') . '\'
-			WHEN sale_status = ' . CANCELED . ' THEN \'' . $this->lang->line('reports_code_canceled') . '\'
+			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_pos') . '\'			
+			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_invoice') . '\'
+			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_work_order') . '\'
+			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_quote') . '\'
+			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_return') . '\'
+			WHEN sale_status = ' . CANCELED . ' THEN \'' . lang('Reports.code_canceled') . '\'
 			ELSE \'\'
 			END) AS type_code,
 			MAX(sale_status) as sale_status,
-			MAX(sale_time) AS sale_time,
+			MAX(sale_date) AS sale_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(employee_name) AS employee_name,
 			MAX(customer_name) AS customer_name,
@@ -90,61 +103,62 @@ class Detailed_sales extends Report
 			SUM(profit) AS profit,
 			MAX(payment_type) AS payment_type,
 			MAX(comment) AS comment');
-		$this->db->from('sales_items_temp');
 
-		if($inputs['location_id'] != 'all')
+		if($inputs['location_id'] != 'all')	//TODO: Duplicated code
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$builder->where('item_location', $inputs['location_id']);
 		}
 
-		if($inputs['sale_type'] == 'complete')
+		//TODO: These if statements should be converted to a switch statement
+		if($inputs['sale_type'] == 'complete')	//TODO: Duplicated code
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		$this->db->group_by('sale_id');
-		$this->db->order_by('MAX(sale_time)');
+		$builder->groupBy('sale_id');
+		$builder->orderBy('MAX(sale_date)');
 
-		$data = array();
-		$data['summary'] = $this->db->get()->result_array();
-		$data['details'] = array();
-		$data['rewards'] = array();
+		$data = [];
+		$data['summary'] = $builder->get()->getResultArray();
+		$data['details'] = [];
+		$data['rewards'] = [];
 
-		foreach($data['summary'] as $key=>$value)
+		foreach($data['summary'] as $key => $value)
 		{
-			$this->db->select('
+			$builder = $this->db->table('sales_items_temp');
+			$builder->select('
 				MAX(name) AS name, 
 				MAX(category) AS category, 
 				MAX(quantity_purchased) AS quantity_purchased, 
@@ -159,77 +173,78 @@ class Detailed_sales extends Report
 				MAX(discount) AS discount, 
 				MAX(discount_type) AS discount_type, 
 				MAX(sale_status) AS sale_status');
-			$this->db->from('sales_items_temp');
+
 			if(count($inputs['definition_ids']) > 0)
 			{
 				$format = $this->db->escape(dateformat_mysql());
-				$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
-				$this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
-				$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-				$this->db->join('attribute_links', 'attribute_links.item_id = sales_items_temp.item_id AND attribute_links.sale_id = sales_items_temp.sale_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
-				$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
+				$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
+				$builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
+				$builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
+				$builder->join('attribute_links', 'attribute_links.item_id = sales_items_temp.item_id AND attribute_links.sale_id = sales_items_temp.sale_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
+				$builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
 			}
-			$this->db->group_by('sales_items_temp.sale_id, sales_items_temp.item_id, sales_items_temp.line');
-			$this->db->where('sales_items_temp.sale_id', $value['sale_id']);
-			$data['details'][$key] = $this->db->get()->result_array();
 
-			$this->db->select('used, earned');
-			$this->db->from('sales_reward_points');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['rewards'][$key] = $this->db->get()->result_array();
+			$builder->groupBy('sales_items_temp.sale_id, sales_items_temp.item_id');
+			$builder->where('sales_items_temp.sale_id', $value['sale_id']);
+			$data['details'][$key] = $builder->get()->getResultArray();
+
+			$builder->select('used, earned');
+			$builder = $this->db->table('sales_reward_points');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['rewards'][$key] = $builder->get()->getResultArray();
 		}
 
 		return $data;
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
 
-		if($inputs['location_id'] != 'all')
+		if($inputs['location_id'] != 'all')	//TODO: Duplicated code
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$builder->where('item_location', $inputs['location_id']);
 		}
 
+		//TODO: This should be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Inventory_low.php b/app/Models/Reports/Inventory_low.php
index 3653b5b12..dd40bc606 100644
--- a/app/Models/Reports/Inventory_low.php
+++ b/app/Models/Reports/Inventory_low.php
@@ -1,41 +1,50 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Item;
+
+/**
+ *
+ *
+ * @property item item
+ *
+ */
 class Inventory_low extends Report
 {
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			array('item_name' => $this->lang->line('reports_item_name')),
-			array('item_number' => $this->lang->line('reports_item_number')),
-			array('quantity' => $this->lang->line('reports_quantity')),
-			array('reorder_level' => $this->lang->line('reports_reorder_level')),
-			array('location_name' => $this->lang->line('reports_stock_location')));
+		return [
+			['item_name' => lang('Reports.item_name')],
+			['item_number' => lang('Reports.item_number')],
+			['quantity' => lang('Reports.quantity')],
+			['reorder_level' => lang('Reports.reorder_level')],
+			['location_name' => lang('Reports.stock_location')]
+		];
 	}
 
-	public function getData(array $inputs)
-	{
-		$query = $this->db->query("SELECT " . $this->Item->get_item_name('name') . ", 
+	public function getData(array $inputs): array
+	{//TODO: we need to see if this can be converted into using QueryBuilder
+		$item = model(Item::class);
+		$query = $this->db->query("SELECT " . $item->get_item_name('name') . ", 
 			items.item_number,
 			item_quantities.quantity, 
 			items.reorder_level, 
 			stock_locations.location_name
-			FROM " . $this->db->dbprefix('items') . " AS items
-			JOIN " . $this->db->dbprefix('item_quantities') . " AS item_quantities ON items.item_id = item_quantities.item_id
-			JOIN " . $this->db->dbprefix('stock_locations') . " AS stock_locations ON item_quantities.location_id = stock_locations.location_id
+			FROM " . $this->db->prefixTable('items') . " AS items
+			JOIN " . $this->db->prefixTable('item_quantities') . " AS item_quantities ON items.item_id = item_quantities.item_id
+			JOIN " . $this->db->prefixTable('stock_locations') . " AS stock_locations ON item_quantities.location_id = stock_locations.location_id
 			WHERE items.deleted = 0
 			AND items.stock_type = 0
 			AND item_quantities.quantity <= items.reorder_level
 			AND stock_locations.deleted = 0
 			ORDER BY items.name");
 
-		return $query->result_array();
+		return $query->getResultArray();
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		return array();
+		return [];
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Inventory_summary.php b/app/Models/Reports/Inventory_summary.php
index e8bc5dde1..9c09b17ca 100644
--- a/app/Models/Reports/Inventory_summary.php
+++ b/app/Models/Reports/Inventory_summary.php
@@ -1,63 +1,91 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Item;
+
+/**
+ *
+ *
+ * @property item item
+ *
+ */
 class Inventory_summary extends Report
 {
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(array('item_name' => $this->lang->line('reports_item_name')),
-					array('item_number' => $this->lang->line('reports_item_number')),
-					array('category' => $this->lang->line('reports_category')),
-					array('quantity' => $this->lang->line('reports_quantity')),
-					array('low_sell_quantity' => $this->lang->line('reports_low_sell_quantity')),
-					array('reorder_level' => $this->lang->line('reports_reorder_level')),
-					array('location_name' => $this->lang->line('reports_stock_location')),
-					array('cost_price' => $this->lang->line('reports_cost_price'), 'sorter' => 'number_sorter'),
-					array('unit_price' => $this->lang->line('reports_unit_price'), 'sorter' => 'number_sorter'),
-					array('subtotal' => $this->lang->line('reports_sub_total_value'), 'sorter' => 'number_sorter'));
+		return [
+			['item_name' => lang('Reports.item_name')],
+			['item_number' => lang('Reports.item_number')],
+			['category' => lang('Reports.category')],
+			['quantity' => lang('Reports.quantity')],
+			['low_sell_quantity' => lang('Reports.low_sell_quantity')],
+			['reorder_level' => lang('Reports.reorder_level')],
+			['location_name' => lang('Reports.stock_location')],
+			['cost_price' => lang('Reports.cost_price'), 'sorter' => 'number_sorter'],
+			['unit_price' => lang('Reports.unit_price'), 'sorter' => 'number_sorter'],
+			['subtotal' => lang('Reports.sub_total_value'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select($this->Item->get_item_name('name') . ', items.item_number, items.category, item_quantities.quantity, (item_quantities.quantity * items.qty_per_pack) as low_sell_quantity, items.reorder_level, stock_locations.location_name, items.cost_price, items.unit_price, (items.cost_price * item_quantities.quantity) AS sub_total_value');
-		$this->db->from('items AS items');
-		$this->db->join('item_quantities AS item_quantities', 'items.item_id = item_quantities.item_id');
-		$this->db->join('stock_locations AS stock_locations', 'item_quantities.location_id = stock_locations.location_id');
-		$this->db->where('items.deleted', 0);
-		$this->db->where('items.stock_type', 0);
-		$this->db->where('stock_locations.deleted', 0);
+		$item = model(Item::class);
 
-		// should be corresponding to values Inventory_summary::getItemCountDropdownArray() returns...
+		$builder = $this->db->table('items AS items');
+		$builder->select($item->get_item_name('name') . ',
+			items.item_number,
+			items.category,
+			item_quantities.quantity,
+			(item_quantities.quantity * items.qty_per_pack) as low_sell_quantity,
+			items.reorder_level,
+			stock_locations.location_name,
+			items.cost_price,
+			items.unit_price,
+			(items.cost_price * item_quantities.quantity) AS sub_total_value'
+		);
+		$builder->join('item_quantities AS item_quantities', 'items.item_id = item_quantities.item_id');
+		$builder->join('stock_locations AS stock_locations', 'item_quantities.location_id = stock_locations.location_id');
+		$builder->where('items.deleted', 0);
+		$builder->where('items.stock_type', 0);
+		$builder->where('stock_locations.deleted', 0);
+
+		// should be corresponding to the values Inventory_summary::getItemCountDropdownArray() returns...
 		if($inputs['item_count'] == 'zero_and_less')
 		{
-			$this->db->where('item_quantities.quantity <=', 0);
+			$builder->where('item_quantities.quantity <=', 0);
 		}
 		elseif($inputs['item_count'] == 'more_than_zero')
 		{
-			$this->db->where('item_quantities.quantity >', 0);
+			$builder->where('item_quantities.quantity >', 0);
 		}
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('stock_locations.location_id', $inputs['location_id']);
+			$builder->where('stock_locations.location_id', $inputs['location_id']);
 		}
 
-        $this->db->order_by('items.name');
-		$this->db->order_by('items.qty_per_pack');
+        $builder->orderBy('items.name');
+		$builder->orderBy('items.qty_per_pack');
 
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
 	/**
 	 * calculates the total value of the given inventory summary by summing all sub_total_values (see Inventory_summary::getData())
 	 *
 	 * @param array $inputs expects the reports-data-array which Inventory_summary::getData() returns
+	 *
 	 * @return array
 	 */
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$return = array('total_inventory_value' => 0, 'total_quantity' => 0, 'total_low_sell_quantity' => 0, 'total_retail' => 0);
+		$return = [	//TODO: This variable name should be refactored to reflect what it is... perhaps summary_data
+			'total_inventory_value' => 0,
+			'total_quantity' => 0,
+			'total_low_sell_quantity' => 0,
+			'total_retail' => 0
+		];
 
 		foreach($inputs as $input)
 		{
@@ -75,11 +103,12 @@ class Inventory_summary extends Report
 	 *
 	 * @return array
 	 */
-	public function getItemCountDropdownArray()
+	public function getItemCountDropdownArray(): array
 	{
-		return array('all' => $this->lang->line('reports_all'),
-					'zero_and_less' => $this->lang->line('reports_zero_and_less'),
-					'more_than_zero' => $this->lang->line('reports_more_than_zero'));
+		return [
+			'all' => lang('Reports.all'),
+			'zero_and_less' => lang('Reports.zero_and_less'),
+			'more_than_zero' => lang('Reports.more_than_zero')
+		];
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Report.php b/app/Models/Reports/Report.php
index 370470aca..898bc4ffa 100644
--- a/app/Models/Reports/Report.php
+++ b/app/Models/Reports/Report.php
@@ -1,25 +1,35 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-abstract class Report extends CI_Model
+namespace App\Models\Reports;
+
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\Model;
+
+/**
+ *
+ *
+ * @property response response
+ *
+ */
+abstract class Report extends Model
 {
 	function __construct()
 	{
 		parent::__construct();
 
 		//Make sure the report is not cached by the browser
-		$this->output->set_header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-		$this->output->set_header('Cache-Control: no-store, no-cache, must-revalidate');
-		$this->output->set_header('Cache-Control: post-check=0, pre-check=0', FALSE);
-		$this->output->set_header('Pragma: no-cache');
+		$this->response->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT');
+		$this->response->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate');
+		$this->response->setHeader('Cache-Control', 'post-check=0, pre-check=0');
+		$this->response->setHeader('Pragma', 'no-cache');
 	}
 
 	// Returns the column names used for the report
-	public abstract function getDataColumns();
+	public abstract function getDataColumns(): array;
 
 	// Returns all the data to be populated into the report
-	public abstract function getData(array $inputs);
+	public abstract function getData(array $inputs): array;
 
 	// Returns key=>value pairing of summary data for the report
-	public abstract function getSummaryData(array $inputs);
-}
-?>
+	public abstract function getSummaryData(array $inputs): array;
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Specific_customer.php b/app/Models/Reports/Specific_customer.php
index aed9837e0..ad0998b43 100644
--- a/app/Models/Reports/Specific_customer.php
+++ b/app/Models/Reports/Specific_customer.php
@@ -1,63 +1,77 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Sale;
+
+/**
+ *
+ *
+ * @property sale sale
+ *
+ */
 class Specific_customer extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Sale->create_temp_table($inputs);
+		$sale = model(Sale::class);
+		$sale->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			'summary' => array(
-				array('id' => $this->lang->line('reports_sale_id')),
-				array('type_code' => $this->lang->line('reports_code_type')),
-				array('sale_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-				array('quantity' => $this->lang->line('reports_quantity')),
-				array('employee_name' => $this->lang->line('reports_sold_by')),
-				array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-				array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-				array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-				array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
-				array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
-				array('comment' => $this->lang->line('reports_comments'))),
-			'details' => array(
-				$this->lang->line('reports_name'),
-				$this->lang->line('reports_category'),
-				$this->lang->line('reports_item_number'),
-				$this->lang->line('reports_description'),
-				$this->lang->line('reports_quantity'),
-				$this->lang->line('reports_subtotal'),
-				$this->lang->line('reports_tax'),
-				$this->lang->line('reports_total'),
-				$this->lang->line('reports_cost'),
-				$this->lang->line('reports_profit'),
-				$this->lang->line('reports_discount')),
-			'details_rewards' => array(
-				$this->lang->line('reports_used'),
-				$this->lang->line('reports_earned'))
-		);
+		return [
+			'summary' => [
+				['id' => lang('Reports.sale_id')],
+				['type_code' => lang('Reports.code_type')],
+				['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+				['quantity' => lang('Reports.quantity')],
+				['employee_name' => lang('Reports.sold_by')],
+				['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+				['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+				['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+				['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+				['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter'],
+				['payment_type' => lang('Reports.payment_type'), 'sortable' => FALSE],
+				['comment' => lang('Reports.comments')]
+			],
+			'details' => [
+				lang('Reports.name'),
+				lang('Reports.category'),
+				lang('Reports.item_number'),
+				lang('Reports.description'),
+				lang('Reports.quantity'),
+				lang('Reports.subtotal'),
+				lang('Reports.tax'),
+				lang('Reports.total'),
+				lang('Reports.cost'),
+				lang('Reports.profit'),
+				lang('Reports.discount')
+			],
+			'details_rewards' => [
+				lang('Reports.used'),
+				lang('Reports.earned')
+			]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('sale_id,
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('
+			sale_id,
 			MAX(CASE
-			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\'
-			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\'
-			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\'
-			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\'
-			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_return') . '\'
-			WHEN sale_status = ' . CANCELED . ' THEN \'' . $this->lang->line('reports_code_canceled') . '\'
+			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_pos') . '\'
+			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_invoice') . '\'
+			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_work_order') . '\'
+			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_quote') . '\'
+			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_return') . '\'
+			WHEN sale_status = ' . CANCELED . ' THEN \'' . lang('Reports.code_canceled') . '\'
 			ELSE \'\'
 			END) AS type_code,
 			MAX(sale_status) as sale_status,
-			MAX(sale_time) AS sale_time,
+			MAX(sale_date) AS sale_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(employee_name) AS employee_name,
 			SUM(subtotal) AS subtotal,
@@ -67,133 +81,133 @@ class Specific_customer extends Report
 			SUM(profit) AS profit,
 			MAX(payment_type) AS payment_type,
 			MAX(comment) AS comment');
-		$this->db->from('sales_items_temp');
 
-		$this->db->where('customer_id', $inputs['customer_id']);
+		$builder->where('customer_id', $inputs['customer_id']);	//TODO: Duplicated code
 
 		if($inputs['payment_type'] == 'invoices')
 		{
-			$this->db->where('sale_type', SALE_TYPE_INVOICE);
+			$builder->where('sale_type', SALE_TYPE_INVOICE);
 		}
 		elseif($inputs['payment_type'] != 'all')
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_'.$inputs['payment_type']));
+			$builder->like('payment_type', lang('Sales.'.$inputs['payment_type']));
 		}
 
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		$this->db->group_by('sale_id');
-		$this->db->order_by('MAX(sale_time)');
+		$builder->groupBy('sale_id');	//TODO: Duplicated code
+		$builder->orderBy('MAX(sale_date)');
 
-		$data = array();
-		$data['summary'] = $this->db->get()->result_array();
-		$data['details'] = array();
-		$data['rewards'] = array();
+		$data = [];
+		$data['summary'] = $builder->get()->getResultArray();
+		$data['details'] = [];
+		$data['rewards'] = [];
 
-		foreach($data['summary'] as $key=>$value)
+		foreach($data['summary'] as $key => $value)
 		{
-			$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
-			$this->db->from('sales_items_temp');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['details'][$key] = $this->db->get()->result_array();
-			$this->db->select('used, earned');
-			$this->db->from('sales_reward_points');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['rewards'][$key] = $this->db->get()->result_array();
+			$builder = $this->db->table('sales_items_temp');
+			$builder->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['details'][$key] = $builder->get()->getResultArray();
+
+			$builder = $this->db->table('sales_reward_points');
+			$builder->select('used, earned');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['rewards'][$key] = $builder->get()->getResultArray();
 		}
 
 		return $data;
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
 
-		$this->db->where('customer_id', $inputs['customer_id']);
+		$builder->where('customer_id', $inputs['customer_id']);	//TODO: Duplicate code
 
 		if($inputs['payment_type'] == 'invoices')
 		{
-			$this->db->where('sale_type', SALE_TYPE_INVOICE);
+			$builder->where('sale_type', SALE_TYPE_INVOICE);
 		}
 		elseif ($inputs['payment_type'] != 'all')
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_'.$inputs['payment_type']));
+			$builder->like('payment_type', lang('Sales.'.$inputs['payment_type']));
 		}
 
+		//TODO: This needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Specific_discount.php b/app/Models/Reports/Specific_discount.php
old mode 100755
new mode 100644
index 8bc992449..13e5117a2
--- a/app/Models/Reports/Specific_discount.php
+++ b/app/Models/Reports/Specific_discount.php
@@ -1,64 +1,78 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Sale;
+
+/**
+ *
+ *
+ * @property sale sale
+ *
+ */
 class Specific_discount extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Sale->create_temp_table($inputs);
+		$sale = model(Sale::class);
+		$sale->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
-	{
-		return array(
-			'summary' => array(
-				array('id' => $this->lang->line('reports_sale_id')),
-				array('type_code' => $this->lang->line('reports_code_type')),
-				array('sale_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-				array('quantity' => $this->lang->line('reports_quantity')),
-				array('employee_name' => $this->lang->line('reports_sold_by')),
-				array('customer_name' => $this->lang->line('reports_sold_to')),
-				array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-				array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-				array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-				array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
-				array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
-				array('comment' => $this->lang->line('reports_comments'))),
-			'details' => array(
-				$this->lang->line('reports_name'),
-				$this->lang->line('reports_category'),
-				$this->lang->line('reports_item_number'),
-				$this->lang->line('reports_description'),
-				$this->lang->line('reports_quantity'),
-				$this->lang->line('reports_subtotal'),
-				$this->lang->line('reports_tax'),
-				$this->lang->line('reports_total'),
-				$this->lang->line('reports_cost'),
-				$this->lang->line('reports_profit'),
-				$this->lang->line('reports_discount')),
-			'details_rewards' => array(
-				$this->lang->line('reports_used'),
-				$this->lang->line('reports_earned'))
-		);
+	public function getDataColumns(): array
+	{	//TODO: Duplicated code
+		return [
+			'summary' => [
+				['id' => lang('Reports.sale_id')],
+				['type_code' => lang('Reports.code_type')],
+				['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+				['quantity' => lang('Reports.quantity')],
+				['employee_name' => lang('Reports.sold_by')],
+				['customer_name' => lang('Reports.sold_to')],
+				['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+				['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+				['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+				['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+				['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter'],
+				['payment_type' => lang('Reports.payment_type'), 'sortable' => FALSE],
+				['comment' => lang('Reports.comments')]
+			],
+			'details' => [
+				lang('Reports.name'),
+				lang('Reports.category'),
+				lang('Reports.item_number'),
+				lang('Reports.description'),
+				lang('Reports.quantity'),
+				lang('Reports.subtotal'),
+				lang('Reports.tax'),
+				lang('Reports.total'),
+				lang('Reports.cost'),
+				lang('Reports.profit'),
+				lang('Reports.discount')
+			],
+			'details_rewards' => [
+				lang('Reports.used'),
+				lang('Reports.earned')
+			]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('sale_id,
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('
+			sale_id,
 			MAX(CASE
-			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\'
-			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\'
-			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\'
-			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\'
-			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_return') . '\'
-			WHEN sale_status = ' . CANCELED . ' THEN \'' . $this->lang->line('reports_code_canceled') . '\'
+			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_pos') . '\'
+			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_invoice') . '\'
+			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_work_order') . '\'
+			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_quote') . '\'
+			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_return') . '\'
+			WHEN sale_status = ' . CANCELED . ' THEN \'' . lang('Reports.code_canceled') . '\'
 			ELSE \'\'
 			END) AS type_code,
 			MAX(sale_status) as sale_status,
-			MAX(sale_time) AS sale_time,
+			MAX(sale_date) AS sale_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(employee_name) AS employee_name,
 			MAX(customer_name) AS customer_name,
@@ -69,117 +83,118 @@ class Specific_discount extends Report
 			SUM(profit) AS profit,
 			MAX(payment_type) AS payment_type,
 			MAX(comment) AS comment');
-		$this->db->from('sales_items_temp');
 
-		$this->db->where('discount >=', $inputs['discount']);
-		$this->db->where('discount_type', $inputs['discount_type']);
+		$builder->where('discount >=', $inputs['discount']);	//TODO: Duplicated code
+		$builder->where('discount_type', $inputs['discount_type']);
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		$this->db->group_by('sale_id');
-		$this->db->order_by('MAX(sale_time)');
+		$builder->groupBy('sale_id');	//TODO: Duplicated code
+		$builder->orderBy('MAX(sale_date)');
 
-		$data = array();
-		$data['summary'] = $this->db->get()->result_array();
-		$data['details'] = array();
-		$data['rewards'] = array();
+		$data = [];
+		$data['summary'] = $builder->get()->getResultArray();
+		$data['details'] = [];
+		$data['rewards'] = [];
 
-		foreach($data['summary'] as $key=>$value)
+		foreach($data['summary'] as $key => $value)
 		{
-			$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
-			$this->db->from('sales_items_temp');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['details'][$key] = $this->db->get()->result_array();
-			$this->db->select('used, earned');
-			$this->db->from('sales_reward_points');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['rewards'][$key] = $this->db->get()->result_array();
+			$builder = $this->db->table('sales_items_temp');
+			$builder->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['details'][$key] = $builder->get()->getResultArray();
+
+			$builder = $this->db->table('sales_reward_points');
+			$builder->select('used, earned');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['rewards'][$key] = $builder->get()->getResultArray();
 		}
 
 		return $data;
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
 
-		$this->db->where('discount >=', $inputs['discount']);
-		$this->db->where('discount_type', $inputs['discount_type']);
+		$builder->where('discount >=', $inputs['discount']);	//TODO: Duplicated code
+		$builder->where('discount_type', $inputs['discount_type']);
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Specific_employee.php b/app/Models/Reports/Specific_employee.php
index 62b542dd8..f12306eee 100644
--- a/app/Models/Reports/Specific_employee.php
+++ b/app/Models/Reports/Specific_employee.php
@@ -1,63 +1,77 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Sale;
+
+/**
+ *
+ *
+ * @property sale sale
+ *
+ */
 class Specific_employee extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Sale->create_temp_table($inputs);
+		$sale = model(Sale::class);
+		$sale->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			'summary' => array(
-				array('id' => $this->lang->line('reports_sale_id')),
-				array('type_code' => $this->lang->line('reports_code_type')),
-				array('sale_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-				array('quantity' => $this->lang->line('reports_quantity')),
-				array('customer_name' => $this->lang->line('reports_sold_to')),
-				array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-				array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-				array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-				array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-				array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
-				array('payment_type' => $this->lang->line('reports_payment_type'), 'sortable' => FALSE),
-				array('comment' => $this->lang->line('reports_comments'))),
-			'details' => array(
-				$this->lang->line('reports_name'),
-				$this->lang->line('reports_category'),
-				$this->lang->line('reports_item_number'),
-				$this->lang->line('reports_description'),
-				$this->lang->line('reports_quantity'),
-				$this->lang->line('reports_subtotal'),
-				$this->lang->line('reports_tax'),
-				$this->lang->line('reports_total'),
-				$this->lang->line('reports_cost'),
-				$this->lang->line('reports_profit'),
-				$this->lang->line('reports_discount')),
-			'details_rewards' => array(
-				$this->lang->line('reports_used'),
-				$this->lang->line('reports_earned'))
-		);
+		return [
+			'summary' => [
+				['id' => lang('Reports.sale_id')],
+				['type_code' => lang('Reports.code_type')],
+				['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+				['quantity' => lang('Reports.quantity')],
+				['customer_name' => lang('Reports.sold_to')],
+				['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+				['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+				['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+				['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+				['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter'],
+				['payment_type' => lang('Reports.payment_type'), 'sortable' => FALSE],
+				['comment' => lang('Reports.comments')]
+			],
+			'details' => [
+				lang('Reports.name'),
+				lang('Reports.category'),
+				lang('Reports.item_number'),
+				lang('Reports.description'),
+				lang('Reports.quantity'),
+				lang('Reports.subtotal'),
+				lang('Reports.tax'),
+				lang('Reports.total'),
+				lang('Reports.cost'),
+				lang('Reports.profit'),
+				lang('Reports.discount')
+			],
+			'details_rewards' => [
+				lang('Reports.used'),
+				lang('Reports.earned')
+			]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('sale_id,
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('
+			sale_id,
 			MAX(CASE
-			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\'
-			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\'
-			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\'
-			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\'
-			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_return') . '\'
-			WHEN sale_status = ' . CANCELED . ' THEN \'' . $this->lang->line('reports_code_canceled') . '\'
+			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_pos') . '\'
+			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_invoice') . '\'
+			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_work_order') . '\'
+			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_quote') . '\'
+			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_return') . '\'
+			WHEN sale_status = ' . CANCELED . ' THEN \'' . lang('Reports.code_canceled') . '\'
 			ELSE \'\'
 			END) AS type_code,
 			MAX(sale_status) as sale_status,
-			MAX(sale_time) AS sale_time,
+			MAX(sale_date) AS sale_date,
 			SUM(quantity_purchased) AS items_purchased,
 			MAX(customer_name) AS customer_name,
 			SUM(subtotal) AS subtotal,
@@ -67,115 +81,115 @@ class Specific_employee extends Report
 			SUM(profit) AS profit,
 			MAX(payment_type) AS payment_type,
 			MAX(comment) AS comment');
-		$this->db->from('sales_items_temp');
 
-		$this->db->where('employee_id', $inputs['employee_id']);
+		$builder->where('employee_id', $inputs['employee_id']);	//TODO: Duplicated code
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		$this->db->group_by('sale_id');
-		$this->db->order_by('MAX(sale_time)');
+		$builder->groupBy('sale_id');
+		$builder->orderBy('MAX(sale_date)');
 
-		$data = array();
-		$data['summary'] = $this->db->get()->result_array();
-		$data['details'] = array();
-		$data['rewards'] = array();
+		$data = [];
+		$data['summary'] = $builder->get()->getResultArray();
+		$data['details'] = [];
+		$data['rewards'] = [];
 
-		foreach($data['summary'] as $key=>$value)
+		foreach($data['summary'] as $key => $value)
 		{
-			$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
-			$this->db->from('sales_items_temp');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['details'][$key] = $this->db->get()->result_array();
-			$this->db->select('used, earned');
-			$this->db->from('sales_reward_points');
-			$this->db->where('sale_id', $value['sale_id']);
-			$data['rewards'][$key] = $this->db->get()->result_array();
+			$builder = $this->db->table('sales_items_temp');
+			$builder->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['details'][$key] = $builder->get()->getResultArray();
+
+			$builder = $this->db->table('sales_reward_points');
+			$builder->select('used, earned');
+			$builder->where('sale_id', $value['sale_id']);
+			$data['rewards'][$key] = $builder->get()->getResultArray();
 		}
 
 		return $data;
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
-
-		$this->db->where('employee_id', $inputs['employee_id']);
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
+		$builder->where('employee_id', $inputs['employee_id']);	//TODO: Duplicated code
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Specific_supplier.php b/app/Models/Reports/Specific_supplier.php
index 19ebf8f45..4f367ee46 100644
--- a/app/Models/Reports/Specific_supplier.php
+++ b/app/Models/Reports/Specific_supplier.php
@@ -1,48 +1,59 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
+use app\Models\Sale;
+
+/**
+ *
+ *
+ * @property sale sale
+ *
+ */
 class Specific_supplier extends Report
 {
-	public function create(array $inputs)
+	public function create(array $inputs): void
 	{
 		//Create our temp tables to work with the data in our report
-		$this->Sale->create_temp_table($inputs);
+		$sale = model(Sale::class);
+		$sale->create_temp_table($inputs);
 	}
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
-		return array(
-			array('id' => $this->lang->line('reports_sale_id')),
-			array('type_code' => $this->lang->line('reports_code_type')),
-			array('sale_time' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-			array('name' => $this->lang->line('reports_name')),
-			array('category' => $this->lang->line('reports_category')),
-			array('item_number' => $this->lang->line('reports_item_number')),
-			array('quantity' => $this->lang->line('reports_quantity')),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'),
-			array('discount' => $this->lang->line('reports_discount'))
-		);
+		return [
+			['id' => lang('Reports.sale_id')],
+			['type_code' => lang('Reports.code_type')],
+			['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+			['name' => lang('Reports.name')],
+			['category' => lang('Reports.category')],
+			['item_number' => lang('Reports.item_number')],
+			['quantity' => lang('Reports.quantity')],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter'],
+			['discount' => lang('Reports.discount')]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('sale_id,
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('
+			sale_id,
 			MAX(CASE
-			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\'
-			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\'
-			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\'
-			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\'
-			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_return') . '\'
-			WHEN sale_status = ' . CANCELED . ' THEN \'' . $this->lang->line('reports_code_canceled') . '\'
+			WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_pos') . '\'
+			WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_invoice') . '\'
+			WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_work_order') . '\'
+			WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . lang('Reports.code_quote') . '\'
+			WHEN sale_type = ' . SALE_TYPE_RETURN . ' && sale_status = ' . COMPLETED . ' THEN \'' . lang('Reports.code_return') . '\'
+			WHEN sale_status = ' . CANCELED . ' THEN \'' . lang('Reports.code_canceled') . '\'
 			ELSE \'\'
 			END) AS type_code,
 			MAX(sale_status) as sale_status,
-			MAX(sale_time) AS sale_time,
+			MAX(sale_date) AS sale_date,
 			MAX(name) AS name,
 			MAX(category) AS category,
 			MAX(item_number) AS item_number,
@@ -54,98 +65,97 @@ class Specific_supplier extends Report
 			SUM(profit) AS profit,
 			MAX(discount_type) AS discount_type,
 			MAX(discount) AS discount');
-		$this->db->from('sales_items_temp');
 
-		$this->db->where('supplier_id', $inputs['supplier_id']);
+		$builder->where('supplier_id', $inputs['supplier_id']);	//TODO: Duplicated code
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		$this->db->group_by('item_id');
-		$this->db->order_by('sale_id');
+		$builder->groupBy('item_id');
+		$builder->orderBy('sale_id');
 
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
-		$this->db->from('sales_items_temp');
-
-		$this->db->where('supplier_id', $inputs['supplier_id']);
+		$builder = $this->db->table('sales_items_temp');
+		$builder->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit');
+		$builder->where('supplier_id', $inputs['supplier_id']);
 
+		//TODO: this needs to be converted to a switch statement
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->or_where('sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->orWhere('sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->group_start();
-			$this->db->where('sale_type', SALE_TYPE_POS);
-			$this->db->or_where('sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sale_status', COMPLETED);
+			$builder->groupStart();
+			$builder->where('sale_type', SALE_TYPE_POS);
+			$builder->orWhere('sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sale_status', SUSPENDED);
-			$this->db->where('sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sale_status', SUSPENDED);
+			$builder->where('sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sale_status', CANCELED);
+			$builder->where('sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sale_status', COMPLETED);
-			$this->db->where('sale_type', SALE_TYPE_RETURN);
+			$builder->where('sale_status', COMPLETED);
+			$builder->where('sale_type', SALE_TYPE_RETURN);
 		}
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_categories.php b/app/Models/Reports/Summary_categories.php
index 5ecf525d7..f5c0864ad 100644
--- a/app/Models/Reports/Summary_categories.php
+++ b/app/Models/Reports/Summary_categories.php
@@ -1,42 +1,42 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_categories extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('category' => $this->lang->line('reports_category')),
-			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['category' => lang('Reports.category')],
+			['quantity' => lang('Reports.quantity'), 'sorter' => 'number_sorter'],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, &$builder): void	//TODO: Hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);	//TODO: hungarian notation
 
-		$this->db->select('
-				items.category AS category,
-				SUM(sales_items.quantity_purchased) AS quantity_purchased
+		$builder->select('
+			items.category AS category,
+			SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');
 	}
 
-	protected function _from()
+	protected function _from(&$builder): void	//TODO: hungarian notation
 	{
-		parent::_from();
+		parent::_from($builder);
 
-		$this->db->join('items AS items', 'sales_items.item_id = items.item_id', 'inner');
+		$builder->join('items AS items', 'sales_items.item_id = items.item_id', 'inner');
 	}
 
-	protected function _group_order()
+	protected function _group_order(&$builder): void	//TODO: hungarian notation
 	{
-		$this->db->group_by('category');
-		$this->db->order_by('category');
+		$builder->groupBy('category');
+		$builder->orderBy('category');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_customers.php b/app/Models/Reports/Summary_customers.php
index ff0e9aaf0..a43ebb3d3 100644
--- a/app/Models/Reports/Summary_customers.php
+++ b/app/Models/Reports/Summary_customers.php
@@ -1,44 +1,44 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_customers extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('customer_name' => $this->lang->line('reports_customer')),
-			array('sales' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
-			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['customer_name' => lang('Reports.customer')],
+			['sales' => lang('Reports.sales'), 'sorter' => 'number_sorter'],
+			['quantity' => lang('Reports.quantity'), 'sorter' => 'number_sorter'],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, object &$builder): void	//TODO: Hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);	//TODO: Hungarian notation
 
-		$this->db->select('
+		$builder->select('
 				MAX(CONCAT(customer_p.first_name, " ", customer_p.last_name)) AS customer,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased,
 				COUNT(DISTINCT sales.sale_id) AS sales
 		');
 	}
 
-	protected function _from()
+	protected function _from(object &$builder): void	//TODO: Hungarian notation
 	{
-		parent::_from();
+		parent::_from($builder);	//TODO: Hungarian notation
 
-		$this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id');
+		$builder->join('people AS customer_p', 'sales.customer_id = customer_p.person_id');
 	}
 
-	protected function _group_order()
+	protected function _group_order(object &$builder): void	//TODO: Hungarian notation
 	{
-		$this->db->group_by('sales.customer_id');
-		$this->db->order_by('customer_p.last_name');
+		$builder->groupBy('sales.customer_id');
+		$builder->orderBy('customer_p.last_name');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_discounts.php b/app/Models/Reports/Summary_discounts.php
index 925165740..280c45b0e 100644
--- a/app/Models/Reports/Summary_discounts.php
+++ b/app/Models/Reports/Summary_discounts.php
@@ -1,41 +1,41 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_discounts extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('discount' => $this->lang->line('reports_discount'), 'sorter' => 'number_sorter'),
-			array('count' => $this->lang->line('reports_count')),
-			array('total' => $this->lang->line('reports_total')));
+		return [
+			['discount' => lang('Reports.discount'), 'sorter' => 'number_sorter'],
+			['count' => lang('Reports.count')],
+			['total' => lang('Reports.total')]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		if($inputs['discount_type'] == FIXED)
+		$builder = $this->db->table('sales_items AS sales_items');
+
+		if($inputs['discount_type'] == FIXED)	//TODO: if there are only two options for this if/else statement then it needs to be refactored to use ternary operators. Also ===?
 		{
-			$this->db->select('SUM(sales_items.discount) AS total, MAX(CONCAT("'.$this->config->item('currency_symbol').'",sales_items.discount)) AS discount, count(*) AS count');
-			$this->db->where('discount_type', FIXED);
+			$builder->select('SUM(sales_items.discount) AS total, MAX(CONCAT("' . config('OSPOS')->currency_symbol . '",sales_items.discount)) AS discount, count(*) AS count');
+			$builder->where('discount_type', FIXED);
 		}
-		elseif($inputs['discount_type'] == PERCENT)
+		elseif($inputs['discount_type'] == PERCENT)	//TODO: === ?
 		{
-			$this->db->select('SUM(item_unit_price) * sales_items.discount / 100.0 AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
-			$this->db->where('discount_type', PERCENT);
-		}	
-		
-		$this->db->where('discount >', 0);
-		$this->db->group_by('sales_items.discount');
-		$this->db->order_by('sales_items.discount');
-		
+			$builder->select('SUM(item_unit_price) * sales_items.discount / 100.0 AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
+			$builder->where('discount_type', PERCENT);
+		}
 
-		$this->db->from('sales_items AS sales_items');
-		$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
+		$builder->where('discount >', 0);
+		$builder->groupBy('sales_items.discount');
+		$builder->orderBy('sales_items.discount');
 
-		$this->_where($inputs);
+		$builder->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
 
-		return $this->db->get()->result_array();
+		$this->_where($inputs, $builder);	//TODO: Hungarian notation
+
+		return $builder->get()->getResultArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_employees.php b/app/Models/Reports/Summary_employees.php
index 12354ce86..faa9b2568 100644
--- a/app/Models/Reports/Summary_employees.php
+++ b/app/Models/Reports/Summary_employees.php
@@ -1,44 +1,45 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_employees extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('employee_name' => $this->lang->line('reports_employee')),
-			array('sales' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
-			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['employee_name' => lang('Reports.employee')],
+			['sales' => lang('Reports.sales'), 'sorter' => 'number_sorter'],
+			['quantity' => lang('Reports.quantity'), 'sorter' => 'number_sorter'],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);
 
-		$this->db->select('
+		$builder->select('
 				MAX(CONCAT(employee_p.first_name, " ", employee_p.last_name)) AS employee,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased,
 				COUNT(DISTINCT sales.sale_id) AS sales
 		');
 	}
 
-	protected function _from()
+	protected function _from(object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_from();
+		parent::_from($builder);
 
-		$this->db->join('people AS employee_p', 'sales.employee_id = employee_p.person_id');
+		$builder->join('people AS employee_p', 'sales.employee_id = employee_p.person_id');
 	}
 
-	protected function _group_order()
+	protected function _group_order(object &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->group_by('sales.employee_id');
-		$this->db->order_by('employee_p.last_name');
+		$builder->groupBy('sales.employee_id');
+		$builder->orderBy('employee_p.last_name');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_expenses_categories.php b/app/Models/Reports/Summary_expenses_categories.php
index d72cc43d1..a0e48bd6e 100644
--- a/app/Models/Reports/Summary_expenses_categories.php
+++ b/app/Models/Reports/Summary_expenses_categories.php
@@ -1,58 +1,59 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_expenses_categories extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('category_name' => $this->lang->line('reports_expenses_category')),
-			array('count' => $this->lang->line('reports_count')),
-			array('total_amount' => $this->lang->line('reports_expenses_amount'), 'sorter' => 'number_sorter'),
-			array('total_tax_amount' => $this->lang->line('reports_expenses_tax_amount'), 'sorter' => 'number_sorter'));
+		return [
+			['category_name' => lang('Reports.expenses_category')],
+			['count' => lang('Reports.count')],
+			['total_amount' => lang('Reports.expenses_amount'), 'sorter' => 'number_sorter'],
+			['total_tax_amount' => lang('Reports.expenses_tax_amount'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->db->select('expense_categories.category_name AS category_name, COUNT(expenses.expense_id) AS count, SUM(expenses.amount) AS total_amount, SUM(expenses.tax_amount) AS total_tax_amount');
-		$this->db->from('expenses AS expenses');
-		$this->db->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
+		$builder = $this->db->table('expenses AS expenses');
+		$builder->select('expense_categories.category_name AS category_name, COUNT(expenses.expense_id) AS count, SUM(expenses.amount) AS total_amount, SUM(expenses.tax_amount) AS total_tax_amount');
+		$builder->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
 
-		if(empty($this->config->item('date_or_time_format')))
+		//TODO: convert this to ternary notation
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: Duplicated code
 		{
-			$this->db->where('DATE(expenses.date) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+			$builder->where('DATE(expenses.date) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
 		}
 		else
 		{
-			$this->db->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+			$builder->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 
-		$this->db->where('expenses.deleted', 0);
+		$builder->where('expenses.deleted', 0);
 
-		$this->db->group_by('expense_categories.category_name');
-		$this->db->order_by('expense_categories.category_name');
+		$builder->groupBy('expense_categories.category_name');
+		$builder->orderBy('expense_categories.category_name');
 
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->db->select('SUM(expenses.amount) AS expenses_total_amount, SUM(expenses.tax_amount) AS expenses_total_tax_amount');
-		$this->db->from('expenses AS expenses');
+		$builder = $this->db->table('expenses AS expenses');
+		$builder->select('SUM(expenses.amount) AS expenses_total_amount, SUM(expenses.tax_amount) AS expenses_total_tax_amount');
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: Duplicated code
 		{
-			$this->db->where('DATE(expenses.date) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+			$builder->where('DATE(expenses.date) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
 		}
 		else
 		{
-			$this->db->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+			$builder->where('expenses.date BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 
-		$this->db->where('expenses.deleted', 0);
+		$builder->where('expenses.deleted', 0);
 
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_items.php b/app/Models/Reports/Summary_items.php
index b278f4b25..56fc8e73d 100644
--- a/app/Models/Reports/Summary_items.php
+++ b/app/Models/Reports/Summary_items.php
@@ -1,48 +1,46 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_items extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: Hungarian notation
 	{
-		return array(
-			array('item_name' => $this->lang->line('reports_item')),
-			array('category' => $this->lang->line('reports_category')),
-			array('cost_price' => $this->lang->line('reports_cost_price'), 'sorter' => 'number_sorter'),
-			array('unit_price' => $this->lang->line('reports_unit_price'), 'sorter' => 'number_sorter'),
-			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['item_name' => lang('Reports.item')],
+			['category' => lang('Reports.category')],
+			['unit_price' => lang('Reports.unit_price'), 'sorter' => 'number_sorter'],
+			['quantity' => lang('Reports.quantity')],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);	//TODO: hungarian notation
 
-		$this->db->select('
+		$builder->select('
 				MAX(items.name) AS name,
 				MAX(items.category) AS category,
-				MAX(items.cost_price) AS cost_price,
 				MAX(items.unit_price) AS unit_price,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');
 	}
 
-	protected function _from()
+	protected function _from(object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_from();
+		parent::_from($builder);
 
-		$this->db->join('items AS items', 'sales_items.item_id = items.item_id', 'inner');
+		$builder->join('items AS items', 'sales_items.item_id = items.item_id', 'inner');
 	}
 
-	protected function _group_order()
+	protected function _group_order(object &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->group_by('items.item_id');
-		$this->db->order_by('name');
+		$builder->groupBy('items.item_id');
+		$builder->orderBy('name');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_payments.php b/app/Models/Reports/Summary_payments.php
index 8866d0e45..02478ce25 100644
--- a/app/Models/Reports/Summary_payments.php
+++ b/app/Models/Reports/Summary_payments.php
@@ -1,26 +1,27 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_payments extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array    //TODO: Hungarian notation
 	{
-		return array(
-			array('trans_group' => $this->lang->line('reports_trans_group')),
-			array('trans_type' => $this->lang->line('reports_trans_type')),
-			array('trans_sales' => $this->lang->line('reports_sales')),
-			array('trans_amount' => $this->lang->line('reports_trans_amount')),
-			array('trans_payments' => $this->lang->line('reports_trans_payments')),
-			array('trans_refunded' => $this->lang->line('reports_trans_refunded')),
-			array('trans_due' => $this->lang->line('reports_trans_due')));
+		return [
+			['trans_group' => lang('Reports.trans_group')],
+			['trans_type' => lang('Reports.trans_type')],
+			['trans_sales' => lang('Reports.sales')],
+			['trans_amount' => lang('Reports.trans_amount')],
+			['trans_payments' => lang('Reports.trans_payments')],
+			['trans_refunded' => lang('Reports.trans_refunded')],
+			['trans_due' => lang('Reports.trans_due')]
+		];
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$cash_payment = $this->lang->line('sales_cash');
+		$cash_payment = lang('Sales.cash');    //TODO: This is never used.  Should it be?
 
-		$separator[] = array(
+		$separator[] = [
 			'trans_group' => '<HR>',
 			'trans_type' => '',
 			'trans_sales' => '',
@@ -28,25 +29,23 @@ class Summary_payments extends Summary_report
 			'trans_payments' => '',
 			'trans_refunded' => '',
 			'trans_due' => ''
-		);
+		];
 
-		$where = '';
+		$where = '';    //TODO: Duplicated code
 
-		if(empty($this->config->item('date_or_time_format')))
-		{
+		//TODO: this needs to be converted to ternary notation
+		if(empty(config('OSPOS')->date_or_time_format)) {
 			$where .= 'DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
-		}
-		else
-		{
+		} else {
 			$where .= 'sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
 		}
 
 		$this->create_summary_payments_temp_tables($where);
 
-		$select = '\'' . $this->lang->line('reports_trans_sales') . '\' AS trans_group, ';
-		$select .= '(CASE sale_type WHEN ' . SALE_TYPE_POS . ' THEN \'' . $this->lang->line('reports_code_pos')
-			. '\' WHEN ' . SALE_TYPE_INVOICE . ' THEN \'' . $this->lang->line('sales_invoice')
-			. '\' WHEN ' . SALE_TYPE_RETURN . ' THEN \'' . $this->lang->line('sales_return')
+		$select = '\'' . lang('Reports.trans_sales') . '\' AS trans_group, ';
+		$select .= '(CASE sale_type WHEN ' . SALE_TYPE_POS . ' THEN \'' . lang('Reports.code_pos')
+			. '\' WHEN ' . SALE_TYPE_INVOICE . ' THEN \'' . lang('Sales.invoice')
+			. '\' WHEN ' . SALE_TYPE_RETURN . ' THEN \'' . lang('Sales.return')
 			. '\' END) AS trans_type, ';
 		$select .= 'COUNT(sales.sale_id) AS trans_sales, ';
 		$select .= 'SUM(sumpay_items.trans_amount) AS trans_amount, ';
@@ -54,28 +53,26 @@ class Summary_payments extends Summary_report
 		$select .= 'IFNULL(SUM(sumpay_payments.total_cash_refund),0) AS trans_refunded, ';
 		$select .= 'SUM(CASE WHEN sumpay_items.trans_amount - IFNULL(sumpay_payments.total_payments,0) > 0 THEN sumpay_items.trans_amount - IFNULL(sumpay_payments.total_payments,0) ELSE 0 END) as trans_due ';
 
-		$this->db->select($select);
-		$this->db->from('ospos_sales AS sales');
-		$this->db->join('sumpay_items_temp AS sumpay_items', 'sales.sale_id = sumpay_items.sale_id', 'left outer');
-		$this->db->join('sumpay_payments_temp AS sumpay_payments', 'sales.sale_id = sumpay_payments.sale_id', 'left outer');
-		$this->db->where('sales.sale_status', COMPLETED);
-		$this->_where($inputs);
+		$builder = $this->db->table('ospos_sales AS sales');
+		$builder->select($select);
+		$builder->join('sumpay_items_temp AS sumpay_items', 'sales.sale_id = sumpay_items.sale_id', 'left outer');
+		$builder->join('sumpay_payments_temp AS sumpay_payments', 'sales.sale_id = sumpay_payments.sale_id', 'left outer');
+		$builder->where('sales.sale_status', COMPLETED);
+		$this->_where($inputs, $builder);
 
-		$this->db->group_by('trans_type');
+		$builder->groupBy('trans_type');
 
-		$sales = $this->db->get()->result_array();
+		$sales = $builder->get()->getResultArray();
 
 		// At this point in time refunds are assumed to be cash refunds.
 		$total_cash_refund = 0;
-		foreach($sales as $key => $sale_summary)
-		{
-			if($sale_summary['trans_refunded'] <> 0)
-			{
+		foreach($sales as $key => $sale_summary) {
+			if($sale_summary['trans_refunded'] <> 0) {
 				$total_cash_refund += $sale_summary['trans_refunded'];
 			}
 		}
 
-		$select = '\'' . $this->lang->line('reports_trans_payments') . '\' AS trans_group, ';
+		$select = '\'' . lang('Reports.trans_payments') . '\' AS trans_group, ';
 		$select .= 'sales_payments.payment_type as trans_type, ';
 		$select .= 'COUNT(sales.sale_id) AS trans_sales, ';
 		$select .= 'SUM(payment_amount - cash_refund) AS trans_amount,';
@@ -83,24 +80,22 @@ class Summary_payments extends Summary_report
 		$select .= 'SUM(cash_refund) AS trans_refunded, ';
 		$select .= '0 AS trans_due ';
 
-		$this->db->select($select);
-		$this->db->from('sales AS sales');
-		$this->db->join('sales_payments AS sales_payments', 'sales.sale_id = sales_payments.sale_id', 'left outer');
-		$this->db->where('sales.sale_status', COMPLETED);
-		$this->_where($inputs);
+		$builder = $this->db->table('sales AS sales');
+		$builder->select($select);
+		$builder->join('sales_payments AS sales_payments', 'sales.sale_id = sales_payments.sale_id', 'left outer');
+		$builder->where('sales.sale_status', COMPLETED);
+		$this->_where($inputs, $builder);
 
-		$this->db->group_by('sales_payments.payment_type');
+		$builder->groupBy('sales_payments.payment_type');
 
-		$payments = $this->db->get()->result_array();
+		$payments = $builder->get()->getResultArray();
 
 		// consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
 		$gift_card_count = 0;
 		$gift_card_amount = 0;
-		foreach($payments as $key => $payment)
-		{
-			if(strstr($payment['trans_type'], $this->lang->line('sales_giftcard')) !== FALSE)
-			{
-				$gift_card_count  += $payment['trans_sales'];
+		foreach($payments as $key => $payment) {
+			if(strstr($payment['trans_type'], lang('Sales.giftcard')) !== FALSE) {
+				$gift_card_count += $payment['trans_sales'];
 				$gift_card_amount += $payment['trans_amount'];
 
 				// Remove the "Gift Card: 1", "Gift Card: 2", etc. payment string
@@ -108,66 +103,71 @@ class Summary_payments extends Summary_report
 			}
 		}
 
-		if($gift_card_count > 0)
-		{
-			$payments[] = array('trans_group' => $this->lang->line('reports_trans_payments'), 'trans_type' => $this->lang->line('sales_giftcard'), 'trans_sales' => $gift_card_count,
-				'trans_amount' => $gift_card_amount, 'trans_payments' => $gift_card_amount, 'trans_refunded' => 0, 'trans_due' => 0);
+		if($gift_card_count > 0) {
+			$payments[] = [
+				'trans_group' => lang('Reports.trans_payments'),
+				'trans_type' => lang('Sales.giftcard'),
+				'trans_sales' => $gift_card_count,
+				'trans_amount' => $gift_card_amount,
+				'trans_payments' => $gift_card_amount,
+				'trans_refunded' => 0,
+				'trans_due' => 0
+			];
 		}
 
 		return array_merge($sales, $separator, $payments);
 	}
 
-	protected function create_summary_payments_temp_tables($where)
+	protected function create_summary_payments_temp_tables(string $where): void
 	{
 		$decimals = totals_decimals();
 
 		$trans_amount = 'SUM(CASE WHEN sales_items.discount_type = ' . PERCENT
 			. " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) "
 			. ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END) AS trans_amount';
-
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sumpay_taxes_temp') .
+//TODO: look into converting these to use QueryBuilder
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sumpay_taxes_temp') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT sales.sale_id, SUM(sales_taxes.sale_tax_amount) AS total_taxes
-				FROM ' . $this->db->dbprefix('sales') . ' AS sales
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_taxes') . ' AS sales_taxes
+				FROM ' . $this->db->prefixTable('sales') . ' AS sales
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_taxes') . ' AS sales_taxes
 					ON sales.sale_id = sales_taxes.sale_id
 				WHERE ' . $where . ' AND sales_taxes.tax_type = \'1\'
 				GROUP BY sale_id
 			)'
 		);
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sumpay_items_temp') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sumpay_items_temp') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
-				SELECT sales.sale_id, '. $trans_amount
-			. ' FROM ' . $this->db->dbprefix('sales') . ' AS sales '
-			. 'LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items '
+				SELECT sales.sale_id, ' . $trans_amount
+			. ' FROM ' . $this->db->prefixTable('sales') . ' AS sales '
+			. 'LEFT OUTER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items '
 			. 'ON sales.sale_id = sales_items.sale_id '
-			. 'LEFT OUTER JOIN ' . $this->db->dbprefix('sumpay_taxes_temp') . ' AS sumpay_taxes '
+			. 'LEFT OUTER JOIN ' . $this->db->prefixTable('sumpay_taxes_temp') . ' AS sumpay_taxes '
 			. 'ON sales.sale_id = sumpay_taxes.sale_id '
 			. 'WHERE ' . $where . ' GROUP BY sale_id
 			)'
 		);
 
-		$this->db->query('UPDATE ' . $this->db->dbprefix('sumpay_items_temp') . ' AS sumpay_items '
-			. 'SET trans_amount = trans_amount + IFNULL((SELECT total_taxes FROM ' . $this->db->dbprefix('sumpay_taxes_temp')
+		$this->db->query('UPDATE ' . $this->db->prefixTable('sumpay_items_temp') . ' AS sumpay_items '
+			. 'SET trans_amount = trans_amount + IFNULL((SELECT total_taxes FROM ' . $this->db->prefixTable('sumpay_taxes_temp')
 			. ' AS sumpay_taxes WHERE sumpay_items.sale_id = sumpay_taxes.sale_id),0)');
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sumpay_payments_temp') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sumpay_payments_temp') .
 			' (INDEX(sale_id)) ENGINE=MEMORY
 			(
 				SELECT sales.sale_id, COUNT(sales.sale_id) AS number_payments,
 				SUM(CASE WHEN sales_payments.cash_adjustment = 0 THEN sales_payments.payment_amount ELSE 0 END) AS total_payments,
 				SUM(CASE WHEN sales_payments.cash_adjustment = 1 THEN sales_payments.payment_amount ELSE 0 END) AS total_cash_adjustment,
 				SUM(sales_payments.cash_refund) AS total_cash_refund
-				FROM ' . $this->db->dbprefix('sales') . ' AS sales
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_payments') . ' AS sales_payments
+				FROM ' . $this->db->prefixTable('sales') . ' AS sales
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_payments') . ' AS sales_payments
 					ON sales.sale_id = sales_payments.sale_id
 				WHERE ' . $where . '
 				GROUP BY sale_id
 			)'
 		);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_report.php b/app/Models/Reports/Summary_report.php
index 81ad59522..c00f9356a 100644
--- a/app/Models/Reports/Summary_report.php
+++ b/app/Models/Reports/Summary_report.php
@@ -1,18 +1,17 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Report.php");
+namespace App\Models\Reports;
 
 abstract class Summary_report extends Report
 {
 	/**
 	 * Private interface implementing the core basic functionality for all reports
 	 */
-
-	private function __common_select(array $inputs)
+	private function __common_select(array $inputs, &$builder): void	//TODO: Hungarian notation
 	{
-		$where = '';
+		$where = '';	//TODO: Duplicated code
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
 			$where .= 'DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
 		}
@@ -33,7 +32,7 @@ abstract class Summary_report extends Report
 		$cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
 
 
-		if($this->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)
 		{
 			$sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment";
 			$sale_subtotal = "$sale_total - $sales_tax";
@@ -46,24 +45,24 @@ abstract class Summary_report extends Report
 		}
 
 		// create a temporary table to contain all the sum of taxes per sale item
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_taxes_temp') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_taxes_temp') .
 			' (INDEX(sale_id), INDEX(item_id)) ENGINE=MEMORY
 			(
 				SELECT sales_items_taxes.sale_id AS sale_id,
 					sales_items_taxes.item_id AS item_id,
 					sales_items_taxes.line AS line,
 					SUM(ROUND(sales_items_taxes.item_tax_amount,' . $decimals . ')) AS tax
-				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_items_taxes') . ' AS sales_items_taxes
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
-				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
+				INNER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
 				WHERE ' . $where . '
 				GROUP BY sale_id, item_id, line
 			)'
 		);
 
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_payments_temp') .
+		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_payments_temp') .
 			' (PRIMARY KEY(sale_id), INDEX(sale_id))
 			(
 				SELECT payments.sale_id AS sale_id,
@@ -71,16 +70,16 @@ abstract class Summary_report extends Report
 					SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
 					SUM(payments.cash_refund) AS sale_cash_refund,
 					GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type
-				FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = payments.sale_id
 				WHERE ' . $where . '
 				GROUP BY sale_id
 			)'
 		);
 
-
-		$this->db->select("
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+		$builder->select("
 				IFNULL($sale_subtotal, $sale_total) AS subtotal,
 				$sales_tax AS tax,
 				IFNULL($sale_total, $sale_subtotal) AS total,
@@ -89,81 +88,80 @@ abstract class Summary_report extends Report
 		");
 	}
 
-	private function __common_from()
+	private function __common_from(): void	//TODO: hungarian notation
 	{
-		$this->db->from('sales_items AS sales_items');
-		$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
-		$this->db->join('sales_items_taxes_temp AS sales_items_taxes',
+		$builder = $this->db->table('sales_items AS sales_items');
+		$builder->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
+		$builder->join('sales_items_taxes_temp AS sales_items_taxes',
 			'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
 			'left outer');
-		$this->db->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
-
+		$builder->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
 	}
 
-	private function __common_where(array $inputs)
+	private function __common_where(array $inputs, &$builder): void
 	{
-		if(empty($this->config->item('date_or_time_format')))
+		//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: Duplicated code
 		{
-			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+			$builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
 		}
 		else
 		{
-			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+			$builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('sales_items.item_location', $inputs['location_id']);
+			$builder->where('sales_items.item_location', $inputs['location_id']);
 		}
 
 		if($inputs['sale_type'] == 'complete')
 		{
-			$this->db->where('sales.sale_status', COMPLETED);
-			$this->db->group_start();
-				$this->db->where('sales.sale_type', SALE_TYPE_POS);
-				$this->db->or_where('sales.sale_type', SALE_TYPE_INVOICE);
-				$this->db->or_where('sales.sale_type', SALE_TYPE_RETURN);
-			$this->db->group_end();
+			$builder->where('sales.sale_status', COMPLETED);
+			$builder->groupStart();
+				$builder->where('sales.sale_type', SALE_TYPE_POS);
+				$builder->orWhere('sales.sale_type', SALE_TYPE_INVOICE);
+				$builder->orWhere('sales.sale_type', SALE_TYPE_RETURN);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'sales')
 		{
-			$this->db->where('sales.sale_status', COMPLETED);
-			$this->db->group_start();
-				$this->db->where('sales.sale_type', SALE_TYPE_POS);
-				$this->db->or_where('sales.sale_type', SALE_TYPE_INVOICE);
-			$this->db->group_end();
+			$builder->where('sales.sale_status', COMPLETED);
+			$builder->groupStart();
+				$builder->where('sales.sale_type', SALE_TYPE_POS);
+				$builder->orWhere('sales.sale_type', SALE_TYPE_INVOICE);
+			$builder->groupEnd();
 		}
 		elseif($inputs['sale_type'] == 'quotes')
 		{
-			$this->db->where('sales.sale_status', SUSPENDED);
-			$this->db->where('sales.sale_type', SALE_TYPE_QUOTE);
+			$builder->where('sales.sale_status', SUSPENDED);
+			$builder->where('sales.sale_type', SALE_TYPE_QUOTE);
 		}
 		elseif($inputs['sale_type'] == 'work_orders')
 		{
-			$this->db->where('sales.sale_status', SUSPENDED);
-			$this->db->where('sales.sale_type', SALE_TYPE_WORK_ORDER);
+			$builder->where('sales.sale_status', SUSPENDED);
+			$builder->where('sales.sale_type', SALE_TYPE_WORK_ORDER);
 		}
 		elseif($inputs['sale_type'] == 'canceled')
 		{
-			$this->db->where('sales.sale_status', CANCELED);
+			$builder->where('sales.sale_status', CANCELED);
 		}
 		elseif($inputs['sale_type'] == 'returns')
 		{
-			$this->db->where('sales.sale_status', COMPLETED);
-			$this->db->where('sales.sale_type', SALE_TYPE_RETURN);
+			$builder->where('sales.sale_status', COMPLETED);
+			$builder->where('sales.sale_type', SALE_TYPE_RETURN);
 		}
 	}
 
 	/**
 	 * Protected class interface implemented by derived classes where required
 	 */
+	abstract protected function _get_data_columns(): array;	//TODO: hungarian notation
 
-	abstract protected function _get_data_columns();
-
-	protected function _select(array $inputs)	{ $this->__common_select($inputs); }
-	protected function _from()					{ $this->__common_from(); }
-	protected function _where(array $inputs)	{ $this->__common_where($inputs); }
-	protected function _group_order()			{}
+	protected function _select(array $inputs, object &$builder): void { $this->__common_select($inputs, $builder); }	//TODO: hungarian notation
+	protected function _from(object &$builder): void { $this->__common_from(); }	//TODO: hungarian notation TODO: Do we need to pass &$builder to the __common_from()?
+	protected function _where(array $inputs, object &$builder): void { $this->__common_where($inputs, $builder); }	//TODO: hungarian notation
+	protected function _group_order(object &$builder): void {}	//TODO: hungarian notation
 
 	/**
 	 * Public interface implementing the base abstract class, 
@@ -171,33 +169,28 @@ abstract class Summary_report extends Report
 	 * like a non sale report (e.g. expenses)
 	 */
 
-	public function getDataColumns()
+	public function getDataColumns(): array
 	{
 		return $this->_get_data_columns();
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$this->_select($inputs);
+		$this->_select($inputs, $builder);
+		$this->_from($builder);
+		$this->_where($inputs, $builder);
+		$this->_group_order($builder);
 
-		$this->_from();
-
-		$this->_where($inputs);
-
-		$this->_group_order();
-
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
-	public function getSummaryData(array $inputs)
+	public function getSummaryData(array $inputs): array
 	{
-		$this->__common_select($inputs);
-
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+		$this->__common_select($inputs, $builder);
 		$this->__common_from();
+		$this->_where($inputs, $builder);
 
-		$this->_where($inputs);
-
-		return $this->db->get()->row_array();
+		return $builder->get()->getRowArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_sales.php b/app/Models/Reports/Summary_sales.php
index 389ebdd8a..084e4dd2c 100644
--- a/app/Models/Reports/Summary_sales.php
+++ b/app/Models/Reports/Summary_sales.php
@@ -1,37 +1,37 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_sales extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array
 	{
-		return array(
-			array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
-			array('sales' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
-			array('quantity' => $this->lang->line('reports_quantity'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['sale_date' => lang('Reports.date'), 'sortable' => FALSE],
+			['sales' => lang('Reports.sales'), 'sorter' => 'number_sorter'],
+			['quantity' => lang('Reports.quantity'), 'sorter' => 'number_sorter'],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);	//TODO: hungarian notation
 
-		$this->db->select('
+		$builder->select('
 				DATE(sales.sale_time) AS sale_date,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased,
 				COUNT(DISTINCT sales.sale_id) AS sales
 		');
 	}
 
-	protected function _group_order()
+	protected function _group_order(object &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->group_by('sale_date');
-		$this->db->order_by('sale_date');
+		$builder->groupBy('sale_date');
+		$builder->orderBy('sale_date');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_sales_taxes.php b/app/Models/Reports/Summary_sales_taxes.php
index 1a64a4627..72b268142 100644
--- a/app/Models/Reports/Summary_sales_taxes.php
+++ b/app/Models/Reports/Summary_sales_taxes.php
@@ -1,38 +1,39 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_sales_taxes extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: hungarian notation
 	{
-		return array(
-			array('reporting_authority' => $this->lang->line('reports_authority')),
-			array('jurisdiction_name' => $this->lang->line('reports_jurisdiction')),
-			array('tax_category' => $this->lang->line('reports_tax_category')),
-			array('tax_rate' => $this->lang->line('reports_tax_rate'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'));
+		return [
+			['reporting_authority' => lang('Reports.authority')],
+			['jurisdiction_name' => lang('Reports.jurisdiction')],
+			['tax_category' => lang('Reports.tax_category')],
+			['tax_rate' => lang('Reports.tax_rate'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _where(array $inputs)
+	protected function _where(array $inputs, object &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->where('sales.sale_status', COMPLETED);
+		$builder->where('sales.sale_status', COMPLETED);
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: Duplicated code
 		{
-			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+			$builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
 		}
 		else
 		{
-			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+			$builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
 		$where = 'WHERE sale_status = ' . COMPLETED . ' ';
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
 			$where .= 'AND DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date'])
 			. ' AND ' . $this->db->escape($inputs['end_date']);
@@ -42,16 +43,16 @@ class Summary_sales_taxes extends Summary_report
 			$where .= 'AND sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']));
 		}
 
+		//TODO: Look into whether we can convert this to use QueryBuilder
 		$query = $this->db->query("SELECT reporting_authority, jurisdiction_name, tax_category, tax_rate,
 			SUM(sale_tax_amount) AS tax
-			FROM " . $this->db->dbprefix('sales_taxes') . " AS sales_taxes
-			JOIN " . $this->db->dbprefix('sales') . " AS sales ON sales_taxes.sale_id = sales.sale_id
-			JOIN " . $this->db->dbprefix('tax_categories') . " AS tax_categories ON sales_taxes.tax_category_id = tax_categories.tax_category_id
-			JOIN " . $this->db->dbprefix('tax_jurisdictions') . " AS tax_jurisdictions ON sales_taxes.jurisdiction_id = tax_jurisdictions.jurisdiction_id "
+			FROM " . $this->db->prefixTable('sales_taxes') . " AS sales_taxes
+			JOIN " . $this->db->prefixTable('sales') . " AS sales ON sales_taxes.sale_id = sales.sale_id
+			JOIN " . $this->db->prefixTable('tax_categories') . " AS tax_categories ON sales_taxes.tax_category_id = tax_categories.tax_category_id
+			JOIN " . $this->db->prefixTable('tax_jurisdictions') . " AS tax_jurisdictions ON sales_taxes.jurisdiction_id = tax_jurisdictions.jurisdiction_id "
 			. $where .
 			"GROUP BY reporting_authority, jurisdiction_name, tax_category; ");
 
-		return $query->result_array();
+		return $query->getResultArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_suppliers.php b/app/Models/Reports/Summary_suppliers.php
index 9ba65c8e8..265bda71a 100644
--- a/app/Models/Reports/Summary_suppliers.php
+++ b/app/Models/Reports/Summary_suppliers.php
@@ -1,44 +1,46 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_suppliers extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: hungarian notation
 	{
-		return array(
-			array('supplier_name' => $this->lang->line('reports_supplier')),
-			array('quantity' => $this->lang->line('reports_quantity')),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'),
-			array('cost' => $this->lang->line('reports_cost'), 'sorter' => 'number_sorter'),
-			array('profit' => $this->lang->line('reports_profit'), 'sorter' => 'number_sorter'));
+		return [
+			['supplier_name' => lang('Reports.supplier')],
+			['quantity' => lang('Reports.quantity')],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter'],
+			['cost' => lang('Reports.cost'), 'sorter' => 'number_sorter'],
+			['profit' => lang('Reports.profit'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _select(array $inputs)
+	protected function _select(array $inputs, object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_select($inputs);
+		parent::_select($inputs, $builder);	//TODO: hungarian notation
 
-		$this->db->select('
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+		$builder->select('
 				MAX(CONCAT(supplier_c.company_name, " (", supplier_p.first_name, " ", supplier_p.last_name, ")")) AS supplier,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');
 	}
 
-	protected function _from()
+	protected function _from(object &$builder): void	//TODO: hungarian notation
 	{
-		parent::_from();
+		parent::_from($builder);	//TODO: hungarian notation
 
-		$this->db->join('items AS items', 'sales_items.item_id = items.item_id');
-		$this->db->join('suppliers AS supplier_c', 'items.supplier_id = supplier_c.person_id ');
-		$this->db->join('people AS supplier_p', 'items.supplier_id = supplier_p.person_id');
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+		$builder->join('items AS items', 'sales_items.item_id = items.item_id');
+		$builder->join('suppliers AS supplier_c', 'items.supplier_id = supplier_c.person_id ');
+		$builder->join('people AS supplier_p', 'items.supplier_id = supplier_p.person_id');
 	}
-
-	protected function _group_order()
+//TODO: Probably going to need to rework these since you can't reference $builder without it's instantiation.
+	protected function _group_order(object &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->group_by('items.supplier_id');
-		$this->db->order_by('MAX(CONCAT(supplier_c.company_name, " (", supplier_p.first_name, " ", supplier_p.last_name, ")"))');
+		$builder->groupBy('items.supplier_id');
+		$builder->orderBy('MAX(CONCAT(supplier_c.company_name, " (", supplier_p.first_name, " ", supplier_p.last_name, ")"))');
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Reports/Summary_taxes.php b/app/Models/Reports/Summary_taxes.php
index ec532dc39..1cbb4d0d6 100644
--- a/app/Models/Reports/Summary_taxes.php
+++ b/app/Models/Reports/Summary_taxes.php
@@ -1,39 +1,39 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once("Summary_report.php");
+namespace App\Models\Reports;
 
 class Summary_taxes extends Summary_report
 {
-	protected function _get_data_columns()
+	protected function _get_data_columns(): array	//TODO: hungarian notation
 	{
-		return array(
-			array('tax_name' => $this->lang->line('reports_tax_name'), 'sortable' => FALSE),
-			array('tax_percent' => $this->lang->line('reports_tax_percent'), 'sorter' => 'number_sorter'),
-			array('report_count' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
-			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
-			array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
-			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'));
+		return [
+			['tax_percent' => lang('Reports.tax_percent'), 'sorter' => 'number_sorter'],
+			['report_count' => lang('Reports.sales')],
+			['subtotal' => lang('Reports.subtotal'), 'sorter' => 'number_sorter'],
+			['tax' => lang('Reports.tax'), 'sorter' => 'number_sorter'],
+			['total' => lang('Reports.total'), 'sorter' => 'number_sorter']
+		];
 	}
 
-	protected function _where(array $inputs)
+	protected function _where(array $inputs, &$builder): void	//TODO: hungarian notation
 	{
-		$this->db->where('sales.sale_status', COMPLETED);
+		$builder->where('sales.sale_status', COMPLETED);
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
-			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+			$builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
 		}
 		else
 		{
-			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+			$builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 	}
 
-	public function getData(array $inputs)
+	public function getData(array $inputs): array
 	{
-		$where = 'WHERE sale_status = ' . COMPLETED . ' ';
+		$where = 'WHERE sale_status = ' . COMPLETED . ' ';	//TODO: Duplicated code
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: Ternary notation
 		{
 			$where .= 'AND DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
 		}
@@ -43,7 +43,7 @@ class Summary_taxes extends Summary_report
 		}
 		$decimals = totals_decimals();
 
-		if($this->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)
 		{
 			$sale_total = '(CASE WHEN sales_items.discount_type = ' . PERCENT
 				. " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals)"
@@ -64,26 +64,24 @@ class Summary_taxes extends Summary_report
 				. ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END)';
 		}
 
-		$query = $this->db->query("SELECT name as name, percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) AS total
+		$query = $this->db->query("SELECT percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) AS total
 			FROM (
 				SELECT
-					name AS name,
 					CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent,
 					sales.sale_id AS sale_id,
 					$sale_subtotal AS subtotal,
 					IFNULL(sales_items_taxes.item_tax_amount, 0) AS tax,
 					IFNULL($sale_total, $sale_subtotal) AS total
-					FROM " . $this->db->dbprefix('sales_items') . ' AS sales_items
-					INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+					FROM " . $this->db->prefixTable('sales_items') . ' AS sales_items
+					INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 						ON sales_items.sale_id = sales.sale_id
-					LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
+					LEFT OUTER JOIN ' . $this->db->prefixTable('sales_items_taxes') . ' AS sales_items_taxes
 						ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line
 					' . $where . '
 				) AS temp_taxes
 			GROUP BY percent'
 		);
 
-		return $query->result_array();
+		return $query->getResultArray();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Rewards.php b/app/Models/Rewards.php
index e965cfa87..e85ffbc8c 100644
--- a/app/Models/Rewards.php
+++ b/app/Models/Rewards.php
@@ -1,21 +1,26 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
 
 /**
  * Rewards class
  */
 
-class Rewards extends CI_Model
+class Rewards extends Model	//TODO: This class is named with plural while the general practice is to name models singular
 {
-	/*
-	Inserts or updates a rewards
-	*/
-	public function save(&$rewards_data, $rewards_id = FALSE)
+	/**
+	 * Inserts or updates a rewards
+	 */
+	public function save_value(array &$rewards_data, bool $rewards_id = FALSE): bool
 	{
-		if(!$rewards_id || !$this->exists($rewards_id))
+		$builder = $this->db->table('sales_reward_points');
+		if(!$rewards_id || !$this->exists($rewards_id))		//TODO: looks like we are missing the exists function in this class
 		{
-			if($this->db->insert('sales_reward_points', $rewards_data))
+			if($builder->insert($rewards_data))
 			{
-				$rewards_data['id'] = $this->db->insert_id();
+				$rewards_data['id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -23,9 +28,8 @@ class Rewards extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('id', $rewards_id);
+		$builder->where('id', $rewards_id);
 
-		return $this->db->update('sales_reward_points', $rewards_data);
+		return $builder->update($rewards_data);
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Sale.php b/app/Models/Sale.php
index b5472c961..816b76c18 100644
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -1,15 +1,43 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use app\Libraries\Sale_lib;
+use ReflectionException;
+
 /**
  * Sale class
+ *
+ * @property attribute attribute
+ * @property customer customer
+ * @property customer_rewards customer_rewards
+ * @property dinner_table dinner_table
+ * @property employee employee
+ * @property giftcard giftcard
+ * @property inventory inventory
+ * @property item item
+ * @property item_quantity item_quantity
+ * @property rewards rewards
+ *
+ * @property Sale_lib sale_lib
  */
-class Sale extends CI_Model
+class Sale extends Model
 {
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->sale_lib = new Sale_lib();
+	}
+
 	/**
 	 * Get sale info
 	 */
-	public function get_info($sale_id)
+	public function get_info(int $sale_id): ResultInterface
 	{
-		$this->create_temp_table(array('sale_id' => $sale_id));
+		$this->create_temp_table (['sale_id' => $sale_id]);
 
 		$decimals = totals_decimals();
 		$sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
@@ -18,7 +46,7 @@ class Sale extends CI_Model
 			. " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) "
 			. 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END';
 
-		if($this->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)	//TODO: This needs to be replaced with Ternary notation
 		{
 			$sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment";
 		}
@@ -27,8 +55,7 @@ class Sale extends CI_Model
 			$sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment";
 		}
 
-		$this->db->select('
-				sales.sale_id AS sale_id,
+		$sql = 'sales.sale_id AS sale_id,
 				MAX(DATE(sales.sale_time)) AS sale_date,
 				MAX(sales.sale_time) AS sale_time,
 				MAX(sales.comment) AS comment,
@@ -49,30 +76,31 @@ class Sale extends CI_Model
 				MAX(IFNULL(payments.sale_payment_amount, 0)) AS amount_tendered,
 				(MAX(payments.sale_payment_amount)) - ($sale_total) AS change_due,
 				" . '
-				MAX(payments.payment_type) AS payment_type
-		');
+				MAX(payments.payment_type) AS payment_type';
 
-		$this->db->from('sales_items AS sales_items');
-		$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
-		$this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
-		$this->db->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
-		$this->db->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
-		$this->db->join('sales_items_taxes_temp AS sales_items_taxes',
+		$builder = $this->db->table('sales_items AS sales_items');
+		$builder->select($sql);
+
+		$builder->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
+		$builder->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
+		$builder->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
+		$builder->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
+		$builder->join('sales_items_taxes_temp AS sales_items_taxes',
 			'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
 			'LEFT OUTER');
 
-		$this->db->where('sales.sale_id', $sale_id);
+		$builder->where('sales.sale_id', $sale_id);
 
-		$this->db->group_by('sales.sale_id');
-		$this->db->order_by('sales.sale_time', 'asc');
+		$builder->groupBy('sales.sale_id');
+		$builder->orderBy('sales.sale_time', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Get number of rows for the takings (sales/manage) view
 	 */
-	public function get_found_rows($search, $filters)
+	public function get_found_rows(string $search, array $filters): ResultInterface
 	{
 		return $this->search($search, $filters, 0, 0, 'sales.sale_time', 'desc', TRUE);
 	}
@@ -80,12 +108,12 @@ class Sale extends CI_Model
 	/**
 	 * Get the sales data for the takings (sales/manage) view
 	 */
-	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'sales.sale_time', $order = 'desc', $count_only = FALSE)
+	public function search(string $search, array $filters, int $rows = 0, int $limit_from = 0, string $sort = 'sales.sale_time', string $order = 'desc', bool $count_only = FALSE): ResultInterface
 	{
 		// Pick up only non-suspended records
 		$where = 'sales.sale_status = 0 AND ';
 
-		if(empty($this->config->item('date_or_time_format')))
+		if(empty(config('OSPOS')->date_or_time_format))
 		{
 			$where .= 'DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']);
 		}
@@ -96,20 +124,20 @@ class Sale extends CI_Model
 
 		// NOTE: temporary tables are created to speed up searches due to the fact that they are orthogonal to the main query
 		// create a temporary table to contain all the payments per sale item
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_payments_temp') .
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_payments_temp') .
 			' (PRIMARY KEY(sale_id), INDEX(sale_id))
 			(
 				SELECT payments.sale_id,
 					SUM(CASE WHEN payments.cash_adjustment = 0 THEN payments.payment_amount ELSE 0 END) AS sale_payment_amount,
 					SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
 					GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type
-				FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = payments.sale_id
 				WHERE ' . $where . '
-				GROUP BY payments.sale_id
-			)'
-		);
+				GROUP BY payments.sale_id)';
+
+		$this->db->query($sql);
 
 		$decimals = totals_decimals();
 
@@ -128,7 +156,7 @@ class Sale extends CI_Model
 		$sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment";
 
 		// create a temporary table to contain all the sum of taxes per sale item
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_taxes_temp') .
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_taxes_temp') .
 			' (INDEX(sale_id), INDEX(item_id)) ENGINE=MEMORY
 			(
 				SELECT sales_items_taxes.sale_id AS sale_id,
@@ -137,24 +165,26 @@ class Sale extends CI_Model
 					SUM(sales_items_taxes.item_tax_amount) AS tax,
 					SUM(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS internal_tax,
 					SUM(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS sales_tax
-				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_items_taxes') . ' AS sales_items_taxes
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
-				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
+				INNER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
 				WHERE ' . $where . '
-				GROUP BY sale_id, item_id, line
-			)'
-		);
+				GROUP BY sale_id, item_id, line)';
+
+		$this->db->query($sql);
+
+		$builder = $this->db->table('sales_items AS sales_items');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			$this->db->select('COUNT(DISTINCT sales.sale_id) AS count');
+			$builder->select('COUNT(DISTINCT sales.sale_id) AS count');
 		}
 		else
 		{
-			$this->db->select('
+			$builder->select('
 					sales.sale_id AS sale_id,
 					MAX(DATE(sales.sale_time)) AS sale_date,
 					MAX(sales.sale_time) AS sale_time,
@@ -177,198 +207,198 @@ class Sale extends CI_Model
 			');
 		}
 
-		$this->db->from('sales_items AS sales_items');
-		$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
-		$this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
-		$this->db->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
-		$this->db->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
-		$this->db->join('sales_items_taxes_temp AS sales_items_taxes',
+		$builder->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
+		$builder->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
+		$builder->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
+		$builder->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER');
+		$builder->join('sales_items_taxes_temp AS sales_items_taxes',
 			'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
 			'LEFT OUTER');
 
-		$this->db->where($where);
+		$builder->where($where);
 
-		if(!empty($search))
+		if(!empty($search))	//TODO: this is duplicated code.  We should think about refactoring out a method
 		{
 			if($filters['is_valid_receipt'] != FALSE)
 			{
 				$pieces = explode(' ', $search);
-				$this->db->where('sales.sale_id', $pieces[1]);
+				$builder->where('sales.sale_id', $pieces[1]);
 			}
 			else
 			{
-				$this->db->group_start();
+				$builder->groupStart();
 					// customer last name
-					$this->db->like('customer_p.last_name', $search);
+					$builder->like('customer_p.last_name', $search);
 					// customer first name
-					$this->db->or_like('customer_p.first_name', $search);
+					$builder->orLike('customer_p.first_name', $search);
 					// customer first and last name
-					$this->db->or_like('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);
+					$builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);
 					// customer company name
-					$this->db->or_like('customer.company_name', $search);
-				$this->db->group_end();
+					$builder->orLike('customer.company_name', $search);
+				$builder->groupEnd();
 			}
 		}
 
 		if($filters['location_id'] != 'all')
 		{
-			$this->db->where('sales_items.item_location', $filters['location_id']);
+			$builder->where('sales_items.item_location', $filters['location_id']);
 		}
 
+		//TODO: Avoid double negatives.  This can be changed to `if($filters['only_invoices'])`... also below
 		if($filters['only_invoices'] != FALSE)
 		{
-			$this->db->where('sales.invoice_number IS NOT NULL');
+			$builder->where('sales.invoice_number IS NOT NULL');
 		}
 
 		if($filters['only_cash'] != FALSE)
 		{
-			$this->db->group_start();
-				$this->db->like('payments.payment_type', $this->lang->line('sales_cash'));
-				$this->db->or_where('payments.payment_type IS NULL');
-			$this->db->group_end();
+			$builder->groupStart();
+				$builder->like('payments.payment_type', lang('Sales.cash'));
+				$builder->orWhere('payments.payment_type IS NULL');
+			$builder->groupEnd();
 		}
 
 		if($filters['only_creditcard'] != FALSE)
 		{
-			$this->db->like('payments.payment_type', $this->lang->line('sales_credit'));
+			$builder->like('payments.payment_type', lang('Sales.credit'));
 		}
 
 		if($filters['only_due'] != FALSE)
 		{
-			$this->db->like('payments.payment_type', $this->lang->line('sales_due'));
+			$builder->like('payments.payment_type', lang('Sales.due'));
 		}
 
 		if($filters['only_check'] != FALSE)
 		{
-			$this->db->like('payments.payment_type', $this->lang->line('sales_check'));
+			$builder->like('payments.payment_type', lang('Sales.check'));
 		}
 
-		// get_found_rows case
-		if($count_only == TRUE)
+		//get_found_rows
+		if($count_only == TRUE)	//TODO: replace this with `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
-		$this->db->group_by('sales.sale_id');
+		$builder->groupBy('sales.sale_id');
 
-		// order by sale time by default
-		$this->db->order_by($sort, $order);
+		//order by sale time by default
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Get the payment summary for the takings (sales/manage) view
 	 */
-	public function get_payments_summary($search, $filters)
+	public function get_payments_summary(string $search, array $filters): array
 	{
 		// get payment summary
-		$this->db->select('payment_type, COUNT(payment_amount) AS count, SUM(payment_amount - cash_refund) AS payment_amount');
-		$this->db->from('sales AS sales');
-		$this->db->join('sales_payments', 'sales_payments.sale_id = sales.sale_id');
-		$this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
-		$this->db->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
+		$builder = $this->db->table('sales AS sales');
+		$builder->select('payment_type, COUNT(payment_amount) AS count, SUM(payment_amount - cash_refund) AS payment_amount');
+		$builder->join('sales_payments', 'sales_payments.sale_id = sales.sale_id');
+		$builder->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT');
+		$builder->join('customers AS customer', 'sales.customer_id = customer.person_id', 'LEFT');
 
-		if(empty($this->config->item('date_or_time_format')))
+		//TODO: This needs to be replaced with Ternary notation
+		if(empty(config('OSPOS')->date_or_time_format))	//TODO: duplicated code.  We should think about refactoring out a method.
 		{
-			$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+			$builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
 		}
 		else
 		{
-			$this->db->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
+			$builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
 		}
 
-		if(!empty($search))
+		if(!empty($search))	//TODO: duplicated code.  We should think about refactoring out a method.
 		{
-			if($filters['is_valid_receipt'] != FALSE)
+			if($filters['is_valid_receipt'] != FALSE)//TODO: Avoid double negatives
 			{
 				$pieces = explode(' ',$search);
-				$this->db->where('sales.sale_id', $pieces[1]);
+				$builder->where('sales.sale_id', $pieces[1]);
 			}
 			else
 			{
-				$this->db->group_start();
-					// customer last name
-					$this->db->like('customer_p.last_name', $search);
-					// customer first name
-					$this->db->or_like('customer_p.first_name', $search);
-					// customer first and last name
-					$this->db->or_like('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);
-					// customer company name
-					$this->db->or_like('customer.company_name', $search);
-				$this->db->group_end();
+				$builder->groupStart();
+					$builder->like('customer_p.last_name', $search);	// customer last name
+					$builder->orLike('customer_p.first_name', $search);	// customer first name
+					$builder->orLike('CONCAT(customer_p.first_name, " ", customer_p.last_name)', $search);	// customer first and last name
+					$builder->orLike('customer.company_name', $search);	// customer company name
+				$builder->groupEnd();
 			}
 		}
 
-		if($filters['sale_type'] == 'sales')
+		//TODO: This needs to be converted to a switch statement
+		if($filters['sale_type'] == 'sales')	//TODO: we need to think about refactoring this block to a switch statement.
 		{
-			$this->db->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount > 0');
+			$builder->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount > 0');
 		}
 		elseif($filters['sale_type'] == 'quotes')
 		{
-			$this->db->where('sales.sale_status = ' . SUSPENDED . ' AND sales.quote_number IS NOT NULL');
+			$builder->where('sales.sale_status = ' . SUSPENDED . ' AND sales.quote_number IS NOT NULL');
 		}
 		elseif($filters['sale_type'] == 'returns')
 		{
-			$this->db->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount < 0');
+			$builder->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount < 0');
 		}
 		elseif($filters['sale_type'] == 'all')
 		{
-			$this->db->where('sales.sale_status = ' . COMPLETED);
+			$builder->where('sales.sale_status = ' . COMPLETED);
 		}
 
+		//TODO: Avoid the double negatives
 		if($filters['only_invoices'] != FALSE)
 		{
-			$this->db->where('invoice_number IS NOT NULL');
+			$builder->where('invoice_number IS NOT NULL');
 		}
 
 		if($filters['only_cash'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_cash'));
+			$builder->like('payment_type', lang('Sales.cash'));
 		}
 
 		if($filters['only_due'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_due'));
+			$builder->like('payment_type', lang('Sales.due'));
 		}
 
 		if($filters['only_check'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_check'));
+			$builder->like('payment_type', lang('Sales.check'));
 		}
 
 		if($filters['only_creditcard'] != FALSE)
 		{
-			$this->db->like('payment_type', $this->lang->line('sales_credit'));
+			$builder->like('payment_type', lang('Sales.credit'));
 		}
 
-		$this->db->group_by('payment_type');
+		$builder->groupBy('payment_type');
 
-		$payments = $this->db->get()->result_array();
+		$payments = $builder->get()->getResultArray();
 
 		// consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
 		$gift_card_count = 0;
 		$gift_card_amount = 0;
-		foreach($payments as $key=>$payment)
+
+		foreach($payments as $key => $payment)
 		{
-			if(strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE)
+			if(strstr($payment['payment_type'], lang('Sales.giftcard')) != FALSE)
 			{
 				$gift_card_count  += $payment['count'];
 				$gift_card_amount += $payment['payment_amount'];
 
-				// remove the "Gift Card: 1", "Gift Card: 2", etc. payment string
+				//remove the "Gift Card: 1", "Gift Card: 2", etc. payment string
 				unset($payments[$key]);
 			}
 		}
 
 		if($gift_card_count > 0)
 		{
-			$payments[] = array('payment_type' => $this->lang->line('sales_giftcard'), 'count' => $gift_card_count, 'payment_amount' => $gift_card_amount);
+			$payments[] = ['payment_type' => lang('Sales.giftcard'), 'count' => $gift_card_count, 'payment_amount' => $gift_card_amount];
 		}
 
 		return $payments;
@@ -377,40 +407,39 @@ class Sale extends CI_Model
 	/**
 	 * Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('sales');
+		$builder = $this->db->table('sales');
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets search suggestions
 	 */
-	public function get_search_suggestions($search, $limit = 25)
+	public function get_search_suggestions(string $search, int $limit = 25): array	//TODO: $limit is never used.
 	{
-		$suggestions = array();
+		$suggestions = [];
 
 		if(!$this->is_valid_receipt($search))
 		{
-			$this->db->distinct();
-			$this->db->select('first_name, last_name');
-			$this->db->from('sales');
-			$this->db->join('people', 'people.person_id = sales.customer_id');
-			$this->db->like('last_name', $search);
-			$this->db->or_like('first_name', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-			$this->db->or_like('company_name', $search);
-			$this->db->order_by('last_name', 'asc');
+			$builder = $this->db->table('sales');
+			$builder->distinct()->select('first_name, last_name');
+			$builder->join('people', 'people.person_id = sales.customer_id');
+			$builder->like('last_name', $search);
+			$builder->orLike('first_name', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+			$builder->orLike('company_name', $search);
+			$builder->orderBy('last_name', 'asc');
 
-			foreach($this->db->get()->result_array() as $result)
+			foreach($builder->get()->getResultArray() as $result)
 			{
-				$suggestions[] = array('label' => $result['first_name'] . ' ' . $result['last_name']);
+				$suggestions[] = ['label' => $result['first_name'] . ' ' . $result['last_name']];
 			}
 		}
 		else
 		{
-			$suggestions[] = array('label' => $search);
+			$suggestions[] = ['label' => $search];
 		}
 
 		return $suggestions;
@@ -419,31 +448,31 @@ class Sale extends CI_Model
 	/**
 	 * Gets total of invoice rows
 	 */
-	public function get_invoice_count()
+	public function get_invoice_count(): int
 	{
-		$this->db->from('sales');
-		$this->db->where('invoice_number IS NOT NULL');
+		$builder = $this->db->table('sales');
+		$builder->where('invoice_number IS NOT NULL');
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets sale by invoice number
 	 */
-	public function get_sale_by_invoice_number($invoice_number)
+	public function get_sale_by_invoice_number(string $invoice_number): ResultInterface
 	{
-		$this->db->from('sales');
-		$this->db->where('invoice_number', $invoice_number);
+		$builder = $this->db->table('sales');
+		$builder->where('invoice_number', $invoice_number);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_invoice_number_for_year($year = '', $start_from = 0)
+	public function get_invoice_number_for_year(string $year = '', int $start_from = 0): int
 	{
 		return $this->get_number_for_year('invoice_number', $year, $start_from);
 	}
 
-	public function get_quote_number_for_year($year = '', $start_from = 0)
+	public function get_quote_number_for_year($year = '', $start_from = 0): int
 	{
 		return $this->get_number_for_year('quote_number', $year, $start_from);
 	}
@@ -451,14 +480,15 @@ class Sale extends CI_Model
 	/**
 	 * Gets invoice number by year
 	 */
-	private function get_number_for_year($field, $year = '', $start_from = 0)
+	private function get_number_for_year(string $field, string $year = '', int $start_from = 0): int
 	{
 		$year = $year == '' ? date('Y') : $year;
-		$this->db->select('COUNT( 1 ) AS number_year');
-		$this->db->from('sales');
-		$this->db->where('DATE_FORMAT(sale_time, "%Y" ) = ', $year);
-		$this->db->where("$field IS NOT NULL");
-		$result = $this->db->get()->row_array();
+
+		$builder = $this->db->table('sales');
+		$builder->select('COUNT( 1 ) AS number_year');
+		$builder->where('DATE_FORMAT(sale_time, "%Y" ) = ', $year);
+		$builder->where("$field IS NOT NULL");
+		$result = $builder->get()->getRowArray();
 
 		return ($start_from + $result['number_year']);
 	}
@@ -466,7 +496,7 @@ class Sale extends CI_Model
 	/**
 	 * Checks if valid receipt
 	 */
-	public function is_valid_receipt(&$receipt_sale_id)
+	public function is_valid_receipt(string &$receipt_sale_id): bool	//TODO: like the others, maybe this should be an array rather than a delimited string... either that or the parameter name needs to be changed. $receipt_sale_id implies that it's an int.
 	{
 		if(!empty($receipt_sale_id))
 		{
@@ -477,12 +507,13 @@ class Sale extends CI_Model
 			{
 				return $this->exists($pieces[1]);
 			}
-			elseif($this->config->item('invoice_enable') == TRUE)
+			elseif(config('OSPOS')->invoice_enable)
 			{
 				$sale_info = $this->get_sale_by_invoice_number($receipt_sale_id);
-				if($sale_info->num_rows() > 0)
+
+				if($sale_info->getNumRows() > 0)
 				{
-					$receipt_sale_id = 'POS ' . $sale_info->row()->sale_id;
+					$receipt_sale_id = 'POS ' . $sale_info->getRow()->sale_id;
 
 					return TRUE;
 				}
@@ -495,27 +526,30 @@ class Sale extends CI_Model
 	/**
 	 * Checks if sale exists
 	 */
-	public function exists($sale_id)
+	public function exists(int $sale_id): bool
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		return ($this->db->get()->num_rows()==1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Update sale
 	 */
-	public function update($sale_id, $sale_data, $payments)
+	public function update($sale_id = NULL, array $sale_data = NULL, array $payments = NULL): bool
 	{
-		$this->db->where('sale_id', $sale_id);
-		$success = $this->db->update('sales', $sale_data);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
+		$success = $builder->update($sale_data);
 
-		// touch payment only if update sale is successful and there is a payments object otherwise the result would be to delete all the payments associated to the sale
+		//touch payment only if update sale is successful and there is a payments object otherwise the result would be to delete all the payments associated to the sale
 		if($success && !empty($payments))
 		{
 			//Run these queries as a transaction, we want to make sure we do all or nothing
-			$this->db->trans_start();
+			$this->db->transStart();
+
+			$builder = $this->db->table('sales_payments');
 
 			// add new payments
 			foreach($payments as $payment)
@@ -530,213 +564,229 @@ class Sale extends CI_Model
 				if($payment_id == -1 && $payment_amount != 0)
 				{
 					// Add a new payment transaction
-					$sales_payments_data = array(
-						'sale_id'		  => $sale_id,
-						'payment_type'	  => $payment_type,
-						'payment_amount'  => $payment_amount,
-						'cash_refund'	  => $cash_refund,
+					$sales_payments_data = [
+						'sale_id' => $sale_id,
+						'payment_type' => $payment_type,
+						'payment_amount' => $payment_amount,
+						'cash_refund' => $cash_refund,
 						'cash_adjustment' => $cash_adjustment,
-						'employee_id'	  => $employee_id
-					);
-					$success = $this->db->insert('sales_payments', $sales_payments_data);
+						'employee_id'  => $employee_id
+					];
+					$success = $builder->insert($sales_payments_data);
 				}
 				elseif($payment_id != -1)
 				{
 					if($payment_amount != 0)
 					{
 						// Update existing payment transactions (payment_type only)
-						$sales_payments_data = array(
+						$sales_payments_data = [
 							'payment_type' => $payment_type,
 							'payment_amount' => $payment_amount,
 							'cash_refund' => $cash_refund,
 							'cash_adjustment' => $cash_adjustment
-						);
-						$this->db->where('payment_id', $payment_id);
-						$success = $this->db->update('sales_payments', $sales_payments_data);
+						];
+
+						$builder->where('payment_id', $payment_id);
+						$success = $builder->update($sales_payments_data);
 					}
 					else
 					{
 						// Remove existing payment transactions with a payment amount of zero
-						$success = $this->db->delete('sales_payments', array('payment_id' => $payment_id));
+						$success = $builder->delete(['payment_id' => $payment_id]);
 					}
 				}
 			}
 
-			$this->db->trans_complete();
-
-			$success &= $this->db->trans_status();
+			$this->db->transComplete();
+			$success &= $this->db->transStatus();
 		}
+
 		return $success;
 	}
 
 	/**
 	 * Save the sale information after the sales is complete but before the final document is printed
 	 * The sales_taxes variable needs to be initialized to an empty array before calling
+	 * @throws ReflectionException
 	 */
-	public function save($sale_id, &$sale_status, &$items, $customer_id, $employee_id, $comment, $invoice_number,
-							$work_order_number, $quote_number, $sale_type, $payments, $dinner_table, &$sales_taxes)
+	public function save_value(int $sale_id, string &$sale_status, array &$items, int $customer_id, int $employee_id, string $comment, string $invoice_number,
+							string $work_order_number, string $quote_number, int $sale_type, array $payments, int $dinner_table_id, array &$sales_taxes): int	//TODO: this method returns the sale_id but the override is expecting it to return a bool. The signature needs to be reworked.  Generally when there are more than 3 maybe 4 parameters, there's a good chance that an object needs to be passed rather than so many params.
 	{
+		$attribute = model(Attribute::class);
+		$customer = model(Customer::class);
+		$giftcard = model(Giftcard::class);
+		$inventory = model('Inventory');
+		$item = model(Item::class);
+		$item_quantity = model(Item_quantity::class);
+
 		if($sale_id != -1)
 		{
 			$this->clear_suspended_sale_detail($sale_id);
 		}
 
-		$tax_decimals = tax_decimals();
+		$tax_decimals = tax_decimals();	//TODO: $tax_decimals is never used.
 
-		if(count($items) == 0)
+		if(count($items) == 0)	//TODO: ===
 		{
-			return -1;
+			return -1;	//TODO: Replace -1 with a constant
 		}
 
-		$sales_data = array(
-			'sale_time'			=> date('Y-m-d H:i:s'),
-			'customer_id'		=> $this->Customer->exists($customer_id) ? $customer_id : NULL,
-			'employee_id'		=> $employee_id,
-			'comment'			=> $comment,
-			'sale_status'		=> $sale_status,
-			'invoice_number'	=> $invoice_number,
-			'quote_number'		=> $quote_number,
-			'work_order_number'	=> $work_order_number,
-			'dinner_table_id'	=> $dinner_table,
-			'sale_status'		=> $sale_status,
-			'sale_type'			=> $sale_type
-		);
+		$sales_data = [
+			'sale_time' => date('Y-m-d H:i:s'),
+			'customer_id' => $customer->exists($customer_id) ? $customer_id : NULL,
+			'employee_id' => $employee_id,
+			'comment' => $comment,
+			'sale_status' => $sale_status,
+			'invoice_number' => $invoice_number,
+			'quote_number' => $quote_number,
+			'work_order_number'=> $work_order_number,
+			'dinner_table_id' => $dinner_table_id,
+			'sale_type' => $sale_type
+		];
 
 		// Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		if($sale_id == -1)
+		$builder = $this->db->table('sales');
+
+		if($sale_id == -1)	//TODO: I think we have a constant for this and the -1 needs to be replaced with the constant in constants.php... something like NEW_SALE
 		{
-			$this->db->insert('sales', $sales_data);
-			$sale_id = $this->db->insert_id();
+			$builder->insert($sales_data);
+			$sale_id = $this->db->insertID();
 		}
 		else
 		{
-			$this->db->where('sale_id', $sale_id);
-			$this->db->update('sales', $sales_data);
+			$builder->where('sale_id', $sale_id);
+			$builder->update($sales_data);
 		}
+
 		$total_amount = 0;
 		$total_amount_used = 0;
-		foreach($payments as $payment_id=>$payment)
+
+		$builder = $this->db->table('sales_payments');
+
+		foreach($payments as $payment_id => $payment)
 		{
-			if(!empty(strstr($payment['payment_type'], $this->lang->line('sales_giftcard'))))
+			if(!empty(strstr($payment['payment_type'], lang('Sales.giftcard'))))
 			{
-				// We have a gift card and we have to deduct the used value from the total value of the card.
-				$splitpayment = explode( ':', $payment['payment_type'] );
-				$cur_giftcard_value = $this->Giftcard->get_giftcard_value( $splitpayment[1] );
-				$this->Giftcard->update_giftcard_value( $splitpayment[1], $cur_giftcard_value - $payment['payment_amount'] );
+				// We have a gift card, and we have to deduct the used value from the total value of the card.
+				$splitpayment = explode( ':', $payment['payment_type'] );	//TODO: this variable doesn't follow our naming conventions.  Probably should be refactored to split_payment.
+				$cur_giftcard_value = $giftcard->get_giftcard_value( $splitpayment[1] );	//TODO: this should be refactored to $current_giftcard_value
+				$giftcard->update_giftcard_value( $splitpayment[1], $cur_giftcard_value - $payment['payment_amount'] );
 			}
-			elseif(!empty(strstr($payment['payment_type'], $this->lang->line('sales_rewards'))))
+			elseif(!empty(strstr($payment['payment_type'], lang('Sales.rewards'))))
 			{
-				$cur_rewards_value = $this->Customer->get_info($customer_id)->points;
-				$this->Customer->update_reward_points_value($customer_id, $cur_rewards_value - $payment['payment_amount'] );
+				$cur_rewards_value = $customer->get_info($customer_id)->points;
+				$customer->update_reward_points_value($customer_id, $cur_rewards_value - $payment['payment_amount'] );
 				$total_amount_used = floatval($total_amount_used) + floatval($payment['payment_amount']);
 			}
 
-			if($payment['cash_adjustment'] == NULL)
-			{
-				$payment['cash_adjustment'] = CASH_ADJUSTMENT_FALSE;
-			}
-			
-			$sales_payments_data = array(
-				'sale_id'		  => $sale_id,
-				'payment_type'	  => $payment['payment_type'],
-				'payment_amount'  => $payment['payment_amount'],
-				'cash_refund'     => $payment['cash_refund'],
+			$sales_payments_data = [
+				'sale_id' => $sale_id,
+				'payment_type' => $payment['payment_type'],
+				'payment_amount' => $payment['payment_amount'],
+				'cash_refund' => $payment['cash_refund'],
 				'cash_adjustment' => $payment['cash_adjustment'],
-				'employee_id'	  => $employee_id
-			);
+				'employee_id' => $employee_id
+			];
 
-			$this->db->insert('sales_payments', $sales_payments_data);
-
-			$total_amount = floatval($total_amount) + floatval($payment['payment_amount']) - floatval($payment['cash_refund']);
+			$builder->insert($sales_payments_data);
 
+			$total_amount = floatval($total_amount) + floatval($payment['payment_amount']);
 		}
-		
+
 		$this->save_customer_rewards($customer_id, $sale_id, $total_amount, $total_amount_used);
-		
-		$customer = $this->Customer->get_info($customer_id);
 
-		foreach($items as $line=>$item)
+		$customer = $customer->get_info($customer_id);
+
+		$builder = $this->db->table('sales_items');
+
+		foreach($items as $line => $item_data)
 		{
-			$cur_item_info = $this->Item->get_info($item['item_id']);
+			$cur_item_info = $item->get_info($item_data['item_id']);
 
-			if($item['price'] == 0.00)
+			if($item_data['price'] == 0.00)
 			{
-				$item['discount'] = 0.00;
+				$item_data['discount'] = 0.00;
 			}
 
-			$sales_items_data = array(
-				'sale_id'			=> $sale_id,
-				'item_id'			=> $item['item_id'],
-				'line'				=> $item['line'],
-				'description'		=> character_limiter($item['description'], 255),
-				'serialnumber'		=> character_limiter($item['serialnumber'], 30),
-				'quantity_purchased'=> $item['quantity'],
-				'discount'			=> $item['discount'],
-				'discount_type'		=> $item['discount_type'],
-				'item_cost_price'	=> $item['cost_price'],
-				'item_unit_price'	=> $item['price'],
-				'item_location'		=> $item['item_location'],
-				'print_option'		=> $item['print_option']
-			);
+			$sales_items_data = [
+				'sale_id' => $sale_id,
+				'item_id' => $item_data['item_id'],
+				'line' => $item_data['line'],
+				'description' => character_limiter($item_data['description'], 255),
+				'serialnumber' => character_limiter($item_data['serialnumber'], 30),
+				'quantity_purchased' => $item_data['quantity'],
+				'discount' => $item_data['discount'],
+				'discount_type' => $item_data['discount_type'],
+				'item_cost_price' => $item_data['cost_price'],
+				'item_unit_price' => $item_data['price'],
+				'item_location' => $item_data['item_location'],
+				'print_option' => $item_data['print_option']
+			];
 
-			$this->db->insert('sales_items', $sales_items_data);
+			$builder->insert($sales_items_data);
 
-			if($cur_item_info->stock_type == HAS_STOCK && $sale_status == COMPLETED)
+			if($cur_item_info->stock_type == HAS_STOCK && $sale_status == COMPLETED)	//TODO: === ?
 			{
 				// Update stock quantity if item type is a standard stock item and the sale is a standard sale
-				$item_quantity = $this->Item_quantity->get_item_quantity($item['item_id'], $item['item_location']);
-				$this->Item_quantity->save(array('quantity'	=> $item_quantity->quantity - $item['quantity'],
-					'item_id'		=> $item['item_id'],
-					'location_id'	=> $item['item_location']), $item['item_id'], $item['item_location']);
+				$item_quantity_data = $item_quantity->get_item_quantity($item_data['item_id'], $item_data['item_location']);
+
+				$item_quantity->save_value([
+					'quantity'	=> $item_quantity_data->quantity - $item_data['quantity'],
+					'item_id' => $item_data['item_id'],
+					'location_id' => $item_data['item_location']],
+					$item_data['item_id'],
+					$item_data['item_location']
+				);
 
 				// if an items was deleted but later returned it's restored with this rule
-
-				if($item['quantity'] < 0)
+				if($item_data['quantity'] < 0)
 				{
-					$this->Item->undelete($item['item_id']);
+					$item->undelete($item_data['item_id']);
 				}
 
 				// Inventory Count Details
-				$sale_remarks = 'POS '.$sale_id;
-				$inv_data = array(
-					'trans_date'		=> date('Y-m-d H:i:s'),
-					'trans_items'		=> $item['item_id'],
-					'trans_user'		=> $employee_id,
-					'trans_location'	=> $item['item_location'],
-					'trans_comment'		=> $sale_remarks,
-					'trans_inventory'	=> -$item['quantity']
-				);
-				$this->Inventory->insert($inv_data);
+				$sale_remarks = 'POS ' . $sale_id;	//TODO: Use string interpolation here.
+				$inv_data = [
+					'trans_date' => date('Y-m-d H:i:s'),
+					'trans_items' => $item_data['item_id'],
+					'trans_user' => $employee_id,
+					'trans_location' => $item_data['item_location'],
+					'trans_comment' => $sale_remarks,
+					'trans_inventory' => -$item_data['quantity']
+				];
+
+				$inventory->insert($inv_data);
 			}
 
-			$this->Attribute->copy_attribute_links($item['item_id'], 'sale_id', $sale_id);
+			$attribute->copy_attribute_links($item_data['item_id'], 'sale_id', $sale_id);
 		}
 
-		if($customer_id == -1 || $customer->taxable)
+		if($customer_id == -1 || $customer->taxable)	//TODO: Need a NEW_CUSTOMER constant in constants.php instead of -1
 		{
 			$this->save_sales_tax($sale_id, $sales_taxes[0]);
 			$this->save_sales_items_taxes($sale_id, $sales_taxes[1]);
 		}
 
-		if($this->config->item('dinner_table_enable') == TRUE)
+		if(config('OSPOS')->dinner_table_enable)
 		{
-			if($sale_status == COMPLETED)
+			$dinner_table = model(Dinner_table::class);
+			if($sale_status == COMPLETED)	//TODO: === ?
 			{
-				$this->Dinner_table->release($dinner_table);
+				$dinner_table->release($dinner_table_id);
 			}
 			else
 			{
-				$this->Dinner_table->occupy($dinner_table);
+				$dinner_table->occupy($dinner_table_id);
 			}
 		}
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		if($this->db->trans_status() === FALSE)
+		if($this->db->transStatus() === FALSE)
 		{
-			return -1;
+			return -1;	//TODO: this should also be replaced with a FAIL or NO_PERSON constant or something similar instead of -1
 		}
 
 		return $sale_id;
@@ -745,27 +795,31 @@ class Sale extends CI_Model
 	/**
 	 * Saves sale tax
 	 */
-	public function save_sales_tax($sale_id, $sales_taxes)
+	public function save_sales_tax(int $sale_id, array $sales_taxes): void	//TODO: should we return the result of the insert here as a bool?
 	{
-		foreach($sales_taxes as $line=>$sales_tax)
+		$builder = $this->db->table('sales_taxes');
+
+		foreach($sales_taxes as $line => $sales_tax)
 		{
 			$sales_tax['sale_id'] = $sale_id;
-			$this->db->insert('sales_taxes', $sales_tax);
+			$builder->insert($sales_tax);
 		}
 	}
 
 	/**
-	 * Apply customer sales tax if the customer sales tax is enabledl
+	 * Apply customer sales tax if the customer sales tax is enabled
 	 * The original tax is still supported if the user configures it,
 	 * but it won't make sense unless it's used exclusively for the purpose
 	 * of VAT tax which becomes a price component.  VAT taxes must still be reported
 	 * as a separate tax entry on the invoice.
 	 */
-	public function save_sales_items_taxes($sale_id, $sales_item_taxes)
+	public function save_sales_items_taxes(int $sale_id, array $sales_item_taxes): void
 	{
+		$builder = $this->db->table('sales_items_taxes');
+
 		foreach($sales_item_taxes as $line => $tax_item)
 		{
-			$sales_items_taxes = array(
+			$sales_items_taxes = [
 				'sale_id' => $sale_id,
 				'item_id' => $tax_item['item_id'],
 				'line' => $tax_item['line'],
@@ -777,52 +831,52 @@ class Sale extends CI_Model
 				'item_tax_amount' => $tax_item['item_tax_amount'],
 				'sales_tax_code_id' => $tax_item['sales_tax_code_id'],
 				'tax_category_id' => $tax_item['tax_category_id'],
-				'jurisdiction_id' => $tax_item['jurisdiction_id'],
-				'tax_category_id' => $tax_item['tax_category_id']
-			);
+				'jurisdiction_id' => $tax_item['jurisdiction_id']
+			];
 
-			$this->db->insert('sales_items_taxes', $sales_items_taxes);
+			$builder->insert($sales_items_taxes);
 		}
 	}
 
 	/**
 	 * Return the taxes that were charged
 	 */
-	public function get_sales_taxes($sale_id)
+	public function get_sales_taxes(int $sale_id): array
 	{
-		$this->db->from('sales_taxes');
-		$this->db->where('sale_id', $sale_id);
-		$this->db->order_by('print_sequence', 'asc');
+		$builder = $this->db->table('sales_taxes');
+		$builder->where('sale_id', $sale_id);
+		$builder->orderBy('print_sequence', 'asc');
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		return $query->result_array();
+		return $query->getResultArray();
 	}
 
 	/**
 	 * Return the taxes applied to a sale for a particular item
 	 */
-	public function get_sales_item_taxes($sale_id, $item_id)
+	public function get_sales_item_taxes(int $sale_id, int $item_id): array
 	{
-		$this->db->select('item_id, name, percent');
-		$this->db->from('sales_items_taxes');
-		$this->db->where('sale_id',$sale_id);
-		$this->db->where('item_id',$item_id);
+		$builder = $this->db->table('sales_items_taxes');
+		$builder->select('item_id, name, percent');
+		$builder->where('sale_id',$sale_id);
+		$builder->where('item_id',$item_id);
 
 		//return an array of taxes for an item
-		return $this->db->get()->result_array();
+		return $builder->get()->getResultArray();
 	}
 
 	/**
 	 * Deletes list of sales
+	 * @throws ReflectionException
 	 */
-	public function delete_list($sale_ids, $employee_id, $update_inventory = TRUE)
+	public function delete_list(array $sale_ids, int $employee_id, bool $update_inventory = TRUE): bool
 	{
 		$result = TRUE;
 
 		foreach($sale_ids as $sale_id)
 		{
-			$result &= $this->delete($sale_id, $employee_id, $update_inventory);
+			$result &= $this->delete($sale_id, FALSE, $update_inventory, $employee_id);
 		}
 
 		return $result;
@@ -831,7 +885,7 @@ class Sale extends CI_Model
 	/**
 	 * Restores list of sales
 	 */
-	public function restore_list($sale_ids, $employee_id, $update_inventory = TRUE)
+	public function restore_list(array $sale_ids, int $employee_id, bool $update_inventory = TRUE): bool	//TODO: $employee_id and $update_inventory are never used in the function.
 	{
 		foreach($sale_ids as $sale_id)
 		{
@@ -845,11 +899,12 @@ class Sale extends CI_Model
 	 * Delete sale.  Hard deletes are not supported for sales transactions.
 	 * When a sale is "deleted" it is simply changed to a status of canceled.
 	 * However, if applicable the inventory still needs to be updated
+	 * @throws ReflectionException
 	 */
-	public function delete($sale_id, $employee_id, $update_inventory = TRUE)
+	public function delete($sale_id = NULL, bool $purge = FALSE, bool $update_inventory = TRUE, $employee_id = null): bool
 	{
 		// start a transaction to assure data integrity
-		$this->db->trans_start();
+		$this->db->transStart();
 
 		$sale_status = $this->get_sale_status($sale_id);
 
@@ -857,27 +912,32 @@ class Sale extends CI_Model
 		{
 			// defect, not all item deletions will be undone??
 			// get array with all the items involved in the sale to update the inventory tracking
-			$items = $this->get_sale_items($sale_id)->result_array();
-			foreach($items as $item)
+			$inventory = model('Inventory');
+			$item = model(Item::class);
+			$item_quantity = model(Item_quantity::class);
+
+			$items = $this->get_sale_items($sale_id)->getResultArray();
+
+			foreach($items as $item_data)
 			{
-				$cur_item_info = $this->Item->get_info($item['item_id']);
+				$cur_item_info = $item->get_info($item_data['item_id']);
 
 				if($cur_item_info->stock_type == HAS_STOCK)
 				{
 					// create query to update inventory tracking
-					$inv_data = array(
+					$inv_data = [
 						'trans_date' => date('Y-m-d H:i:s'),
-						'trans_items' => $item['item_id'],
+						'trans_items' => $item_data['item_id'],
 						'trans_user' => $employee_id,
 						'trans_comment' => 'Deleting sale ' . $sale_id,
-						'trans_location' => $item['item_location'],
-						'trans_inventory' => $item['quantity_purchased']
-					);
+						'trans_location' => $item_data['item_location'],
+						'trans_inventory' => $item_data['quantity_purchased']
+					];
 					// update inventory
-					$this->Inventory->insert($inv_data);
+					$inventory->insert($inv_data);
 
 					// update quantities
-					$this->Item_quantity->change_quantity($item['item_id'], $item['item_location'], $item['quantity_purchased']);
+					$item_quantity->change_quantity($item_data['item_id'], $item_data['item_location'], $item_data['quantity_purchased']);
 				}
 			}
 		}
@@ -885,32 +945,34 @@ class Sale extends CI_Model
 		$this->update_sale_status($sale_id, CANCELED);
 
 		// execute transaction
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		return $this->db->trans_status();
+		return $this->db->transStatus();
 	}
 
 	/**
 	 * Gets sale item
 	 */
-	public function get_sale_items($sale_id)
+	public function get_sale_items(int $sale_id): ResultInterface
 	{
-		$this->db->from('sales_items');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales_items');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Used by the invoice and receipt programs
 	 */
-	public function get_sale_items_ordered($sale_id)
+	public function get_sale_items_ordered(int $sale_id): ResultInterface
 	{
-		$this->db->select('
+		$item = model(Item::class);
+		$builder = $this->db->table('sales_items AS sales_items');
+		$builder->select('
 			sales_items.sale_id,
 			sales_items.item_id,
 			sales_items.description,
-			serialnumber,
+			serialnumber,	
 			line,
 			quantity_purchased,
 			item_cost_price,
@@ -919,76 +981,75 @@ class Sale extends CI_Model
 			discount_type,
 			item_location,
 			print_option,
-			' . $this->Item->get_item_name('name') . ',
+			' . $item->get_item_name('name') . ',
 			category,
 			item_type,
 			stock_type');
-		$this->db->from('sales_items AS sales_items');
-		$this->db->join('items AS items', 'sales_items.item_id = items.item_id');
-		$this->db->where('sales_items.sale_id', $sale_id);
+		$builder->join('items AS items', 'sales_items.item_id = items.item_id');
+		$builder->where('sales_items.sale_id', $sale_id);
 
 		// Entry sequence (this will render kits in the expected sequence)
-		if($this->config->item('line_sequence') == '0')
+		if(config('OSPOS')->line_sequence == '0')	//TODO: Replace these with constants and this should be converted to a switch.
 		{
-			$this->db->order_by('line', 'asc');
+			$builder->orderBy('line', 'asc');
 		}
 		// Group by Stock Type (nonstock first - type 1, stock next - type 0)
-		elseif($this->config->item('line_sequence') == '1')
+		elseif(config('OSPOS')->line_sequence == '1')
 		{
-			$this->db->order_by('stock_type', 'desc');
-			$this->db->order_by('sales_items.description', 'asc');
-			$this->db->order_by('items.name', 'asc');
-			$this->db->order_by('items.qty_per_pack', 'asc');
+			$builder->orderBy('stock_type', 'desc');
+			$builder->orderBy('sales_items.description', 'asc');
+			$builder->orderBy('items.name', 'asc');
+			$builder->orderBy('items.qty_per_pack', 'asc');
 		}
 		// Group by Item Category
-		elseif($this->config->item('line_sequence') == '2')
+		elseif(config('OSPOS')->line_sequence == '2')
 		{
-			$this->db->order_by('category', 'asc');
-			$this->db->order_by('sales_items.description', 'asc');
-			$this->db->order_by('items.name', 'asc');
-			$this->db->order_by('items.qty_per_pack', 'asc');
+			$builder->orderBy('category', 'asc');
+			$builder->orderBy('sales_items.description', 'asc');
+			$builder->orderBy('items.name', 'asc');
+			$builder->orderBy('items.qty_per_pack', 'asc');
 		}
 		// Group by entry sequence in descending sequence (the Standard)
 		else
 		{
-			$this->db->order_by('line', 'desc');
+			$builder->orderBy('line', 'desc');
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Gets sale payments
 	 */
-	public function get_sale_payments($sale_id)
+	public function get_sale_payments(int $sale_id): ResultInterface
 	{
-		$this->db->from('sales_payments');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales_payments');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Gets sale payment options
 	 */
-	public function get_payment_options($giftcard = TRUE, $reward_points = FALSE)
+	public function get_payment_options(bool $giftcard = TRUE, bool $reward_points = FALSE): array
 	{
 		$payments = get_payment_options();
 
 		if($giftcard == TRUE)
 		{
-			$payments[$this->lang->line('sales_giftcard')] = $this->lang->line('sales_giftcard');
+			$payments[lang('Sales.giftcard')] = lang('Sales.giftcard');
 		}
 
 		if($reward_points == TRUE)
 		{
-			$payments[$this->lang->line('sales_rewards')] = $this->lang->line('sales_rewards');
+			$payments[lang('Sales.rewards')] = lang('Sales.rewards');
 		}
 
 		if($this->sale_lib->get_mode() == 'sale_work_order')
 		{
-			$payments[$this->lang->line('sales_cash_deposit')] = $this->lang->line('sales_cash_deposit');
-			$payments[$this->lang->line('sales_credit_deposit')] = $this->lang->line('sales_credit_deposit');
+			$payments[lang('Sales.cash_deposit')] = lang('Sales.cash_deposit');
+			$payments[lang('Sales.credit_deposit')] = lang('Sales.credit_deposit');
 		}
 
 		return $payments;
@@ -997,95 +1058,103 @@ class Sale extends CI_Model
 	/**
 	 * Gets sale customer name
 	 */
-	public function get_customer($sale_id)
+	public function get_customer(int $sale_id): object
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$customer = model(Customer::class);
 
-		return $this->Customer->get_info($this->db->get()->row()->customer_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
+
+		return $customer->get_info($builder->get()->getRow()->customer_id);
 	}
 
 	/**
 	 * Gets sale employee name
 	 */
-	public function get_employee($sale_id)
+	public function get_employee(int $sale_id): object
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->Employee->get_info($this->db->get()->row()->employee_id);
+		$employee = model(Employee::class);
+
+		return $employee->get_info($builder->get()->getRow()->employee_id);
 	}
 
 	/**
 	 * Checks if quote number exists
 	 */
-	public function check_quote_number_exists($quote_number, $sale_id = '')
+	public function check_quote_number_exists(string $quote_number, string $sale_id = ''): bool
 	{
-		$this->db->from('sales');
-		$this->db->where('quote_number', $quote_number);
+		$builder = $this->db->table('sales');
+		$builder->where('quote_number', $quote_number);
+
 		if(!empty($sale_id))
 		{
-			$this->db->where('sale_id !=', $sale_id);
+			$builder->where('sale_id !=', $sale_id);
 		}
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Checks if invoice number exists
 	 */
-	public function check_invoice_number_exists($invoice_number, $sale_id = '')
+	public function check_invoice_number_exists(string $invoice_number, string $sale_id = ''): bool
 	{
-		$this->db->from('sales');
-		$this->db->where('invoice_number', $invoice_number);
+		$builder = $this->db->table('sales');
+		$builder->where('invoice_number', $invoice_number);
+		
 		if(!empty($sale_id))
 		{
-			$this->db->where('sale_id !=', $sale_id);
+			$builder->where('sale_id !=', $sale_id);
 		}
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Checks if work order number exists
 	 */
-	public function check_work_order_number_exists($work_order_number, $sale_id = '')
+	public function check_work_order_number_exists(string $work_order_number, string $sale_id = ''): bool
 	{
-		$this->db->from('sales');
-		$this->db->where('invoice_number', $work_order_number);
+		$builder = $this->db->table('sales');
+		$builder->where('invoice_number', $work_order_number);
 		if(!empty($sale_id))
 		{
-			$this->db->where('sale_id !=', $sale_id);
+			$builder->where('sale_id !=', $sale_id);
 		}
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Gets Giftcard value
 	 */
-	public function get_giftcard_value($giftcardNumber)
+	public function get_giftcard_value(string $giftcardNumber): float
 	{
-		if(!$this->Giftcard->exists($this->Giftcard->get_giftcard_id($giftcardNumber)))
+		$giftcard = model(Giftcard::class);
+
+		if(!$giftcard->exists($giftcard->get_giftcard_id($giftcardNumber)))	//TODO: camelCase is used here for the variable name but we are using _ everywhere else. CI4 moved to camelCase... we should pick one and do that.
 		{
 			return 0;
 		}
 
-		$this->db->from('giftcards');
-		$this->db->where('giftcard_number', $giftcardNumber);
+		$builder = $this->db->table('giftcards');
+		$builder->where('giftcard_number', $giftcardNumber);
 
-		return $this->db->get()->row()->value;
+		return $builder->get()->getRow()->value;
 	}
 
 	/**
 	 * Creates sales temporary dimensional table
 	 * We create a temp table that allows us to do easy report/sales queries
 	 */
-	public function create_temp_table(array $inputs)
+	public function create_temp_table(array $inputs): void
 	{
 		if(empty($inputs['sale_id']))
 		{
-			if(empty($this->config->item('date_or_time_format')))
+			if(empty(config('OSPOS')->date_or_time_format))	//TODO: This needs to be replaced with Ternary notation
 			{
 				$where = 'DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']);
 			}
@@ -1113,7 +1182,7 @@ class Sale extends CI_Model
 
 		$cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
 
-		if($this->config->item('tax_included'))
+		if(config('OSPOS')->tax_included)
 		{
 			$sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment";
 			$sale_subtotal = "$sale_total - $internal_tax";
@@ -1125,7 +1194,7 @@ class Sale extends CI_Model
 		}
 
 		// create a temporary table to contain all the sum of taxes per sale item
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_taxes_temp') .
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_taxes_temp') .
 			' (INDEX(sale_id), INDEX(item_id)) ENGINE=MEMORY
 			(
 				SELECT sales_items_taxes.sale_id AS sale_id,
@@ -1134,18 +1203,19 @@ class Sale extends CI_Model
 					SUM(ROUND(sales_items_taxes.item_tax_amount, ' . $decimals . ')) AS tax,
 					SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS internal_tax,
 					SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS sales_tax
-				FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_items_taxes') . ' AS sales_items_taxes
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = sales_items_taxes.sale_id
-				INNER JOIN ' . $this->db->dbprefix('sales_items') . ' AS sales_items
+				INNER JOIN ' . $this->db->prefixTable('sales_items') . ' AS sales_items
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line
 				WHERE ' . $where . '
 				GROUP BY sale_id, item_id, line
-			)'
-		);
+			)';
+		
+		$this->db->query($sql);
 
 		// create a temporary table to contain all the payment types and amount
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_payments_temp') .
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_payments_temp') .
 			' (PRIMARY KEY(sale_id), INDEX(sale_id))
 			(
 				SELECT payments.sale_id AS sale_id,
@@ -1153,15 +1223,16 @@ class Sale extends CI_Model
 					SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
 					SUM(payments.cash_refund) AS sale_cash_refund,
 					GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type
-				FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales.sale_id = payments.sale_id
 				WHERE ' . $where . '
 				GROUP BY payments.sale_id
-			)'
-		);
-
-		$this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_items_temp') .
+			)';
+		
+		$this->db->query($sql);
+		$item = model(Item::class);
+		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_temp') .
 			' (INDEX(sale_date), INDEX(sale_time), INDEX(sale_id))
 			(
 				SELECT
@@ -1183,7 +1254,7 @@ class Sale extends CI_Model
 					MAX(sales.employee_id) AS employee_id,
 					MAX(CONCAT(employee.first_name, " ", employee.last_name)) AS employee_name,
 					items.item_id AS item_id,
-					MAX(' . $this->Item->get_item_name() . ') AS name,
+					MAX(' . $item->get_item_name() . ') AS name,
 					MAX(items.item_number) AS item_number,
 					MAX(items.category) AS category,
 					MAX(items.supplier_id) AS supplier_id,
@@ -1205,101 +1276,104 @@ class Sale extends CI_Model
 					$sale_cost AS cost,
 					($sale_subtotal - $sale_cost) AS profit
 					" . '
-				FROM ' . $this->db->dbprefix('sales_items') . ' AS sales_items
-				INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales
+				FROM ' . $this->db->prefixTable('sales_items') . ' AS sales_items
+				INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
 					ON sales_items.sale_id = sales.sale_id
-				INNER JOIN ' . $this->db->dbprefix('items') . ' AS items
+				INNER JOIN ' . $this->db->prefixTable('items') . ' AS items
 					ON sales_items.item_id = items.item_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_payments_temp') . ' AS payments
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_payments_temp') . ' AS payments
 					ON sales_items.sale_id = payments.sale_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('suppliers') . ' AS supplier
+				LEFT OUTER JOIN ' . $this->db->prefixTable('suppliers') . ' AS supplier
 					ON items.supplier_id = supplier.person_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('people') . ' AS customer_p
+				LEFT OUTER JOIN ' . $this->db->prefixTable('people') . ' AS customer_p
 					ON sales.customer_id = customer_p.person_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('customers') . ' AS customer
+				LEFT OUTER JOIN ' . $this->db->prefixTable('customers') . ' AS customer
 					ON sales.customer_id = customer.person_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('people') . ' AS employee
+				LEFT OUTER JOIN ' . $this->db->prefixTable('people') . ' AS employee
 					ON sales.employee_id = employee.person_id
-				LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items_taxes_temp') . ' AS sales_items_taxes
+				LEFT OUTER JOIN ' . $this->db->prefixTable('sales_items_taxes_temp') . ' AS sales_items_taxes
 					ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line
 				WHERE ' . $where . '
 				GROUP BY sale_id, item_id, line
-			)'
-		);
+			)';
+		
+		$this->db->query($sql);
 	}
 
 	/**
 	 * Retrieves all sales that are in a suspended state
 	 */
-	public function get_all_suspended($customer_id = NULL)
+	public function get_all_suspended(int $customer_id = NULL): array
 	{
-		if($customer_id == -1)
+		if($customer_id == -1)	//TODO: This should be converted to a global constant and stored in constants.php
 		{
 			$query = $this->db->query("SELECT sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' THEN quote_number WHEN sale_type = '".SALE_TYPE_WORK_ORDER."' THEN work_order_number else sale_id end as doc_id, sale_id as suspended_sale_id, sale_status, sale_time, dinner_table_id, customer_id, employee_id, comment FROM "
-				. $this->db->dbprefix('sales') . ' where sale_status = ' . SUSPENDED);
+				. $this->db->prefixTable('sales') . ' where sale_status = ' . SUSPENDED);
 		}
 		else
 		{
 			$query = $this->db->query("SELECT sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' THEN quote_number WHEN sale_type = '".SALE_TYPE_WORK_ORDER."' THEN work_order_number else sale_id end as doc_id, sale_status, sale_time, dinner_table_id, customer_id, employee_id, comment FROM "
-				. $this->db->dbprefix('sales') . ' where sale_status = '. SUSPENDED .' AND customer_id = ' . $customer_id);
+				. $this->db->prefixTable('sales') . ' where sale_status = '. SUSPENDED .' AND customer_id = ' . $customer_id);
 		}
 
-		return $query->result_array();
+		return $query->getResultArray();
 	}
 
 	/**
 	 * Gets the dinner table for the selected sale
 	 */
-	public function get_dinner_table($sale_id)
+	public function get_dinner_table(int $sale_id)	//TODO: this is returning NULL or the table_id.  We can keep it this way but multiple return types can't be declared until PHP 8.x
 	{
 		if($sale_id == -1)
 		{
 			return NULL;
 		}
 
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get()->row()->dinner_table_id;
+		return $builder->get()->getRow()->dinner_table_id;
 	}
 
 	/**
 	 * Gets the sale type for the selected sale
 	 */
-	public function get_sale_type($sale_id)
+	public function get_sale_type(int $sale_id)
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get()->row()->sale_type;
+		return $builder->get()->getRow()->sale_type;
 	}
 
 	/**
 	 * Gets the sale status for the selected sale
 	 */
-	public function get_sale_status($sale_id)
+	public function get_sale_status(int $sale_id): int
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		return $this->db->get()->row()->sale_status;
+		return $builder->get()->getRow()->sale_status;
 	}
 
-	public function update_sale_status($sale_id, $sale_status)
+	public function update_sale_status(int $sale_id, int $sale_status): void
 	{
-		$this->db->where('sale_id', $sale_id);
-		$this->db->update('sales', array('sale_status'=>$sale_status));
+		$builder = $this->db->table('sales');
+		
+		$builder->where('sale_id', $sale_id);
+		$builder->update(['sale_status' => $sale_status]);
 	}
 
 	/**
 	 * Gets the quote_number for the selected sale
 	 */
-	public function get_quote_number($sale_id)
+	public function get_quote_number(int $sale_id): ?string
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		$row = $this->db->get()->row();
+		$row = $builder->get()->getRow();
 
 		if($row != NULL)
 		{
@@ -1312,14 +1386,14 @@ class Sale extends CI_Model
 	/**
 	 * Gets the work order number for the selected sale
 	 */
-	public function get_work_order_number($sale_id)
+	public function get_work_order_number(int $sale_id): ?string
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		$row = $this->db->get()->row();
+		$row = $builder->get()->getRow();
 
-		if($row != NULL)
+		if($row != NULL)	//TODO: === ?
 		{
 			return $row->work_order_number;
 		}
@@ -1330,14 +1404,14 @@ class Sale extends CI_Model
 	/**
 	 * Gets the quote_number for the selected sale
 	 */
-	public function get_comment($sale_id)
+	public function get_comment(int $sale_id): ?string
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
 
-		$row = $this->db->get()->row();
+		$row = $builder->get()->getRow();
 
-		if($row != NULL)
+		if($row != NULL)	//TODO: === ?
 		{
 			return $row->comment;
 		}
@@ -1348,101 +1422,114 @@ class Sale extends CI_Model
 	/**
 	 * Gets total of suspended invoices rows
 	 */
-	public function get_suspended_invoice_count()
+	public function get_suspended_invoice_count(): int
 	{
-		$this->db->from('sales');
-		$this->db->where('invoice_number IS NOT NULL');
-		$this->db->where('sale_status', SUSPENDED);
+		$builder = $this->db->table('sales');
+		$builder->where('invoice_number IS NOT NULL');
+		$builder->where('sale_status', SUSPENDED);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Removes a selected sale from the sales table.
 	 * This function should only be called for suspended sales that are being restored to the current cart
 	 */
-	public function delete_suspended_sale($sale_id)
+	public function delete_suspended_sale(int $sale_id): bool
 	{
 		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		if($this->config->item('dinner_table_enable') == TRUE)
+		if(config('OSPOS')->dinner_table_enable)
 		{
-			$dinner_table = $this->get_dinner_table($sale_id);
-			$this->Dinner_table->release($dinner_table);
+			$dinner_table = model(Dinner_table::class);
+			$dinner_table_id = $this->get_dinner_table($sale_id);
+			$dinner_table->release($dinner_table_id);
 		}
 
 		$this->update_sale_status($sale_id, CANCELED);
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		return $this->db->trans_status();
+		return $this->db->transStatus();
 	}
 
 	/**
-	 * This clears the sales detail for a given sale_id before the detail is resaved.
+	 * This clears the sales detail for a given sale_id before the detail is re-saved.
 	 * This allows us to reuse the same sale_id
 	 */
-	public function clear_suspended_sale_detail($sale_id)
+	public function clear_suspended_sale_detail(int $sale_id): bool
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-
-		if($this->config->item('dinner_table_enable') == TRUE)
+		if(config('OSPOS')->dinner_table_enable)
 		{
-			$dinner_table = $this->get_dinner_table($sale_id);
-			$this->Dinner_table->release($dinner_table);
+			$dinner_table = model(Dinner_table::class);
+			$dinner_table_id = $this->get_dinner_table($sale_id);
+			$dinner_table->release($dinner_table_id);
 		}
 
-		$this->db->delete('sales_payments', array('sale_id' => $sale_id));
-		$this->db->delete('sales_items_taxes', array('sale_id' => $sale_id));
-		$this->db->delete('sales_items', array('sale_id' => $sale_id));
-		$this->db->delete('sales_taxes', array('sale_id' => $sale_id));
+		$builder = $this->db->table('sales_payments');
+		$builder->delete(['sale_id' => $sale_id]);
 
-		$this->db->trans_complete();
+		$builder = $this->db->table('sales_items_taxes');
+		$builder->delete(['sale_id' => $sale_id]);
 
-		return $this->db->trans_status();
+		$builder = $this->db->table('sales_items');
+		$builder->delete(['sale_id' => $sale_id]);
+
+		$builder = $this->db->table('sales_taxes');
+		$builder->delete(['sale_id' => $sale_id]);
+
+		$this->db->transComplete();
+
+		return $this->db->transStatus();
 	}
 
 	/**
 	 * Gets suspended sale info
 	 */
-	public function get_suspended_sale_info($sale_id)
+	public function get_suspended_sale_info(int $sale_id): ResultInterface
 	{
-		$this->db->from('sales');
-		$this->db->where('sale_id', $sale_id);
-		$this->db->join('people', 'people.person_id = sales.customer_id', 'LEFT');
-		$this->db-where('sale_status', SUSPENDED);
+		$builder = $this->db->table('sales');
+		$builder->where('sale_id', $sale_id);
+		$builder->join('people', 'people.person_id = sales.customer_id', 'LEFT');
+		$builder->where('sale_status', SUSPENDED);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
-	 * @param $customer_id
-	 * @param $sale_id
-	 * @param $total_amount
-	 * @param $total_amount_used
+	 * @param int $customer_id
+	 * @param int $sale_id
+	 * @param float $total_amount
+	 * @param float $total_amount_used
 	 */
-	private function save_customer_rewards($customer_id, $sale_id, $total_amount, $total_amount_used)
+	private function save_customer_rewards(int $customer_id, int $sale_id, float $total_amount, float $total_amount_used): void
 	{
-		if(!empty($customer_id) && $this->config->item('customer_reward_enable') == TRUE)
+		if(!empty($customer_id) && config('OSPOS')->customer_reward_enable)
 		{
-			$package_id = $this->Customer->get_info($customer_id)->package_id;
+			$customer = model(Customer::class);
+			$customer_rewards = model(Customer_rewards::class);
+			$rewards = model(Rewards::class);
+
+			$package_id = $customer->get_info($customer_id)->package_id;
 
 			if(!empty($package_id))
 			{
-				$points_percent = $this->Customer_rewards->get_points_percent($package_id);
-				$points = $this->Customer->get_info($customer_id)->points;
+				$points_percent = $customer_rewards->get_points_percent($package_id);
+				$points = $customer->get_info($customer_id)->points;
 				$points = ($points == NULL ? 0 : $points);
 				$points_percent = ($points_percent == NULL ? 0 : $points_percent);
 				$total_amount_earned = ($total_amount * $points_percent / 100);
 				$points = $points + $total_amount_earned;
-				$this->Customer->update_reward_points_value($customer_id, $points);
-				$rewards_data = array('sale_id' => $sale_id, 'earned' => $total_amount_earned, 'used' => $total_amount_used);
-				$this->Rewards->save($rewards_data);
+
+				$customer->update_reward_points_value($customer_id, $points);
+
+				$rewards_data = ['sale_id' => $sale_id, 'earned' => $total_amount_earned, 'used' => $total_amount_used];
+
+				$rewards->save_value($rewards_data);
 			}
 		}
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Stock_location.php b/app/Models/Stock_location.php
index 3a64e5d4a..431bdf98e 100644
--- a/app/Models/Stock_location.php
+++ b/app/Models/Stock_location.php
@@ -1,55 +1,72 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use CodeIgniter\Session\Session;
 
 /**
  * Stock_location class
+ *
+ * @property employee employee
+ * @property item item
+ * @property session session
+ *
  */
-
-class Stock_location extends CI_Model
+class Stock_location extends Model
 {
-	public function exists($location_id = -1)
+	public function __construct()
 	{
-		$this->db->from('stock_locations');
-		$this->db->where('location_id', $location_id);
+		parent::__construct();
 
-		return ($this->db->get()->num_rows() >= 1);
+		$this->session = session();
+	}
+	public function exists(int $location_id = -1): bool	//TODO: Replace -1 with a constant
+	{
+		$builder = $this->db->table('stock_locations');
+		$builder->where('location_id', $location_id);
+
+		return ($builder->get()->getNumRows() >= 1);
 	}
 
-	public function get_all()
+	public function get_all(): ResultInterface
 	{
-		$this->db->from('stock_locations');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('stock_locations');
+		$builder->where('deleted', 0);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_undeleted_all($module_id = 'items')
+	public function get_undeleted_all(string $module_id = 'items'): ResultInterface
 	{
-		$this->db->from('stock_locations');
-		$this->db->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
-		$this->db->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
-		$this->db->where('person_id', $this->session->userdata('person_id'));
-		$this->db->like('permissions.permission_id', $module_id, 'after');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('stock_locations');
+		$builder->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
+		$builder->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
+		$builder->where('person_id', $this->session->get('person_id'));
+		$builder->like('permissions.permission_id', $module_id, 'after');
+		$builder->where('deleted', 0);
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function show_locations($module_id = 'items')
+	public function show_locations(string $module_id = 'items'): bool
 	{
 		$stock_locations = $this->get_allowed_locations($module_id);
 
 		return count($stock_locations) > 1;
 	}
 
-	public function multiple_locations()
+	public function multiple_locations(): bool
 	{
-		return $this->get_all()->num_rows() > 1;
+		return $this->get_all()->getNumRows() > 1;
 	}
 
-	public function get_allowed_locations($module_id = 'items')
+	public function get_allowed_locations(string $module_id = 'items'): array
 	{
-		$stock = $this->get_undeleted_all($module_id)->result_array();
-		$stock_locations = array();
+		$stock = $this->get_undeleted_all($module_id)->getResultArray();
+		$stock_locations = [];
+
 		foreach($stock as $location_data)
 		{
 			$stock_locations[$location_data['location_id']] = $location_data['location_name'];
@@ -58,130 +75,151 @@ class Stock_location extends CI_Model
 		return $stock_locations;
 	}
 
-	public function is_allowed_location($location_id, $module_id = 'items')
+	public function is_allowed_location(int $location_id, string $module_id = 'items'): bool
 	{
-		$this->db->from('stock_locations');
-		$this->db->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
-		$this->db->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
-		$this->db->where('person_id', $this->session->userdata('person_id'));
-		$this->db->like('permissions.permission_id', $module_id, 'after');
-		$this->db->where('stock_locations.location_id', $location_id);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('stock_locations');
+		$builder->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
+		$builder->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
+		$builder->where('person_id', $this->session->get('person_id'));
+		$builder->like('permissions.permission_id', $module_id, 'after');
+		$builder->where('stock_locations.location_id', $location_id);
+		$builder->where('deleted', 0);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
-	public function get_default_location_id($module_id = 'items')
+	public function get_default_location_id(string $module_id = 'items'): int
 	{
-		$this->db->from('stock_locations');
-		$this->db->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
-		$this->db->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
-		$this->db->where('person_id', $this->session->userdata('person_id'));
-		$this->db->like('permissions.permission_id', $module_id, 'after');
-		$this->db->where('deleted', 0);
-		$this->db->limit(1);
+		$builder = $this->db->table('stock_locations');
+		$builder->join('permissions AS permissions', 'permissions.location_id = stock_locations.location_id');
+		$builder->join('grants AS grants', 'grants.permission_id = permissions.permission_id');
+		$builder->where('person_id', $this->session->get('person_id'));
+		$builder->like('permissions.permission_id', $module_id, 'after');
+		$builder->where('deleted', 0);
+		$builder->limit(1);
 
-		return $this->db->get()->row()->location_id;
+		return $builder->get()->getRow()->location_id;
 	}
 
-	public function get_location_name($location_id)
+	public function get_location_name(int $location_id): string
 	{
-		$this->db->from('stock_locations');
-		$this->db->where('location_id', $location_id);
+		$builder = $this->db->table('stock_locations');
+		$builder->where('location_id', $location_id);
 
-		return $this->db->get()->row()->location_name;
+		return $builder->get()->getRow()->location_name;
 	}
 
-	public function get_location_id($location_name)
+	public function get_location_id(string $location_name): int
 	{
-		$this->db->from('stock_locations');
-		$this->db->where('location_name', $location_name);
+		$builder = $this->db->table('stock_locations');
+		$builder->where('location_name', $location_name);
 
-		return $this->db->get()->row()->location_id;
+		return $builder->get()->getRow()->location_id;
 	}
 
-	public function save(&$location_data, $location_id)
+	public function save_value(array &$location_data, int $location_id): bool
 	{
 		$location_name = $location_data['location_name'];
 
-		$location_data_to_save = array('location_name' => $location_name, 'deleted' => 0);
+		$location_data_to_save = ['location_name' => $location_name, 'deleted' => 0];
 
 		if(!$this->exists($location_id))
 		{
-			$this->db->trans_start();
+			$this->db->transStart();
 
-			$this->db->insert('stock_locations', $location_data_to_save);
- 			$location_id = $this->db->insert_id();
+			$builder = $this->db->table('stock_locations');
+			$builder->insert($location_data_to_save);
+ 			$location_id = $this->db->insertID();
 
-			$this->_insert_new_permission('items', $location_id, $location_name);
+			$this->_insert_new_permission('items', $location_id, $location_name);	//TODO: need to refactor out the hungarian notation.
 			$this->_insert_new_permission('sales', $location_id, $location_name);
 			$this->_insert_new_permission('receivings', $location_id, $location_name);
 
 			// insert quantities for existing items
-			$items = $this->Item->get_all();
-			foreach($items->result_array() as $item)
+			$item = model(Item::class);
+			$builder = $this->db->table('item_quantities');
+			$items = $item->get_all();
+
+			foreach($items->getResultArray() as $item)
 			{
-				$quantity_data = array('item_id' => $item['item_id'], 'location_id' => $location_id, 'quantity' => 0);
-				$this->db->insert('item_quantities', $quantity_data);
+				$quantity_data = [
+					'item_id' => $item['item_id'],
+					'location_id' => $location_id,
+					'quantity' => 0
+				];
+				$builder->insert($quantity_data);
 			}
 
-			$this->db->trans_complete();
+			$this->db->transComplete();
 
-			return $this->db->trans_status();
+			return $this->db->transStatus();
 		}
 
 		$original_location_name = $this->get_location_name($location_id);
 
 		if($original_location_name != $location_name)
 		{
-			$this->db->where('location_id', $location_id);
-			$this->db->delete('permissions');
+			$builder = $this->db->table('permissions');
+			$builder->delete(['location_id' => $location_id]);
 
 			$this->_insert_new_permission('items', $location_id, $location_name);
 			$this->_insert_new_permission('sales', $location_id, $location_name);
 			$this->_insert_new_permission('receivings', $location_id, $location_name);
 		}
 
-		$this->db->where('location_id', $location_id);
+		$builder = $this->db->table('stock_locations');
+		$builder->where('location_id', $location_id);
 
-		return $this->db->update('stock_locations', $location_data_to_save);
+		return $builder->update($location_data_to_save);
 	}
 
-	private function _insert_new_permission($module, $location_id, $location_name)
+	private function _insert_new_permission(string $module, int $location_id, string $location_name): void	//TODO: refactor out hungarian notation
 	{
 		// insert new permission for stock location
-		$permission_id = $module . '_' . str_replace(' ', '_', $location_name);
-		$permission_data = array('permission_id' => $permission_id, 'module_id' => $module, 'location_id' => $location_id);
-		$this->db->insert('permissions', $permission_data);
+		$permission_id = $module . '_' . str_replace(' ', '_', $location_name);	//TODO: String interpolation
+		$permission_data = ['permission_id' => $permission_id, 'module_id' => $module, 'location_id' => $location_id];
+
+		$builder = $this->db->table('permissions');
+		$builder->insert($permission_data);
 
 		// insert grants for new permission
-		$employees = $this->Employee->get_all();
-		foreach($employees->result_array() as $employee)
-		{
-			// Retrieve the menu_group assigned to the grant for the module and use that for the new stock locations
-			$menu_group = $this->Employee->get_menu_group($module, $employee['person_id']);
+		$employee = model(Employee::class);
+		$employees = $employee->get_all();
 
-			$grants_data = array('permission_id' => $permission_id, 'person_id' => $employee['person_id'], 'menu_group' => $menu_group);
-			$this->db->insert('grants', $grants_data);
+		$builder = $this->db->table('grants');
+
+		foreach($employees->getResultArray() as $employee)
+		{
+			$this->employee = model('Employee');
+
+			// Retrieve the menu_group assigned to the grant for the module and use that for the new stock locations
+			$menu_group = $employee->get_menu_group($module, $employee['person_id']);
+
+			$grants_data = ['permission_id' => $permission_id, 'person_id' => $employee['person_id'], 'menu_group' => $menu_group];
+
+			$builder->insert($grants_data);
 		}
 	}
 
-	/*
-	 Deletes one item
+	/**
+	 * Deletes one item
+	 * @param int|null $location_id
+	 * @param bool $purge
+	 * @return bool
 	 */
-	public function delete($location_id)
+	public function delete(int $location_id = null, bool $purge = FALSE): bool
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$this->db->where('location_id', $location_id);
-		$this->db->update('stock_locations', array('deleted' => 1));
+		$builder = $this->db->table('stock_locations');
+		$builder->where('location_id', $location_id);
+		$builder->update(['deleted' => 1]);
 
-		$this->db->where('location_id', $location_id);
-		$this->db->delete('permissions');
+		$builder = $this->db->table('permissions');
+		$builder->delete(['location_id' => $location_id]);
 
-		$this->db->trans_complete();
+		$this->db->transComplete();
 
-		return $this->db->trans_status();
+		return $this->db->transStatus();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 05ef4d458..41e218382 100644
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -1,307 +1,311 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Supplier class
- */
-
-class Supplier extends Person
-{
-	const GOODS_SUPPLIER = 0;
-	const COST_SUPPLIER = 1;
-
-	/*
-	Determines if a given person_id is a customer
-	*/
-	public function exists($person_id)
-	{
-		$this->db->from('suppliers');	
-		$this->db->join('people', 'people.person_id = suppliers.person_id');
-		$this->db->where('suppliers.person_id', $person_id);
-		
-		return ($this->db->get()->num_rows() == 1);
-	}
-
-	/*
-	Gets total of rows
-	*/
-	public function get_total_rows()
-	{
-		$this->db->from('suppliers');
-		$this->db->where('deleted', 0);
-
-		return $this->db->count_all_results();
-	}
-	
-	/*
-	Returns all the suppliers
-	*/
-	public function get_all($category = self::GOODS_SUPPLIER, $limit_from = 0, $rows = 0)
-	{
-		$this->db->from('suppliers');
-		$this->db->join('people', 'suppliers.person_id = people.person_id');
-		$this->db->where('category', $category);
-		$this->db->where('deleted', 0);
-		$this->db->order_by('company_name', 'asc');
-		if($rows > 0)
-		{
-			$this->db->limit($rows, $limit_from);
-		}
-
-		return $this->db->get();		
-	}
-	
-	/*
-	Gets information about a particular supplier
-	*/
-	public function get_info($supplier_id)
-	{
-		$this->db->from('suppliers');	
-		$this->db->join('people', 'people.person_id = suppliers.person_id');
-		$this->db->where('suppliers.person_id', $supplier_id);
-		$query = $this->db->get();
-		
-		if($query->num_rows() == 1)
-		{
-			return $query->row();
-		}
-		else
-		{
-			//Get empty base parent object, as $supplier_id is NOT an supplier
-			$person_obj = parent::get_info(-1);
-			
-			//Get all the fields from supplier table		
-			//append those fields to base parent object, we we have a complete empty object
-			foreach($this->db->list_fields('suppliers') as $field)
-			{
-				$person_obj->$field = '';
-			}
-			
-			return $person_obj;
-		}
-	}
-	
-	/*
-	Gets information about multiple suppliers
-	*/
-	public function get_multiple_info($suppliers_ids)
-	{
-		$this->db->from('suppliers');
-		$this->db->join('people', 'people.person_id = suppliers.person_id');		
-		$this->db->where_in('suppliers.person_id', $suppliers_ids);
-		$this->db->order_by('last_name', 'asc');
-
-		return $this->db->get();
-	}
-	
-	/*
-	Inserts or updates a suppliers
-	*/
-	public function save_supplier(&$person_data, &$supplier_data, $supplier_id = FALSE)
-	{
-		$success = FALSE;
-
-		//Run these queries as a transaction, we want to make sure we do all or nothing
-		$this->db->trans_start();
-		
-		if(parent::save($person_data,$supplier_id))
-		{
-			if(!$supplier_id || !$this->exists($supplier_id))
-			{
-				$supplier_data['person_id'] = $person_data['person_id'];
-				$success = $this->db->insert('suppliers', $supplier_data);
-			}
-			else
-			{
-				$this->db->where('person_id', $supplier_id);
-				$success = $this->db->update('suppliers', $supplier_data);
-			}
-		}
-		
-		$this->db->trans_complete();
-		
-		$success &= $this->db->trans_status();
-
-		return $success;
-	}
-	
-	/*
-	Deletes one supplier
-	*/
-	public function delete($supplier_id)
-	{
-		$this->db->where('person_id', $supplier_id);
-
-		return $this->db->update('suppliers', array('deleted' => 1));
-	}
-	
-	/*
-	Deletes a list of suppliers
-	*/
-	public function delete_list($supplier_ids)
-	{
-		$this->db->where_in('person_id', $supplier_ids);
-
-		return $this->db->update('suppliers', array('deleted' => 1));
- 	}
- 	
- 	/*
-	Get search suggestions to find suppliers
-	*/
-	public function get_search_suggestions($search, $unique = FALSE, $limit = 25)
-	{
-		$suggestions = array();
-
-		$this->db->from('suppliers');
-		$this->db->join('people', 'suppliers.person_id = people.person_id');
-		$this->db->where('deleted', 0);
-		$this->db->like('company_name', $search);
-		$this->db->order_by('company_name', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->company_name);
-		}
-
-		$this->db->from('suppliers');
-		$this->db->join('people', 'suppliers.person_id = people.person_id');
-		$this->db->where('deleted', 0);
-		$this->db->distinct();
-		$this->db->like('agency_name', $search);
-		$this->db->where('agency_name IS NOT NULL');
-		$this->db->order_by('agency_name', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->agency_name);
-		}
-
-		$this->db->from('suppliers');
-		$this->db->join('people', 'suppliers.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search); 
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
-		$this->db->order_by('last_name', 'asc');
-		foreach($this->db->get()->result() as $row)
-		{
-			$suggestions[] = array('value' => $row->person_id, 'label' => $row->first_name . ' ' . $row->last_name);
-		}
-
-		if(!$unique)
-		{
-			$this->db->from('suppliers');
-			$this->db->join('people', 'suppliers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('email', $search);
-			$this->db->order_by('email', 'asc');
-			foreach($this->db->get()->result() as $row)
-			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->email);
-			}
-
-			$this->db->from('suppliers');
-			$this->db->join('people', 'suppliers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('phone_number', $search);
-			$this->db->order_by('phone_number', 'asc');
-			foreach($this->db->get()->result() as $row)
-			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->phone_number);
-			}
-
-			$this->db->from('suppliers');
-			$this->db->join('people', 'suppliers.person_id = people.person_id');
-			$this->db->where('deleted', 0);
-			$this->db->like('account_number', $search);
-			$this->db->order_by('account_number', 'asc');
-			foreach($this->db->get()->result() as $row)
-			{
-				$suggestions[] = array('value' => $row->person_id, 'label' => $row->account_number);
-			}
-		}
-
-		//only return $limit suggestions
-		if(count($suggestions) > $limit)
-		{
-			$suggestions = array_slice($suggestions, 0, $limit);
-		}
-
-		return $suggestions;
-	}
-
- 	/*
-	Gets rows
-	*/
-	public function get_found_rows($search)
-	{
-		return $this->search($search, 0, 0, 'last_name', 'asc', TRUE);
-	}
-	
-	/*
-	Perform a search on suppliers
-	*/
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'last_name', $order = 'asc', $count_only = FALSE)
-	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(suppliers.person_id) as count');
-		}
-
-		$this->db->from('suppliers AS suppliers');
-		$this->db->join('people', 'suppliers.person_id = people.person_id');
-		$this->db->group_start();
-			$this->db->like('first_name', $search);
-			$this->db->or_like('last_name', $search);
-			$this->db->or_like('company_name', $search);
-			$this->db->or_like('agency_name', $search);
-			$this->db->or_like('email', $search);
-			$this->db->or_like('phone_number', $search);
-			$this->db->or_like('account_number', $search);
-			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
-		
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			return $this->db->get()->row()->count;
-		}
-
-		$this->db->order_by($sort, $order);
-
-		if($rows > 0)
-		{
-			$this->db->limit($rows, $limit_from);
-		}
-
-		return $this->db->get();
-	}
-
-	/*
-	Return supplier categories
-	*/
-	public function get_categories()
-	{
-		return array(
-			self::GOODS_SUPPLIER => $this->lang->line('suppliers_goods'),
-			self::COST_SUPPLIER => $this->lang->line('suppliers_cost')
-		);
-	}
-
-	/*
-	Return a category name given its id
-	*/
-	public function get_category_name($id)
-	{
-		if($id == self::GOODS_SUPPLIER)
-		{
-			return $this->lang->line('suppliers_goods');
-		}
-		elseif($id == self::COST_SUPPLIER)
-		{
-			return $this->lang->line('suppliers_cost');
-		}
-	}
-}
-?>
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+
+/**
+ * Supplier class
+ */
+class Supplier extends Person
+{
+	/**
+	* Determines if a given person_id is a customer
+	*/
+	public function exists(int $person_id): bool
+	{
+		$builder = $this->db->table('suppliers');	
+		$builder->join('people', 'people.person_id = suppliers.person_id');
+		$builder->where('suppliers.person_id', $person_id);
+		
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
+	}
+
+	/**
+	 * Gets total of rows
+	 */
+	public function get_total_rows(): int
+	{
+		$builder = $this->db->table('suppliers');
+		$builder->where('deleted', 0);
+
+		return $builder->countAllResults();
+	}
+	
+	/**
+	 * Returns all the suppliers
+	 */
+	public function get_all(int $limit = 0, int $offset = 0, int $category = GOODS_SUPPLIER): ResultInterface
+	{
+		$builder = $this->db->table('suppliers');
+		$builder->join('people', 'suppliers.person_id = people.person_id');
+		$builder->where('category', $category);
+		$builder->where('deleted', 0);
+		$builder->orderBy('company_name', 'asc');
+
+		if($limit > 0)
+		{
+			$builder->limit($limit, $offset);
+		}
+
+		return $builder->get();
+	}
+	
+	/**
+	 * Gets information about a particular supplier
+	 */
+	public function get_info(int $person_id): object
+	{
+		$builder = $this->db->table('suppliers');	
+		$builder->join('people', 'people.person_id = suppliers.person_id');
+		$builder->where('suppliers.person_id', $person_id);
+		$query = $builder->get();
+		
+		if($query->getNumRows() == 1)	//TODO: ===
+		{
+			return $query->getRow();
+		}
+		else
+		{
+			//Get empty base parent object, as $supplier_id is NOT a supplier
+			$person_obj = parent::get_info(-1);	//TODO: need to replace with a constant instead of -1
+			
+			//Get all the fields from supplier table		
+			//append those fields to base parent object, we have a complete empty object
+			foreach($this->db->getFieldNames('suppliers') as $field)
+			{
+				$person_obj->$field = '';
+			}
+			
+			return $person_obj;
+		}
+	}
+	
+	/**
+	 * Gets information about multiple suppliers
+	 */
+	public function get_multiple_info(array $person_ids): ResultInterface
+	{
+		$builder = $this->db->table('suppliers');
+		$builder->join('people', 'people.person_id = suppliers.person_id');
+		$builder->whereIn('suppliers.person_id', $person_ids);
+		$builder->orderBy('last_name', 'asc');
+
+		return $builder->get();
+	}
+	
+	/**
+	 * Inserts or updates a suppliers
+	 */
+	public function save_supplier(array &$person_data, array &$supplier_data, bool $supplier_id = FALSE): bool
+	{
+		$success = FALSE;
+
+		//Run these queries as a transaction, we want to make sure we do all or nothing
+		$this->db->transStart();
+		
+		if(parent::save_value($person_data,$supplier_id))
+		{
+			$builder = $this->db->table('suppliers');
+			if(!$supplier_id || !$this->exists($supplier_id))
+			{
+				$supplier_data['person_id'] = $person_data['person_id'];
+				$success = $builder->insert($supplier_data);
+			}
+			else
+			{
+				$builder->where('person_id', $supplier_id);
+				$success = $builder->update($supplier_data);
+			}
+		}
+		
+		$this->db->transComplete();
+		
+		$success &= $this->db->transStatus();
+
+		return $success;
+	}
+	
+	/**
+	 * Deletes one supplier
+	 */
+	public function delete(int $supplier_id = null, bool $purge = false): bool
+	{
+		$builder = $this->db->table('suppliers');
+		$builder->where('person_id', $supplier_id);
+
+		return $builder->update(['deleted' => 1]);
+	}
+	
+	/**
+	 * Deletes a list of suppliers
+	 */
+	public function delete_list(array $person_ids): bool
+	{
+		$builder = $this->db->table('suppliers');
+		$builder->whereIn('person_id', $person_ids);
+
+		return $builder->update(['deleted' => 1]);
+ 	}
+ 	
+ 	/**
+	 * Get search suggestions to find suppliers
+	 */
+	public function get_search_suggestions(string $search, int $limit = 25, bool $unique = FALSE): array	//TODO: Parent is looking for the 2nd parameter to be an int
+	{
+		$suggestions = [];
+
+		$builder = $this->db->table('suppliers');
+		$builder->join('people', 'suppliers.person_id = people.person_id');
+		$builder->where('deleted', 0);
+		$builder->like('company_name', $search);
+		$builder->orderBy('company_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
+		{
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->company_name];
+		}
+
+		$builder = $this->db->table('suppliers');
+		$builder->join('people', 'suppliers.person_id = people.person_id');
+		$builder->where('deleted', 0);
+		$builder->distinct();
+		$builder->like('agency_name', $search);
+		$builder->where('agency_name IS NOT NULL');
+		$builder->orderBy('agency_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
+		{
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->agency_name];
+		}
+
+		$builder = $this->db->table('suppliers');
+		$builder->join('people', 'suppliers.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search); 
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+		$builder->orderBy('last_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
+		{
+			$suggestions[] = ['value' => $row->person_id, 'label' => $row->first_name . ' ' . $row->last_name];
+		}
+
+		if(!$unique)
+		{
+			$builder = $this->db->table('suppliers');
+			$builder->join('people', 'suppliers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('email', $search);
+			$builder->orderBy('email', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
+			{
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->email];
+			}
+
+			$builder = $this->db->table('suppliers');
+			$builder->join('people', 'suppliers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('phone_number', $search);
+			$builder->orderBy('phone_number', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
+			{
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->phone_number];
+			}
+
+			$builder = $this->db->table('suppliers');
+			$builder->join('people', 'suppliers.person_id = people.person_id');
+			$builder->where('deleted', 0);
+			$builder->like('account_number', $search);
+			$builder->orderBy('account_number', 'asc');
+
+			foreach($builder->get()->getResult() as $row)
+			{
+				$suggestions[] = ['value' => $row->person_id, 'label' => $row->account_number];
+			}
+		}
+
+		//only return $limit suggestions
+		if(count($suggestions) > $limit)	//TODO: this can be replaced with return count($suggestions) > $limit ? array_slice($suggestions, 0, $limit) : $suggestions
+		{
+			$suggestions = array_slice($suggestions, 0, $limit);
+		}
+
+		return $suggestions;
+	}
+
+ 	/**
+	 * Gets rows
+	 */
+	public function get_found_rows(string $search): ResultInterface
+	{
+		return $this->search($search, 0, 0, 'last_name', 'asc', TRUE);
+	}
+	
+	/**
+	 * Perform a search on suppliers
+	 */
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'last_name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
+	{
+		$builder = $this->db->table('suppliers AS suppliers');
+
+		//get_found_rows case
+		if($count_only == TRUE)	//TODO: This needs to be replaced with `if($count_only)`
+		{
+			$builder->select('COUNT(suppliers.person_id) as count');
+		}
+
+		$builder->join('people', 'suppliers.person_id = people.person_id');
+		$builder->groupStart();
+			$builder->like('first_name', $search);
+			$builder->orLike('last_name', $search);
+			$builder->orLike('company_name', $search);
+			$builder->orLike('agency_name', $search);
+			$builder->orLike('email', $search);
+			$builder->orLike('phone_number', $search);
+			$builder->orLike('account_number', $search);
+			$builder->orLike('CONCAT(first_name, " ", last_name)', $search);	//TODO: According to PHPStorm, this line down to the return is repeated in Customer.php and Employee.php... perhaps refactoring a method in a library could be helpful?
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+		
+		if($count_only == TRUE)	//TODO: This needs to be replaced with `if($count_only)`
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
+
+		if($rows > 0)
+		{
+			$builder->limit($rows, $limit_from);
+		}
+
+		return $builder->get();
+	}
+
+	/**
+	 * Return supplier categories
+	 */
+	public function get_categories(): array
+	{
+		return [
+			GOODS_SUPPLIER => lang('Suppliers.goods'),
+			COST_SUPPLIER => lang('Suppliers.cost')
+		];
+	}
+
+	/**
+	 * Return a category name given its id.
+	 * @param int $supplier_type Constant representing the type of supplier.
+	 * @return string Language string for the given supplier type.
+	 */
+	public function get_category_name(int $supplier_type): string
+	{
+		return lang("Suppliers.$supplier_type");
+	}
+}
\ No newline at end of file
diff --git a/app/Models/Tax.php b/app/Models/Tax.php
index 92391aa8a..bbb2af4ef 100644
--- a/app/Models/Tax.php
+++ b/app/Models/Tax.php
@@ -1,72 +1,78 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Tax class
  */
-
-class Tax extends CI_Model
+class Tax extends Model
 {
 	/**
 	 * Determines if a given row is on file
 	 */
-	public function exists($tax_rate_id)
+	public function exists(int $tax_rate_id): bool
 	{
-		$this->db->from('tax_rates');
-		$this->db->where('tax_rate_id', $tax_rate_id);
+		$builder = $this->db->table('tax_rates');
+		$builder->where('tax_rate_id', $tax_rate_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 * Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('tax_rates');
+		$builder = $this->db->table('tax_rates');
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets list of tax rates that are assigned to a particular tax category
 	 */
-	public function get_tax_category_usage($tax_category_id)
+	public function get_tax_category_usage(int $tax_category_id): int
 	{
-		$this->db->from('tax_rates');
-		$this->db->where('rate_tax_category_id', $tax_category_id);
+		$builder = $this->db->table('tax_rates');
+		$builder->where('rate_tax_category_id', $tax_category_id);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets the row for a particular id
 	 */
-	public function get_info($tax_rate_id)
+	public function get_info(int $tax_rate_id): object
 	{
-		$this->db->select('tax_rate_id');
-		$this->db->select('rate_tax_code_id');
-		$this->db->select('tax_code');
-		$this->db->select('tax_code_name');
-		$this->db->select('rate_jurisdiction_id');
-		$this->db->select('jurisdiction_name');
-		$this->db->select('rate_tax_category_id');
-		$this->db->select('tax_category');
-		$this->db->select('tax_rate');
-		$this->db->select('tax_rounding_code');
-		$this->db->from('tax_rates');
-		$this->db->join('tax_codes',
+		$builder = $this->db->table('tax_rates');
+		$builder->select('tax_rate_id');
+		$builder->select('rate_tax_code_id');
+		$builder->select('tax_code');
+		$builder->select('tax_code_name');
+		$builder->select('rate_jurisdiction_id');
+		$builder->select('jurisdiction_name');
+		$builder->select('rate_tax_category_id');
+		$builder->select('tax_category');
+		$builder->select('tax_rate');
+		$builder->select('tax_rounding_code');
+
+		$builder->join('tax_codes',
 			'rate_tax_code_id = tax_code_id', 'LEFT');
-		$this->db->join('tax_categories',
+		$builder->join('tax_categories',
 			'rate_tax_category_id = tax_category_id', 'LEFT');
-		$this->db->join('tax_jurisdictions',
+		$builder->join('tax_jurisdictions',
 			'rate_jurisdiction_id = jurisdiction_id', 'LEFT');
-		$this->db->where('tax_rate_id', $tax_rate_id);
+		$builder->where('tax_rate_id', $tax_rate_id);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: probably should use === here since getNumRows() returns an int.
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -83,8 +89,6 @@ class Tax extends CI_Model
 			$tax_rate_obj->rate_jurisdiction_id = NULL;
 			$tax_rate_obj->jurisdiction_name = '';
 
-			//Get all the fields from tax_codes table
-
 			return $tax_rate_obj;
 		}
 	}
@@ -92,35 +96,37 @@ class Tax extends CI_Model
 	/**
 	 * Get taxes to be collected for a given tax code
 	 */
-	 public function get_taxes($tax_code_id, $tax_category_id)
-	{
-		$query = $this->db->query('select tax_rate_id, rate_tax_code_id, tax_code, tax_code_name, tax_type, cascade_sequence, rate_tax_category_id, tax_category, 
+	 public function get_taxes(int $tax_code_id, int $tax_category_id): array
+	 {
+		 $sql = 'select tax_rate_id, rate_tax_code_id, tax_code, tax_code_name, tax_type, cascade_sequence, rate_tax_category_id, tax_category, 
 			rate_jurisdiction_id, jurisdiction_name, tax_group, tax_rate, tax_rounding_code,tax_categories.tax_group_sequence + tax_jurisdictions.tax_group_sequence as tax_group_sequence 
-			from ' . $this->db->dbprefix('tax_rates') . ' 
-			left outer join ' . $this->db->dbprefix('tax_codes') . ' on rate_tax_code_id = tax_code_id 
-			left outer join ' . $this->db->dbprefix('tax_categories') . ' as tax_categories on rate_tax_category_id = tax_category_id 
-			left outer join ' . $this->db->dbprefix('tax_jurisdictions') . ' as tax_jurisdictions on rate_jurisdiction_id = jurisdiction_id 
+			from ' . $this->db->prefixTable('tax_rates') . ' 
+			left outer join ' . $this->db->prefixTable('tax_codes') . ' on rate_tax_code_id = tax_code_id 
+			left outer join ' . $this->db->prefixTable('tax_categories') . ' as tax_categories on rate_tax_category_id = tax_category_id 
+			left outer join ' . $this->db->prefixTable('tax_jurisdictions') . ' as tax_jurisdictions on rate_jurisdiction_id = jurisdiction_id 
 			where rate_tax_code_id = ' . $this->db->escape($tax_code_id) . ' and rate_tax_category_id = ' . $this->db->escape($tax_category_id) . '
-			order by cascade_sequence, tax_group, jurisdiction_name, tax_jurisdictions.tax_group_sequence + tax_categories.tax_group_sequence');
+			order by cascade_sequence, tax_group, jurisdiction_name, tax_jurisdictions.tax_group_sequence + tax_categories.tax_group_sequence';
 
-		return $query->result_array();
+		$query = $this->db->query($sql);
+
+		return $query->getResultArray();
 	}
 
 	/**
 	 * Gets information about a particular tax_code
 	 */
-	public function get_rate_info($tax_code_id, $tax_category_id)
+	public function get_rate_info(int $tax_code_id, int $tax_category_id): object
 	{
-		$this->db->from('tax_rates');
-		$this->db->join('tax_categories', 'rate_tax_category_id = tax_category_id');
-		$this->db->where('rate_tax_code_id', $tax_code_id);
-		$this->db->where('rate_tax_category_id', $tax_category_id);
+		$builder = $this->db->table('tax_rates');
+		$builder->join('tax_categories', 'rate_tax_category_id = tax_category_id');
+		$builder->where('rate_tax_code_id', $tax_code_id);
+		$builder->where('rate_tax_category_id', $tax_category_id);
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: this should probably be ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -128,12 +134,12 @@ class Tax extends CI_Model
 			$tax_rate_obj = new stdClass();
 
 			//Get all the fields from tax_codes table
-			foreach($this->db->list_fields('tax_rates') as $field)
+			foreach($this->db->getFieldNames('tax_rates') as $field)
 			{
 				$tax_rate_obj->$field = '';
 			}
 			//Get all the fields from tax_rates table
-			foreach($this->db->list_fields('tax_categories') as $field)
+			foreach($this->db->getFieldNames('tax_categories') as $field)
 			{
 				$tax_rate_obj->$field = '';
 			}
@@ -145,22 +151,23 @@ class Tax extends CI_Model
 	/**
 	Inserts or updates a tax_rates entry
 	*/
-	public function save(&$tax_rate_data, $tax_rate_id = -1)
+	public function save_value(array &$tax_rate_data, int $tax_rate_id = -1): bool	//TODO: the default value for $tax_rate_id should be made a constant and replaced here.
 	{
+		$builder = $this->db->table('tax_rates');
 		if(!$this->exists($tax_rate_id))
 		{
-			if($this->db->insert('tax_rates', $tax_rate_data))
+			if($builder->insert($tax_rate_data))
 			{
-				$tax_rate_data['tax_rate_id'] = $this->db->insert_id();
+				$tax_rate_data['tax_rate_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
 		}
 		else
 		{
-			$this->db->where('tax_rate_id', $tax_rate_id);
+			$builder->where('tax_rate_id', $tax_rate_id);
 
-			if($this->db->update('tax_rates', $tax_rate_data))
+			if($builder->update($tax_rate_data))
 			{
 				return TRUE;
 			}
@@ -172,25 +179,28 @@ class Tax extends CI_Model
 	/**
 	 * Deletes a single tax rate entry
 	 */
-	public function delete($tax_rate_id)
+	public function delete(int $tax_rate_id = null, bool $purge = false): bool
 	{
-		return $this->db->delete('tax_tax_rates', array('tax_rate_id' => $tax_rate_id));
+		$builder = $this->db->table('tax_rates');
+
+		return $builder->delete(['tax_rate_id' => $tax_rate_id]);
 	}
 
 	/**
 	 * Deletes a list of tax rates
 	 */
-	public function delete_list($tax_rate_ids)
+	public function delete_list(array $tax_rate_ids): bool
 	{
-		$this->db->where_in('tax_rate_id', $tax_rate_ids);
+		$builder = $this->db->table('tax_rates');
+		$builder->whereIn('tax_rate_id', $tax_rate_ids);
 
-		return $this->db->delete('tax_rates');
+		return $builder->delete();
 	}
 
 	/**
 	 * Gets tax_codes
 	 */
-	public function get_found_rows($search)
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'tax_code_name', 'asc', TRUE);
 	}
@@ -198,92 +208,88 @@ class Tax extends CI_Model
 	/**
 	 * Performs a search on tax_rates
 	 */
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'tax_code_name', $order = 'asc', $count_only = FALSE)
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'tax_code_name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
+		$builder = $this->db->table('tax_rates');
 
+		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			$this->db->select('COUNT(tax_rate_id) as count');
+			$builder->select('COUNT(tax_rate_id) as count');
 		} else
 		{
-			$this->db->select('tax_rate_id');
-			$this->db->select('tax_code');
-			$this->db->select('rate_tax_code_id');
-			$this->db->select('tax_code_name');
-			$this->db->select('rate_jurisdiction_id');
-			$this->db->select('jurisdiction_name');
-			$this->db->select('rate_tax_category_id');
-			$this->db->select('tax_category');
-			$this->db->select('tax_rate');
-			$this->db->select('tax_rounding_code');
+			$builder->select('tax_rate_id');
+			$builder->select('tax_code');
+			$builder->select('rate_tax_code_id');
+			$builder->select('tax_code_name');
+			$builder->select('rate_jurisdiction_id');
+			$builder->select('jurisdiction_name');
+			$builder->select('rate_tax_category_id');
+			$builder->select('tax_category');
+			$builder->select('tax_rate');
+			$builder->select('tax_rounding_code');
 		}
-		$this->db->from('tax_rates');
-		$this->db->join('tax_codes',
-			'rate_tax_code_id = tax_code_id', 'LEFT');
-		$this->db->join('tax_categories',
-			'rate_tax_category_id = tax_category_id', 'LEFT');
-		$this->db->join('tax_jurisdictions',
-			'rate_jurisdiction_id = jurisdiction_id', 'LEFT');
+
+		$builder->join('tax_codes', 'rate_tax_code_id = tax_code_id', 'LEFT');
+		$builder->join('tax_categories', 'rate_tax_category_id = tax_category_id', 'LEFT');
+		$builder->join('tax_jurisdictions', 'rate_jurisdiction_id = jurisdiction_id', 'LEFT');
 
 		if(!empty($search))
 		{
-			$this->db->like('rate_tax_code', $search);
-			$this->db->or_like('tax_code_name', $search);
+			$builder->like('rate_tax_code', $search);
+			$builder->orLike('tax_code_name', $search);
 		}
 
 		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			return $this->db->get()->row()->count;
+			return $builder->get()->getRow()->count;
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_tax_code_type_name($tax_code_type)
+	public function get_tax_code_type_name(string $tax_code_type): string	//TODO: if this is being called from the view and passed through GET params then it will come through as a string... better if we can get it as an int though.
 	{
-		if($tax_code_type == '0')
+		if($tax_code_type == '0')	//TODO: ===.  Also, replace this with ternary notation. The whole function becomes a nice one-liner.
 		{
-			return $this->lang->line('taxes_tax_included');
+			return lang('Taxes.tax_included');
 		}
 		else
 		{
-			return $this->lang->line('taxes_tax_excluded');
+			return lang('Taxes.tax_excluded');
 		}
 	}
 
-	public function get_tax_category($tax_category_id)
+	public function get_tax_category(int $tax_category_id): string
 	{
-		$this->db->select('tax_category');
-		$this->db->from('tax_categories');
-		$this->db->where('tax_category_id', $tax_category_id);
+		$builder = $this->db->table('tax_categories');
+		$builder->select('tax_category');
+		$builder->where('tax_category_id', $tax_category_id);
 
-		return $this->db->get()->row()->tax_category;
+		return $builder->get()->getRow()->tax_category;
 	}
 
-	public function get_all_tax_categories()
+	public function get_all_tax_categories(): ResultInterface
 	{
-		$this->db->from('tax_categories');
-		$this->db->order_by('tax_category_id');
+		$builder = $this->db->table('tax_categories');
+		$builder->orderBy('tax_category_id');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_tax_category_id($tax_category)
+	public function get_tax_category_id(string $tax_category): int	//TODO: $tax_category is not used in this function and get_tax_category_id() is not called in the code.  It may be that this needs to be deprecated and removed.
 	{
-		$this->db->select('tax_category_id');
-		$this->db->from('tax_categories');
+		$builder = $this->db->table('tax_categories');
+		$builder->select('tax_category_id');
 
-		return $this->db->get()->row()->tax_category_id;
+		return $builder->get()->getRow()->tax_category_id;
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tax_category.php b/app/Models/Tax_category.php
index f2ad826ed..a6b3cf383 100644
--- a/app/Models/Tax_category.php
+++ b/app/Models/Tax_category.php
@@ -1,46 +1,52 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Tax Category class
  */
 
-class Tax_category extends CI_Model
+class Tax_category extends Model
 {
 	/**
 	 *  Determines if it exists in the table
 	 */
-	public function exists($tax_category_id)
+	public function exists(int $tax_category_id): bool
 	{
-		$this->db->from('tax_categories');
-		$this->db->where('tax_category_id', $tax_category_id);
+		$builder = $this->db->table('tax_categories');
+		$builder->where('tax_category_id', $tax_category_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: probably should be ===
 	}
 
 	/**
 	 *  Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('tax_categories');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_categories');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets information about the particular record
 	 */
-	public function get_info($tax_category_id)
+	public function get_info(int $tax_category_id): object
 	{
-		$this->db->from('tax_categories');
-		$this->db->where('tax_category_id', $tax_category_id);
-		$this->db->where('deleted', 0);
-		$query = $this->db->get();
+		$builder = $this->db->table('tax_categories');
+		$builder->where('tax_category_id', $tax_category_id);
+		$builder->where('deleted', 0);
+		$query = $builder->get();
 
-		if($query->num_rows()==1)
+		if($query->getNumRows() == 1)	//TODO: probably should be === since getNumRows returns an int
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -48,9 +54,9 @@ class Tax_category extends CI_Model
 			$tax_category_obj = new stdClass();
 
 			//Get all the fields from the table
-			foreach($this->db->list_fields('tax_categories') as $field)
+			foreach($this->db->getFieldNames('tax_categories') as $field)
 			{
-				$tax_category_obj->$field = '';
+				$tax_category_obj->$field = '';	//TODO: This logic doesn't make sense to me... it appears that each field is being assigned to '' rather than the result.  Shouldn't this be $tax_category_obj->field = $field;?
 			}
 			return $tax_category_obj;
 		}
@@ -58,48 +64,50 @@ class Tax_category extends CI_Model
 
 	/**
 	 *  Returns all rows from the table
-	 */
-	public function get_all($rows = 0, $limit_from = 0, $no_deleted = TRUE)
+	 *///TODO: I think we should work toward having all these get_all functions with the same signature.  It makes it easier to use them.  This signature is different from the others.
+	public function get_all(int $rows = 0, int $limit_from = 0, bool $no_deleted = TRUE): ResultInterface	//TODO: $no_deleted needs a new name.  $not_deleted is the correct grammar, but it's a bit confusing by naming the variable a negative.  Probably better to name it is_deleted and flip the logic
 	{
-		$this->db->from('tax_categories');
+		$builder = $this->db->table('tax_categories');
 		if($no_deleted == TRUE)
 		{
-			$this->db->where('deleted', 0);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->order_by('tax_group_sequence', 'asc');
-		$this->db->order_by('tax_category', 'asc');
+		$builder->orderBy('tax_group_sequence', 'asc');
+		$builder->orderBy('tax_category', 'asc');
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Returns multiple rows
 	 */
-	public function get_multiple_info($tax_category_ids)
+	public function get_multiple_info(array $tax_category_ids): ResultInterface
 	{
-		$this->db->from('tax_categories');
-		$this->db->where_in('tax_category_id', $tax_category_ids);
-		$this->db->order_by('tax_category', 'asc');
+		$builder = $this->db->table('tax_categories');
+		$builder->whereIn('tax_category_id', $tax_category_ids);
+		$builder->orderBy('tax_category', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Inserts or updates a row
 	 */
-	public function save(&$tax_category_data, $tax_category_id = FALSE)
+	public function save_value(array &$tax_category_data, bool $tax_category_id = FALSE): bool
 	{
+		$builder = $this->db->table('tax_categories');
+
 		if(!$tax_category_id || !$this->exists($tax_category_id))
 		{
-			if($this->db->insert('tax_categories', $tax_category_data))
+			if($builder->insert($tax_category_data))
 			{
-				$tax_category_data['tax_category_id'] = $this->db->insert_id();
+				$tax_category_data['tax_category_id'] = $this->db->insertID();
 
 				return TRUE;
 			}
@@ -107,26 +115,32 @@ class Tax_category extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('tax_category_id', $tax_category_id);
+		$builder->where('tax_category_id', $tax_category_id);
 
-		return $this->db->update('tax_categories', $tax_category_data);
+		return $builder->update($tax_category_data);
 	}
 
 	/**
 	 * Saves changes to the tax categories table
 	 */
-	public function save_categories($array_save)
+	public function save_categories(array $array_save): bool	//TODO: $array_save probably needs to be renamed here to $categories or something similar.  Datatype in the variable name is a code smell.
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$not_to_delete = array();
+		$not_to_delete = [];
 
 		foreach($array_save as $key => $value)
 		{
 			// save or update
-			$tax_category_data = array('tax_category' => $value['tax_category'], 'tax_group_sequence' => $value['tax_group_sequence'], 'deleted' => '0');
-			$this->save($tax_category_data, $value['tax_category_id']);
-			if($value['tax_category_id'] == -1)
+			$tax_category_data = [
+				'tax_category' => $value['tax_category'],
+				'tax_group_sequence' => $value['tax_group_sequence'],
+				'deleted' => '0'
+			];
+
+			$this->save_value($tax_category_data, $value['tax_category_id']);
+
+			if($value['tax_category_id'] == -1)	//TODO: -1 should be converted into a constant for code readability.  Perhaps NO_TAX_CATEGORY?
 			{
 				$not_to_delete[] = $tax_category_data['tax_category_id'];
 			}
@@ -137,7 +151,7 @@ class Tax_category extends CI_Model
 		}
 
 		// all entries not available in post will be deleted now
-		$deleted_tax_categories = $this->get_all()->result_array();
+		$deleted_tax_categories = $this->get_all()->getResultArray();
 
 		foreach($deleted_tax_categories as $key => $tax_category_data)
 		{
@@ -147,34 +161,36 @@ class Tax_category extends CI_Model
 			}
 		}
 
-		$this->db->trans_complete();
-		return $this->db->trans_status();
+		$this->db->transComplete();
+		return $this->db->transStatus();
 	}
 
 	/**
 	 * Soft delete a specific row
 	 */
-	public function delete($tax_category_id)
+	public function delete($tax_category_id = null, bool $purge = false): bool
 	{
-		$this->db->where('tax_category_id', $tax_category_id);
+		$builder = $this->db->table('tax_categories');
+		$builder->where('tax_category_id', $tax_category_id);
 
-		return $this->db->update('tax_categories', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
 	/**
 	 * Deletes a list of rows
 	 */
-	public function delete_list($tax_category_ids)
+	public function delete_list(array $tax_category_ids): bool
 	{
-		$this->db->where_in('tax_category_id', $tax_category_ids);
+		$builder = $this->db->table('tax_categories');
+		$builder->whereIn('tax_category_id', $tax_category_ids);
 
-		return $this->db->update('tax_categories', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
 	/**
 	 * Gets rows
 	 */
-	public function get_found_rows($search)
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'tax_category', 'asc', TRUE);
 	}
@@ -182,62 +198,66 @@ class Tax_category extends CI_Model
 	/**
 	 *  Perform a search for a set of rows
 	 */
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'tax_category', $order='asc', $count_only = FALSE)
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'tax_category', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(tax_categories.tax_category_id) as count');
-		}
-
-		$this->db->from('tax_categories AS tax_categories');
-		$this->db->like('tax_category', $search);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_categories AS tax_categories');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: This should probably be === since $count_only is a bool
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(tax_categories.tax_category_id) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->like('tax_category', $search);
+		$builder->where('deleted', 0);
+
+		// get_found_rows case
+		if($count_only == TRUE)	//TODO: This should probably be === since $count_only is a bool
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_tax_category_suggestions($search)
+	public function get_tax_category_suggestions(string $search): array
 	{
-		$suggestions = array();
+		$suggestions = [];
+
+		$builder = $this->db->table('tax_categories');
+		$builder->where('deleted', 0);
 
-		$this->db->from('tax_categories');
-		$this->db->where('deleted', 0);
 		if(!empty($search))
 		{
-			$this->db->like('tax_category', '%'.$search.'%');
+			$builder->like('tax_category', '%'.$search.'%');
 		}
-		$this->db->order_by('tax_category', 'asc');
 
-		foreach($this->db->get()->result() as $row)
+		$builder->orderBy('tax_category', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->tax_category_id, 'label' => $row->tax_category);
+			$suggestions[] = ['value' => $row->tax_category_id, 'label' => $row->tax_category];
 		}
 
 		return $suggestions;
 	}
 
-	public function get_empty_row()
+	public function get_empty_row(): array
 	{
-		return array('0' => array(
-			'tax_category_id' => -1,
-			'tax_category' => '',
-			'tax_group_sequence' => '',
-			'deleted' => ''));
+		return [
+			'0' => [
+				'tax_category_id' => -1,	//TODO: This should probably be a Constant instead of -1
+				'tax_category' => '',
+				'tax_group_sequence' => '',
+				'deleted' => ''
+			]
+		];
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tax_code.php b/app/Models/Tax_code.php
index 16b09b025..11ac9d835 100644
--- a/app/Models/Tax_code.php
+++ b/app/Models/Tax_code.php
@@ -1,46 +1,52 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Tax Code class
  */
-
-class Tax_code extends CI_Model
+class Tax_code extends Model
 {
 	/**
 	 *  Determines if it exists in the table
 	 */
-	public function exists($tax_code)
+	public function exists(string $tax_code): bool
 	{
-		$this->db->from('tax_codes');
-		$this->db->where('tax_code', $tax_code);
+		$builder = $this->db->table('tax_codes');
+		$builder->where('tax_code', $tax_code);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: this should be === since getNumRows returns an int
 	}
 
 	/**
 	 *  Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('tax_codes');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_codes');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
 	/**
 	 * Gets information about the particular record
 	 */
-	public function get_info($tax_code_id)
+	public function get_info(int $tax_code_id): object
 	{
-		$this->db->from('tax_codes');
-		$this->db->where('tax_code_id', $tax_code_id);
-		$this->db->where('deleted', 0);
-		$query = $this->db->get();
+		$builder = $this->db->table('tax_codes');
 
-		if($query->num_rows()==1)
+		$builder->where('tax_code_id', $tax_code_id);
+		$builder->where('deleted', 0);
+		$query = $builder->get();
+
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
 		else
 		{
@@ -48,7 +54,7 @@ class Tax_code extends CI_Model
 			$tax_code_obj = new stdClass();
 
 			//Get all the fields from the table
-			foreach($this->db->list_fields('tax_codes') as $field)
+			foreach($this->db->getFieldNames('tax_codes') as $field)
 			{
 				$tax_code_obj->$field = '';
 			}
@@ -59,74 +65,82 @@ class Tax_code extends CI_Model
 	/**
 	 *  Returns all rows from the table
 	 */
-	public function get_all($rows = 0, $limit_from = 0, $no_deleted = TRUE)
+	public function get_all(int $rows = 0, int $limit_from = 0, bool $no_deleted = TRUE): ResultInterface	//TODO: $no_deleted should be something like $is_deleted and flip the logic.
 	{
-		$this->db->from('tax_codes');
+		$builder = $this->db->table('tax_codes');
 		if($no_deleted == TRUE)
 		{
-			$this->db->where('deleted', 0);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->order_by('tax_code_name', 'asc');
+		$builder->orderBy('tax_code_name', 'asc');
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Returns multiple rows
 	 */
-	public function get_multiple_info($tax_codes)
+	public function get_multiple_info(array $tax_codes): ResultInterface
 	{
-		$this->db->from('tax_codes');
-		$this->db->where_in('tax_code', $tax_codes);
-		$this->db->order_by('tax_code_name', 'asc');
+		$builder = $this->db->table('tax_codes');
+		$builder->whereIn('tax_code', $tax_codes);
+		$builder->orderBy('tax_code_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Inserts or updates a row
 	 */
-	public function save(&$tax_code_data)
+	public function save($tax_code_data): bool
 	{
+		$builder = $this->db->table('tax_codes');
+
 		if(!$this->exists($tax_code_data['tax_code']))
 		{
-			if($this->db->insert('tax_codes', $tax_code_data))
+			if($builder->insert($tax_code_data))	//TODO: this should be refactored to return $builder->insert($tax_code_data); in the same way that $builder->update() below is the return.  Look for this in the other save functions as well.
 			{
 				return TRUE;
 			}
 			return FALSE;
 		}
 
-		$this->db->where('tax_code', $tax_code_data['tax_code']);
+		$builder->where('tax_code', $tax_code_data['tax_code']);
 
-		return $this->db->update('tax_codes', $tax_code_data);
+		return $builder->update($tax_code_data);
 	}
 
 	/**
 	 * Saves changes to the tax codes table
 	 */
-	public function save_tax_codes($array_save)
+	public function save_tax_codes(array $array_save): bool	//TODO: Need to rename $array_save to probably $tax_codes
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$not_to_delete = array();
+		$not_to_delete = [];
 
 		foreach($array_save as $key => $value)
 		{
 			// save or update
-			$tax_code_data = array('tax_code' => $value['tax_code'], 'tax_code_name' => $value['tax_code_name'], 'city' => $value['city'], 'state' => $value['state'], 'deleted' => '0');
+			$tax_code_data = [
+				'tax_code' => $value['tax_code'],
+				'tax_code_name' => $value['tax_code_name'],
+				'city' => $value['city'],
+				'state' => $value['state'],
+				'deleted' => '0'
+			];
 			$this->save($tax_code_data);
 			$not_to_delete[] = $tax_code_data['tax_code'];
 		}
 
 		// all entries not available in post will be deleted now
-		$deleted_tax_codes = $this->get_all()->result_array();
+		$deleted_tax_codes = $this->get_all()->getResultArray();
 
 		foreach($deleted_tax_codes as $key => $tax_code_data)
 		{
@@ -136,34 +150,36 @@ class Tax_code extends CI_Model
 			}
 		}
 
-		$this->db->trans_complete();
-		return $this->db->trans_status();
+		$this->db->transComplete();
+		return $this->db->transStatus();
 	}
 
 	/**
 	 * Deletes a specific tax code
 	 */
-	public function delete($tax_code)
+	public function delete(string $tax_code = null, bool $purge = false): bool
 	{
-		$this->db->where('tax_code', $tax_code);
+		$builder = $this->db->table('tax_codes');
+		$builder->where('tax_code', $tax_code);
 
-		return $this->db->update('tax_codes', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
 	/**
 	 * Deletes a list of rows
 	 */
-	public function delete_list($tax_codes)
+	public function delete_list(array $tax_codes): bool
 	{
-		$this->db->where_in('tax_code', $tax_codes);
+		$builder = $this->db->table('tax_codes');
+		$builder->whereIn('tax_code', $tax_codes);
 
-		return $this->db->update('tax_codes', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
 	/**
 	 * Gets rows
 	 */
-	public function get_found_rows($search)
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'tax_code_name', 'asc', TRUE);
 	}
@@ -171,93 +187,93 @@ class Tax_code extends CI_Model
 	/**
 	 *  Perform a search for a set of rows
 	 */
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'tax_code_name', $order='asc', $count_only = FALSE)
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'tax_code_name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(tax_codes.tax_code) as count');
-		}
-
-		$this->db->from('tax_codes AS tax_codes');
-		$this->db->group_start();
-		$this->db->like('tax_code_name', $search);
-		$this->db->or_like('tax_code', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_codes AS tax_codes');
 
 		// get_found_rows case
 		if($count_only == TRUE)
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(tax_codes.tax_code) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->groupStart();
+		$builder->like('tax_code_name', $search);
+		$builder->orLike('tax_code', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+
+		// get_found_rows case
+		if($count_only == TRUE)
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 * Gets the tax code to use for a given customer
 	 */
-	public function get_sales_tax_code($city = '', $state = '')
+	public function get_sales_tax_code(string $city = '', string $state = '')
 	{
 		// if tax code using both city and state cannot be found then  try again using just the state
 		// if the state tax code cannot be found then try again using blanks for both
-		$this->db->from('tax_codes');
-		$this->db->where('city', $city);
-		$this->db->where('state', $state);
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_codes');
+		$builder->where('city', $city);
+		$builder->where('state', $state);
+		$builder->where('deleted', 0);
 
 
-		$query = $this->db->get();
+		$query = $builder->get();
 
-		if($query->num_rows() == 1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row()->tax_code_id;
+			return $query->getRow()->tax_code_id;
+		}
+
+		$builder = $this->db->table('tax_codes');
+		$builder->where('city', '');
+		$builder->where('state', $state);
+		$builder->where('deleted', 0);
+
+		$query = $builder->get();
+
+		if($query->getNumRows() == 1)		//TODO: this should be ===
+		{
+			return $query->getRow()->tax_code_id;
 		}
 		else
 		{
-			$this->db->from('tax_codes');
-			$this->db->where('city', '');
-			$this->db->where('state', $state);
-			$this->db->where('deleted', 0);
-
-			$query = $this->db->get();
-
-			if($query->num_rows() == 1)
-			{
-				return $query->row()->tax_code_id;
-			}
-			else
-			{
-				return $this->config->item('default_tax_code');
-			}
+			return config('OSPOS')->default_tax_code;
 		}
-		return FALSE;
 	}
 
-	public function get_tax_codes_search_suggestions($search, $limit = 25)
+	public function get_tax_codes_search_suggestions(string $search, int $limit = 25): array
 	{
-		$suggestions = array();
+		$suggestions = [];
+
+		$builder = $this->db->table('tax_codes');
 
-		$this->db->from('tax_codes');
 		if(!empty($search))
 		{
-			$this->db->like('tax_code', $search);
-			$this->db->or_like('tax_code_name', $search);
+			$builder->like('tax_code', $search);
+			$builder->orLike('tax_code_name', $search);
 		}
-		$this->db->where('deleted', 0);
-		$this->db->order_by('tax_code_name', 'asc');
 
-		foreach($this->db->get()->result() as $row)
+		$builder->where('deleted', 0);
+		$builder->orderBy('tax_code_name', 'asc');
+
+		foreach($builder->get()->getResult() as $row)
 		{
-			$suggestions[] = array('value' => $row->tax_code_id, 'label' => ($row->tax_code . ' ' . $row->tax_code_name));
+			$suggestions[] = ['value' => $row->tax_code_id, 'label' => ($row->tax_code . ' ' . $row->tax_code_name)];
 		}
 
 		//only return $limit suggestions
@@ -269,15 +285,17 @@ class Tax_code extends CI_Model
 		return $suggestions;
 	}
 
-	public function get_empty_row()
+	public function get_empty_row(): array
 	{
-		return array('0' => array(
-			'tax_code_id' => -1,
-			'tax_code' => '',
-			'tax_code_name' => '',
-			'city' => '',
-			'state' => '',
-			'deleted' => 0));
+		return [
+			'0' => [
+				'tax_code_id' => -1,
+				'tax_code' => '',
+				'tax_code_name' => '',
+				'city' => '',
+				'state' => '',
+				'deleted' => 0
+			]
+		];
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tax_jurisdiction.php b/app/Models/Tax_jurisdiction.php
index af5bde8a2..8d46f0e34 100644
--- a/app/Models/Tax_jurisdiction.php
+++ b/app/Models/Tax_jurisdiction.php
@@ -1,54 +1,60 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Model;
+use stdClass;
 
 /**
  * Tax Jurisdiction class
  */
 
-class Tax_jurisdiction extends CI_Model
+class Tax_jurisdiction extends Model
 {
 	/**
 	 *  Determines if it exists in the table
 	 */
-	public function exists($jurisdiction_id)
+	public function exists(int $jurisdiction_id): bool
 	{
-		$this->db->from('tax_jurisdictions');
-		$this->db->where('jurisdiction_id', $jurisdiction_id);
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->where('jurisdiction_id', $jurisdiction_id);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($builder->get()->getNumRows() == 1);	//TODO: ===
 	}
 
 	/**
 	 *  Gets total of rows
 	 */
-	public function get_total_rows()
+	public function get_total_rows(): int
 	{
-		$this->db->from('tax_jurisdictions');
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $builder->countAllResults();
 	}
 
-	/**
+	/***
 	 * Gets information about the particular record
 	 */
-	public function get_info($jurisdiction_id)
+	public function get_info(int $jurisdiction_id): object
 	{
-		$this->db->from('tax_jurisdictions');
-		$this->db->where('jurisdiction_id', $jurisdiction_id);
-		$this->db->where('deleted', 0);
-		$query = $this->db->get();
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->where('jurisdiction_id', $jurisdiction_id);
+		$builder->where('deleted', 0);
+		$query = $builder->get();
 
-		if($query->num_rows()==1)
+		if($query->getNumRows() == 1)	//TODO: ===
 		{
-			return $query->row();
+			return $query->getRow();
 		}
-		else
+		else	//TODO: this else is not needed.  Just put everything below it without an else.
 		{
 			//Get empty base parent object
 			$tax_jurisdiction_obj = new stdClass();
 
 			//Get all the fields from the table
-			foreach($this->db->list_fields('tax_jurisdictions') as $field)
+			foreach($this->db->getFieldNames('tax_jurisdictions') as $field)
 			{
 				$tax_jurisdiction_obj->$field = '';
 			}
@@ -59,72 +65,83 @@ class Tax_jurisdiction extends CI_Model
 	/**
 	 *  Returns all rows from the table
 	 */
-	public function get_all($rows = 0, $limit_from = 0, $no_deleted = TRUE)
+	public function get_all(int $rows = 0, int $limit_from = 0, bool $no_deleted = TRUE): ResultInterface
 	{
-		$this->db->from('tax_jurisdictions');
+		$builder = $this->db->table('tax_jurisdictions');
+
 		if($no_deleted == TRUE)
 		{
-			$this->db->where('deleted', 0);
+			$builder->where('deleted', 0);
 		}
 
-		$this->db->order_by('jurisdiction_name', 'asc');
+		$builder->orderBy('jurisdiction_name', 'asc');
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Returns multiple rows
 	 */
-	public function get_multiple_info($jurisdiction_ids)
+	public function get_multiple_info(array $jurisdiction_ids): ResultInterface
 	{
-		$this->db->from('tax_jurisdictions');
-		$this->db->where_in('jurisdiction_id', $jurisdiction_ids);
-		$this->db->order_by('jurisdiction_name', 'asc');
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->whereIn('jurisdiction_id', $jurisdiction_ids);
+		$builder->orderBy('jurisdiction_name', 'asc');
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
 	/**
 	 *  Inserts or updates a row
 	 */
-	public function save(&$jurisdiction_data, $jurisdiction_id = FALSE)
+	public function save_value(array &$jurisdiction_data, bool $jurisdiction_id = FALSE): bool
 	{
+		$builder = $this->db->table('tax_jurisdictions');
 		if(!$jurisdiction_id || !$this->exists($jurisdiction_id))
 		{
-			if($this->db->insert('tax_jurisdictions', $jurisdiction_data))
+			if($builder->insert($jurisdiction_data))	//TODO: Replace this with simply a return of the result of insert()... see update() below.
 			{
-				$jurisdiction_data['jurisdiction_id'] = $this->db->insert_id();
+				$jurisdiction_data['jurisdiction_id'] = $this->db->insertID();
 				return TRUE;
 			}
 
 			return FALSE;
 		}
 
-		$this->db->where('jurisdiction_id', $jurisdiction_id);
+		$builder->where('jurisdiction_id', $jurisdiction_id);
 
-		return $this->db->update('tax_jurisdictions', $jurisdiction_data);
+		return $builder->update($jurisdiction_data);
 	}
 
 	/**
 	 * Saves changes to the tax jurisdictions table
 	 */
-	public function save_jurisdictions($array_save)
+	public function save_jurisdictions(array $array_save): bool
 	{
-		$this->db->trans_start();
+		$this->db->transStart();
 
-		$not_to_delete = array();
+		$not_to_delete = [];
 
 		foreach($array_save as $key => $value)
 		{
 			// save or update
-			$tax_jurisdiction_data = array('jurisdiction_name' => $value['jurisdiction_name'], 'tax_group' => $value['tax_group'], 'tax_type' => $value['tax_type'], 'reporting_authority' => $value['reporting_authority'], 'tax_group_sequence' => $value['tax_group_sequence'], 'cascade_sequence' => $value['cascade_sequence'], 'deleted' => '0');
-			$this->save($tax_jurisdiction_data, $value['jurisdiction_id']);
-			if($value['jurisdiction_id'] == -1)
+			$tax_jurisdiction_data = [
+				'jurisdiction_name' => $value['jurisdiction_name'],
+				'tax_group' => $value['tax_group'],
+				'tax_type' => $value['tax_type'],
+				'reporting_authority' => $value['reporting_authority'],
+				'tax_group_sequence' => $value['tax_group_sequence'],
+				'cascade_sequence' => $value['cascade_sequence'],
+				'deleted' => '0'];
+
+			$this->save_value($tax_jurisdiction_data, $value['jurisdiction_id']);
+
+			if($value['jurisdiction_id'] == -1)		//TODO: replace -1 with a constant. Also === ?.  Also replace this with ternary notation.
 			{
 				$not_to_delete[] = $tax_jurisdiction_data['jurisdiction_id'];
 			}
@@ -135,7 +152,7 @@ class Tax_jurisdiction extends CI_Model
 		}
 
 		// all entries not available in post will be deleted now
-		$deleted_tax_jurisdictions = $this->get_all()->result_array();
+		$deleted_tax_jurisdictions = $this->get_all()->getResultArray();
 
 		foreach($deleted_tax_jurisdictions as $key => $tax_jurisdiction_data)
 		{
@@ -145,34 +162,36 @@ class Tax_jurisdiction extends CI_Model
 			}
 		}
 
-		$this->db->trans_complete();
-		return $this->db->trans_status();
+		$this->db->transComplete();
+		return $this->db->transStatus();
 	}
 
 	/**
 	 * Soft deletes a specific tax jurisdiction
 	 */
-	public function delete($jurisdiction_id)
+	public function delete(int $jurisdiction_id = null, bool $purge = false): bool
 	{
-		$this->db->where('jurisdiction_id', $jurisdiction_id);
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->where('jurisdiction_id', $jurisdiction_id);
 
-		return $this->db->update('tax_jurisdictions', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
 	}
 
 	/**
 	 * Soft deletes a list of rows
 	 */
-	public function delete_list($jurisdiction_ids)
+	public function delete_list(array $jurisdiction_ids): bool
 	{
-		$this->db->where_in('jurisdiction_id', $jurisdiction_ids);
+		$builder = $this->db->table('tax_jurisdictions');
+		$builder->whereIn('jurisdiction_id', $jurisdiction_ids);
 
-		return $this->db->update('tax_jurisdictions', array('deleted' => 1));
+		return $builder->update(['deleted' => 1]);
  	}
 
 	/**
 	 * Gets rows
 	 */
-	public function get_found_rows($search)
+	public function get_found_rows(string $search): ResultInterface
 	{
 		return $this->search($search, 0, 0, 'jurisdiction_name', 'asc', TRUE);
 	}
@@ -180,49 +199,51 @@ class Tax_jurisdiction extends CI_Model
 	/**
 	 *  Perform a search for a set of rows
 	 */
-	public function search($search, $rows = 0, $limit_from = 0, $sort = 'jurisdiction_name', $order='asc', $count_only = FALSE)
+	public function search(string $search, int $rows = 0, int $limit_from = 0, string $sort = 'jurisdiction_name', string $order = 'asc', bool $count_only = FALSE): ResultInterface
 	{
-		// get_found_rows case
-		if($count_only == TRUE)
-		{
-			$this->db->select('COUNT(tax_jurisdictions.jurisdiction_id) as count');
-		}
-
-		$this->db->from('tax_jurisdictions AS tax_jurisdictions');
-		$this->db->group_start();
-			$this->db->like('jurisdiction_name', $search);
-			$this->db->or_like('reporting_authority', $search);
-		$this->db->group_end();
-		$this->db->where('deleted', 0);
+		$builder = $this->db->table('tax_jurisdictions AS tax_jurisdictions');
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only == TRUE)	//TODO: Replace this with just count_only: `if($count_only)`
 		{
-			return $this->db->get()->row()->count;
+			$builder->select('COUNT(tax_jurisdictions.jurisdiction_id) as count');
 		}
 
-		$this->db->order_by($sort, $order);
+		$builder->groupStart();
+			$builder->like('jurisdiction_name', $search);
+			$builder->orLike('reporting_authority', $search);
+		$builder->groupEnd();
+		$builder->where('deleted', 0);
+
+		// get_found_rows case
+		if($count_only == TRUE)	//TODO: ===
+		{
+			return $builder->get()->getRow()->count;
+		}
+
+		$builder->orderBy($sort, $order);
 
 		if($rows > 0)
 		{
-			$this->db->limit($rows, $limit_from);
+			$builder->limit($rows, $limit_from);
 		}
 
-		return $this->db->get();
+		return $builder->get();
 	}
 
-	public function get_empty_row()
+	public function get_empty_row(): array
 	{
-		return array('0' => array(
-			'jurisdiction_id' => -1,
-			'jurisdiction_name' => '',
-			'tax_group' => '',
-			'tax_type' => '1',
-			'reporting_authority' => '',
-			'tax_group_sequence' => '',
-			'cascade_sequence' => '',
-			'deleted' => ''));
+		return [
+			'0' => [
+				'jurisdiction_id' => -1,	//TODO: Replace -1 with a constant
+				'jurisdiction_name' => '',
+				'tax_group' => '',
+				'tax_type' => '1',
+				'reporting_authority' => '',
+				'tax_group_sequence' => '',
+				'cascade_sequence' => '',
+				'deleted' => ''
+			]
+		];
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token.php b/app/Models/Tokens/Token.php
index 4c296d9e6..836eb7158 100644
--- a/app/Models/Tokens/Token.php
+++ b/app/Models/Tokens/Token.php
@@ -1,63 +1,63 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 
-require_once(APPPATH . 'models/tokens/Token.php');
-require_once(APPPATH . 'models/tokens/Token_customer.php');
-require_once(APPPATH . 'models/tokens/Token_invoice_count.php');
-require_once(APPPATH . 'models/tokens/Token_invoice_sequence.php');
-require_once(APPPATH . 'models/tokens/Token_quote_sequence.php');
-require_once(APPPATH . 'models/tokens/Token_year_quote_count.php');
-require_once(APPPATH . 'models/tokens/Token_work_order_sequence.php');
-require_once(APPPATH . 'models/tokens/Token_suspended_invoice_count.php');
-require_once(APPPATH . 'models/tokens/Token_year_invoice_count.php');
-require_once(APPPATH . 'models/tokens/Token_barcode_price.php');
-require_once(APPPATH . 'models/tokens/Token_barcode_weight.php');
-require_once(APPPATH . 'models/tokens/Token_barcode_ean.php');
+namespace App\Models\Tokens;
+
+use CodeIgniter\Model;
 
 /**
  * Token class
  */
-
-abstract class Token
+abstract class Token Extends Model
 {
-	protected $CI;
-
 	protected $value = '';
 
 	public function __construct($value = '')
 	{
-		$this->CI =& get_instance();
+		parent::__construct();
+
 		$this->value = $value;
 	}
 
-	static function get_barcode_tokens()
+	static function get_barcode_tokens(): array
 	{
-		return array(new Token_barcode_price(), new Token_barcode_weight(), new Token_barcode_ean());
+		return [
+			new Token_barcode_price(),
+			new Token_barcode_weight(),
+			new Token_barcode_ean()
+		];
 	}
 
-	static function get_tokens()
+	static function get_tokens(): array
 	{
-		return array(new Token_customer(), new Token_invoice_count(), new Token_invoice_sequence(),
-			new Token_quote_sequence(), new Token_suspended_invoice_count(), new Token_quote_sequence(),
-			new Token_work_order_sequence(), new Token_year_invoice_count(), new Token_year_quote_count());
+		return [
+			new Token_customer(),
+			new Token_invoice_count(),
+			new Token_invoice_sequence(),
+			new Token_quote_sequence(),
+			new Token_suspended_invoice_count(),
+			new Token_quote_sequence(),
+			new Token_work_order_sequence(),
+			new Token_year_invoice_count(),
+			new Token_year_quote_count()
+		];
 	}
 
-	abstract public function token_id();
+	abstract public function token_id(): string;
 
 	abstract public function get_value();
 
-	function matches($token_id)
+	function matches($token_id): bool
 	{
-		return token_id() == $token_id;
+		return $this->token_id() == $token_id;
 	}
 
-	function replace($text)
+	function replace_token(string $text): string	//TODO: This function is never called in the code
 	{
 		if(strstr($text, $this->token_id()))
 		{
 			return str_replace($this->token_id(), $this->get_value(), $text);
 		}
+
 		return $text;
 	}
-
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_barcode_ean.php b/app/Models/Tokens/Token_barcode_ean.php
index f6c125cf4..e3abd6da8 100644
--- a/app/Models/Tokens/Token_barcode_ean.php
+++ b/app/Models/Tokens/Token_barcode_ean.php
@@ -1,22 +1,19 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
 
 /**
  * Token_barcode_price class
  */
-
 class Token_barcode_ean extends Token
 {
-
-    public function token_id()
-    {
+    public function token_id(): string
+	{
         return 'I';
     }
 
-    public function get_value()
-    {
+    public function get_value(): string
+	{
         return '\w';
     }
-
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_barcode_price.php b/app/Models/Tokens/Token_barcode_price.php
index 1b12eb158..e149d3de0 100644
--- a/app/Models/Tokens/Token_barcode_price.php
+++ b/app/Models/Tokens/Token_barcode_price.php
@@ -1,22 +1,19 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
 
 /**
  * Token_barcode_price class
  */
-
 class Token_barcode_price extends Token
 {
-
-    public function token_id()
-    {
+    public function token_id(): string
+	{
         return 'P';
     }
 
-    public function get_value()
-    {
+    public function get_value(): string
+	{
         return '\d';
     }
-
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_barcode_weight.php b/app/Models/Tokens/Token_barcode_weight.php
index bb4f118ec..2e4aa0001 100644
--- a/app/Models/Tokens/Token_barcode_weight.php
+++ b/app/Models/Tokens/Token_barcode_weight.php
@@ -1,22 +1,19 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
 
 /**
  * Token_barcode_price class
  */
-
 class Token_barcode_weight extends Token
 {
-
-    public function token_id()
+    public function token_id(): string
     {
         return 'W';
     }
 
-    public function get_value()
+    public function get_value(): string
     {
         return '\d';
     }
-
-}
-
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_customer.php b/app/Models/Tokens/Token_customer.php
index 2f8d69e4f..a42217735 100644
--- a/app/Models/Tokens/Token_customer.php
+++ b/app/Models/Tokens/Token_customer.php
@@ -1,40 +1,50 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Libraries\Sale_lib;
+
+use app\Models\Customer;
 
 /**
  * Token_customer class
+ *
+ * @property sale_lib sale_lib
+ *
+ * @property customer customer
+ *
  */
-
 class Token_customer extends Token
 {
-
 	private $customer_info;
 
-	public function __construct($customer_info = '')
+	public function __construct(string $customer_info = '')
 	{
 		parent::__construct();
 		$this->customer_info = $customer_info;
-		$this->CI->load->library('sale_lib');
+		$this->sale_lib = new Sale_lib();
 	}
 
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'CU';
 	}
 
-	public function get_value()
+	public function get_value(): string
 	{
-		// substitute customer info
-		$customer_id = $this->CI->sale_lib->get_customer();
-		if($customer_id != -1 && empty($this->customer_info))
+		//substitute customer info
+		$customer_id = $this->sale_lib->get_customer();
+		if($customer_id != -1 && empty($this->customer_info))	//TODO: Replace -1 with a Constant
 		{
-			$customer_info = $this->CI->Customer->get_info($customer_id);
+			$customer = model(Customer::class);
+			$customer_info = $customer->get_info($customer_id);
+
 			if($customer_info != '')
 			{
 				return trim($customer_info->first_name . ' ' . $customer_info->last_name);
 			}
 		}
 
-		return $value;
+		return '';
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_invoice_count.php b/app/Models/Tokens/Token_invoice_count.php
index 0d96b4ddf..5d74a269a 100644
--- a/app/Models/Tokens/Token_invoice_count.php
+++ b/app/Models/Tokens/Token_invoice_count.php
@@ -1,26 +1,30 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Sale;
 
 /**
  * Token_invoice_count class
+ *
+ * @property sale sale
+ *
  */
-
 class Token_invoice_count extends Token
 {
-	public function __construct($value = '')
+	public function __construct(string $value = '')
 	{
 		parent::__construct($value);
-
-		$this->CI->load->model('Sale');
 	}
 
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'CO';
 	}
 
-	public function get_value()
+	public function get_value(): int
 	{
-		return empty($value) ? $this->CI->Sale->get_invoice_count() : $value;
+		$sale = model(Sale::class);
+		return empty($value) ? $sale->get_invoice_count() : $value;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_invoice_sequence.php b/app/Models/Tokens/Token_invoice_sequence.php
index cacfac1c6..0812e035a 100644
--- a/app/Models/Tokens/Token_invoice_sequence.php
+++ b/app/Models/Tokens/Token_invoice_sequence.php
@@ -1,25 +1,34 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Appconfig;
+use ReflectionException;
 
 /**
  * Token_invoice_sequence class
+ *
+ * @property appconfig appconfig
  */
 
 class Token_invoice_sequence extends Token
 {
-
-	public function __construct($value = '')
+	public function __construct(string $value = '')
 	{
 		parent::__construct($value);
+		$this->appconfig = model('Appconfig');
 	}
 
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'ISEQ';
 	}
 
-	public function get_value($save = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function get_value(): string
 	{
-		return $this->CI->Appconfig->acquire_next_invoice_sequence($save);
+		return $this->appconfig->acquire_save_next_invoice_sequence();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_quote_sequence.php b/app/Models/Tokens/Token_quote_sequence.php
index a712bf1be..741499745 100644
--- a/app/Models/Tokens/Token_quote_sequence.php
+++ b/app/Models/Tokens/Token_quote_sequence.php
@@ -1,19 +1,35 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Appconfig;
+use ReflectionException;
 
 /**
  * Token_quote_sequence class
+ *
+ * @property appconfig appconfig
+ *
  */
-
 class Token_quote_sequence extends Token
 {
-	public function token_id()
+	public function __construct()
+	{
+		parent::__construct();
+		$this->appconfig = model('AppConfig');
+
+	}
+
+	public function token_id(): string
 	{
 		return 'QSEQ';
 	}
 
-	public function get_value($save = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function get_value(): string
 	{
-		return $this->CI->Appconfig->acquire_next_quote_sequence($save);
+		return $this->appconfig->acquire_save_next_quote_sequence();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_suspended_invoice_count.php b/app/Models/Tokens/Token_suspended_invoice_count.php
index 039e295f9..b6bf7c4f5 100644
--- a/app/Models/Tokens/Token_suspended_invoice_count.php
+++ b/app/Models/Tokens/Token_suspended_invoice_count.php
@@ -1,26 +1,30 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Sale;
 
 /**
  * Token_suspended_invoice_count class
+ *
+ * @property sale sale
+ *
  */
-
 class Token_suspended_invoice_count extends Token
 {
 	public function __construct()
 	{
 		parent::__construct();
-
-		$this->CI->load->model('Sale');
 	}
 
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'SCO';
 	}
 
-	public function get_value()
+	public function get_value(): int
 	{
-		return $this->CI->Sale->get_suspended_invoice_count();
+		$sale = model(Sale::class);
+		return $sale->get_suspended_invoice_count();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_work_order_sequence.php b/app/Models/Tokens/Token_work_order_sequence.php
index 69c2a0400..9b134ca0d 100644
--- a/app/Models/Tokens/Token_work_order_sequence.php
+++ b/app/Models/Tokens/Token_work_order_sequence.php
@@ -1,19 +1,34 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Appconfig;
+use ReflectionException;
 
 /**
  * Token_work_order_sequence class
+ *
+ * @property appconfig appconfig
+ *
  */
-
 class Token_work_order_sequence extends Token
 {
-	public function token_id()
+	public function __construct($value = '')
+	{
+		parent::__construct($value);
+		$this->appconfig = model('AppConfig');
+	}
+
+	public function token_id(): string
 	{
 		return 'WSEQ';
 	}
 
-	public function get_value($save = TRUE)
+	/**
+	 * @throws ReflectionException
+	 */
+	public function get_value(): string
 	{
-		return $this->CI->Appconfig->acquire_next_work_order_sequence($save);
+		return $this->appconfig->acquire_save_next_work_order_sequence();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_year_invoice_count.php b/app/Models/Tokens/Token_year_invoice_count.php
index 554971077..2051ac494 100644
--- a/app/Models/Tokens/Token_year_invoice_count.php
+++ b/app/Models/Tokens/Token_year_invoice_count.php
@@ -1,26 +1,25 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Sale;
 
 /**
  * Token_year_invoice_count class
+ *
+ * @property sale sale
+ *
  */
-
 class Token_year_invoice_count extends Token
 {
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->CI->load->model('Sale');
-	}
-
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'YCO';
 	}
 
-	public function get_value()
+	public function get_value(): int
 	{
-		return $this->CI->Sale->get_invoice_number_for_year();
+		$sale = model(Sale::class);
+		return $sale->get_invoice_number_for_year();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/Tokens/Token_year_quote_count.php b/app/Models/Tokens/Token_year_quote_count.php
index 18dce939a..e181c2749 100644
--- a/app/Models/Tokens/Token_year_quote_count.php
+++ b/app/Models/Tokens/Token_year_quote_count.php
@@ -1,26 +1,25 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+namespace App\Models\Tokens;
+
+use app\Models\Sale;
 
 /**
  * Token_year_quote_count class
+ *
+ * @property sale sale
+ *
  */
-
 class Token_year_quote_count extends Token
 {
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->CI->load->model('Sale');
-	}
-
-	public function token_id()
+	public function token_id(): string
 	{
 		return 'QCO';
 	}
 
-	public function get_value()
+	public function get_value(): int
 	{
-		return $this->CI->Sale->get_quote_number_for_year();
+		$sale = model(Sale::class);
+		return $sale->get_quote_number_for_year();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/app/Models/index.html b/app/Models/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Models/index.html
+++ b/app/Models/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/application/cache/index.html b/app/ThirdParty/index.html
similarity index 87%
rename from application/cache/index.html
rename to app/ThirdParty/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/cache/index.html
+++ b/app/ThirdParty/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/attributes/form.php b/app/Views/attributes/form.php
index c36266a74..5bcd0ab87 100644
--- a/app/Views/attributes/form.php
+++ b/app/Views/attributes/form.php
@@ -1,59 +1,93 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var string $definition_id
+ * @var object $definition_info
+ * @var array $definition_group
+ * @var array $definition_flags
+ * @var array $selected_definition_flags
+ * @var string $controller_name
+ * @var array $definition_values
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('attributes/save_definition/'.$definition_id, array('id'=>'attribute_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('attributes/save_definition/' . esc($definition_id, 'attr'), ['id' => 'attribute_form', 'class' => 'form-horizontal']) //TODO: String Interpolation?>
 <fieldset id="attribute_basic_info">
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('attributes_definition_name'), 'definition_name', array('class'=>'required control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_name'), 'definition_name', ['class' => 'required control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
-			<?php echo form_input(array(
-					'name'=>'definition_name',
+			<?php echo form_input ([
+					'name' => 'definition_name',
 					'id' => 'definition_name',
-					'class'=>'form-control input-sm',
-					'value'=>$definition_info->definition_name)
-			);?>
+					'class' => 'form-control input-sm',
+					'value'=>esc($definition_info->definition_name, 'attr')
+				]
+			) ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('attributes_definition_type'), 'definition_type', array('class'=>'required control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_type'), 'definition_type', ['class' => 'required control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
-			<?php echo form_dropdown('definition_type', DEFINITION_TYPES, array_search($definition_info->definition_type, DEFINITION_TYPES), 'id="definition_type" class="form-control"');?>
+			<?php echo form_dropdown('definition_type', DEFINITION_TYPES, esc(array_search($definition_info->definition_type, DEFINITION_TYPES)), 'id="definition_type" class="form-control"') ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('attributes_definition_group'), 'definition_group', array('class' => 'control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_group'), 'definition_group', ['class' => 'control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
-			<?php echo form_dropdown('definition_group', $definition_group, $definition_info->definition_fk, 'id="definition_group" class="form-control" ' . (empty($definition_group) ? 'disabled="disabled"' : ''));?>
+			<?php echo form_dropdown(
+				'definition_group',
+				esc($definition_group, 'attr'),
+				esc($definition_info->definition_fk, 'attr'),
+				'id="definition_group" class="form-control" ' . (empty($definition_group) ? 'disabled="disabled"' : '')
+			) ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm hidden">
-		<?php echo form_label($this->lang->line('attributes_definition_flags'), 'definition_flags', array('class' => 'control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_flags'), 'definition_flags', ['class' => 'control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
 			<div class="input-group">
-				<?php echo form_multiselect('definition_flags[]', $definition_flags, array_keys($selected_definition_flags), array('id'=>'definition_flags', 'class'=>'selectpicker show-menu-arrow', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+				<?php echo form_multiselect(
+					'definition_flags[]',
+					esc($definition_flags, 'attr'),
+					esc(array_keys($selected_definition_flags), 'attr'),
+					[
+						'id' => 'definition_flags',
+						'class' => 'selectpicker show-menu-arrow',
+						'data-none-selected-text'=>lang('Common.none_selected_text'),
+						'data-selected-text-format' => 'count > 1',
+						'data-style' => 'btn-default btn-sm',
+						'data-width' => 'fit'
+					]
+				) ?>
 			</div>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm hidden">
-		<?php echo form_label($this->lang->line('attributes_definition_unit'), 'definition_units', array('class' => 'control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_unit'), 'definition_units', ['class' => 'control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
 			<div class="input-group">
-				<?php echo form_input(array('name'=>'definition_unit', 'value'=>$definition_info->definition_unit,'class'=>'form-control input-sm', 'id' => 'definition_unit'));?>
+				<?php echo form_input ([
+					'name' => 'definition_unit',
+					'value' => esc($definition_info->definition_unit, 'attr'),
+					'class' => 'form-control input-sm',
+					'id' => 'definition_unit'
+				]) ?>
 			</div>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm hidden">
-		<?php echo form_label($this->lang->line('attributes_definition_values'), 'definition_value', array('class' => 'control-label col-xs-3')); ?>
+		<?php echo form_label(lang('Attributes.definition_values'), 'definition_value', ['class' => 'control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
 			<div class="input-group">
-				<?php echo form_input(array('name'=>'definition_value', 'class'=>'form-control input-sm', 'id' => 'definition_value'));?>
+				<?php echo form_input (['name' => 'definition_value', 'class' => 'form-control input-sm', 'id' => 'definition_value']) ?>
 				<span id="add_attribute_value" class="input-group-addon input-sm btn btn-default">
 					<span class="glyphicon glyphicon-plus-sign"></span>
 				</span>
@@ -62,21 +96,21 @@
 	</div>
 
 	<div class="form-group form-group-sm hidden">
-		<?php echo form_label('&nbsp', 'definition_list_group', array('class' => 'control-label col-xs-3')); ?>
+		<?php echo form_label('&nbsp', 'definition_list_group', ['class' => 'control-label col-xs-3']) ?>
 		<div class='col-xs-8'>
 			<ul id="definition_list_group" class="list-group"></ul>
 		</div>
 	</div>
 
 </fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
 {
 	var values = [];
-	var definition_id = <?php echo $definition_id; ?>;
+	var definition_id = <?php echo esc($definition_id, 'js') ?>;
 	var is_new = definition_id == 0;
 
 	var disable_definition_types = function()
@@ -147,7 +181,7 @@ $(document).ready(function()
 		}
 		else
 		{
-			$.post('<?php echo site_url($controller_name . "/delete_attribute_value/");?>', {definition_id: definition_id, attribute_value: value});
+			$.post('<?php echo esc(site_url("$controller_name/delete_attribute_value/"), 'url') ?>', {definition_id: definition_id, attribute_value: value});
 		}
 		$(this).parents("li").remove();
 	};
@@ -176,7 +210,7 @@ $(document).ready(function()
 			}
 			else
 			{
-				$.post('<?php echo site_url("attributes/save_attribute_value/");?>', {definition_id: definition_id, attribute_value: value});
+				$.post('<?php echo site_url("attributes/save_attribute_value/") ?>', {definition_id: definition_id, attribute_value: value});
 			}
 		}
 
@@ -194,14 +228,14 @@ $(document).ready(function()
 		}
 	});
 
-	var definition_values = <?php echo json_encode(array_values($definition_values)) ?>;
+	var definition_values = <?php echo json_encode(array_values(esc($definition_values))) ?>;
 	$.each(definition_values, function(index, element) {
 		add_attribute_value(element);
 	});
 
 	$.validator.addMethod('valid_chars', function(value, element) {
         return value.match(/(\||_)/g) == null;
-	}, "<?php echo $this->lang->line('attributes_attribute_value_invalid_chars'); ?>");
+	}, "<?php echo lang('Attributes.attribute_value_invalid_chars') ?>");
 
 	$('form').bind('submit', function () {
 		$(this).find(':input').prop('disabled', false);
@@ -222,7 +256,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit('<?php echo site_url($controller_name); ?>', response);
+					table_support.handle_submit('<?php echo esc(site_url($controller_name), 'url') ?>', response);
 				},
 				dataType: 'json'
 			});
@@ -235,8 +269,8 @@ $(document).ready(function()
 		},
         messages:
         {
-            definition_name: "<?php echo $this->lang->line('attributes_definition_name_required'); ?>",
-            definition_type: "<?php echo $this->lang->line('attributes_definition_type_required'); ?>"
+            definition_name: "<?php echo lang('Attributes.definition_name_required') ?>",
+            definition_type: "<?php echo lang('Attributes.definition_type_required') ?>"
         }
 	}, form_support.error));
 });
diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php
index 9919d4a4e..b4470e8d8 100644
--- a/app/Views/attributes/item.php
+++ b/app/Views/attributes/item.php
@@ -1,7 +1,14 @@
+<?php
+/**
+ * @var array $definition_names
+ * @var array $definition_values
+ * @var int $item_id
+ */
+?>
 <div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line("attributes_definition_name"), "definition_name_label", array('class' => 'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Attributes.definition_name'), 'definition_name_label', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_dropdown('definition_name', $definition_names, -1, array('id' => 'definition_name', 'class' => 'form-control')); ?>
+		<?php echo form_dropdown('definition_name', esc($definition_names, 'attr'), -1, ['id' => 'definition_name', 'class' => 'form-control']) ?>
 	</div>
 
 </div>
@@ -12,58 +19,59 @@ foreach($definition_values as $definition_id => $definition_value)
 ?>
 
 <div class="form-group form-group-sm">
-	<?php echo form_label($definition_value['definition_name'], $definition_value['definition_name'], array('class' => 'control-label col-xs-3')); ?>
+	<?php echo form_label(esc($definition_value['definition_name']), esc($definition_value['definition_name'], 'attr'), ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
 		<div class="input-group">
 			<?php
-				echo form_hidden("attribute_ids[$definition_id]", $definition_value['attribute_id']);
+				echo form_hidden(esc("attribute_ids[$definition_id]", 'attr'), esc($definition_value['attribute_id'], 'attr'));
 				$attribute_value = $definition_value['attribute_value'];
 
 				if ($definition_value['definition_type'] == DATE)
 				{
 					$value = (empty($attribute_value) || empty($attribute_value->attribute_date)) ? NOW : strtotime($attribute_value->attribute_date);
-					echo form_input(array(
-						'name' => "attribute_links[$definition_id]",
+					echo form_input ([
+						'name' => esc("attribute_links[$definition_id]", 'attr'),
 						'value' => to_date($value),
 						'class' => 'form-control input-sm datetime',
 						'data-definition-id' => $definition_id,
-						'readonly' => 'true'));
+						'readonly' => 'true'
+					]);
 				}
-				else if ($definition_value['definition_type'] == DROPDOWN)
+				else if ($definition_value['definition_type'] == DROPDOWN)	//TODO: === ?
 				{
 					$selected_value = $definition_value['selected_value'];
-					echo form_dropdown("attribute_links[$definition_id]", $definition_value['values'], $selected_value, "class='form-control' data-definition-id='$definition_id'");
+					echo form_dropdown(esc("attribute_links[$definition_id]", 'attr'), esc($definition_value['values'], 'attr'), esc($selected_value, 'attr'), "class='form-control' data-definition-id='$definition_id'");
 				}
-				else if ($definition_value['definition_type'] == TEXT)
+				else if ($definition_value['definition_type'] == TEXT)	//TODO: === ?
 				{
 					$value = (empty($attribute_value) || empty($attribute_value->attribute_value)) ? $definition_value['selected_value'] : $attribute_value->attribute_value;
-					echo form_input("attribute_links[$definition_id]", $value, "class='form-control valid_chars' data-definition-id='$definition_id'");
+					echo form_input(esc("attribute_links[$definition_id]"), esc($value, 'attr'), "class='form-control valid_chars' data-definition-id='$definition_id'");
 				}
-				else if ($definition_value['definition_type'] == DECIMAL)
+				else if ($definition_value['definition_type'] == DECIMAL)	//TODO: === ?
 				{
 					$value = (empty($attribute_value) || empty($attribute_value->attribute_decimal)) ? $definition_value['selected_value'] : $attribute_value->attribute_decimal;
-					echo form_input("attribute_links[$definition_id]", $value, "class='form-control valid_chars' data-definition-id='$definition_id'");
+					echo form_input(esc("attribute_links[$definition_id]"), esc($value, 'attr'), "class='form-control valid_chars' data-definition-id='$definition_id'");
 				}
-				else if ($definition_value['definition_type'] == CHECKBOX)
+				else if ($definition_value['definition_type'] == CHECKBOX)	//TODO: === ?
 				{
 					$value = (empty($attribute_value) || empty($attribute_value->attribute_value)) ? $definition_value['selected_value'] : $attribute_value->attribute_value;
 
 				//Sends 0 if the box is unchecked instead of not sending anything.
-					echo form_input(array(
+					echo form_input ([
 						'type' => 'hidden',
-						'name' => "attribute_links[$definition_id]",
+						'name' => esc("attribute_links[$definition_id]", 'attr'),
 						'id' => "attribute_links[$definition_id]",
 						'value' => 0,
 						'data-definition-id' => $definition_id
-					));
-					echo form_checkbox(array(
-						'name' => "attribute_links[$definition_id]",
+					]);
+					echo form_checkbox ([
+						'name' => esc("attribute_links[$definition_id]", 'attr'),
 						'id' => "attribute_links[$definition_id]",
 						'value' => 1,
 						'checked' => ($value ? 1 : 0),
 						'class' => 'checkbox-inline',
 						'data-definition-id' => $definition_id
-					));
+					]);
 				}
 			?>
 			<span class="input-group-addon input-sm btn btn-default remove_attribute_btn"><span class="glyphicon glyphicon-trash"></span></span>
@@ -77,7 +85,7 @@ foreach($definition_values as $definition_id => $definition_value)
 
 <script type="text/javascript">
 (function() {
-		<?php $this->load->view('partial/datepicker_locale', array('config' => '{ minView: 2, format: "'.dateformat_bootstrap($this->config->item('dateformat') . '"}'))); ?>
+		<?php echo view('partial/datepicker_locale', ['config' => '{ minView: 2, format: "'.dateformat_bootstrap(config('OSPOS')->dateformat . '"}')]) ?>
 
 		var enable_delete = function() {
 			$('.remove_attribute_btn').click(function() {
@@ -92,7 +100,7 @@ foreach($definition_values as $definition_id => $definition_value)
 			$("input[name='attribute_ids[" + definition_id + "]']").val('');
 		}).autocomplete({
 			source: function(request, response) {
-				$.get('<?php echo site_url('attributes/suggest_attribute/');?>' + this.element.data('definition-id') + '?term=' + request.term, function(data) {
+				$.get('<?php echo site_url('attributes/suggest_attribute/') ?>' + this.element.data('definition-id') + '?term=' + request.term, function(data) {
 					return response(data);
 				}, 'json');
 			},
@@ -117,7 +125,7 @@ foreach($definition_values as $definition_id => $definition_value)
 			var definition_id = $("#definition_name option:selected").val();
 			var attribute_values = definition_values();
 			attribute_values[definition_id] = '';
-			$('#attributes').load('<?php echo site_url("items/attributes/$item_id");?>', {
+			$('#attributes').load('<?php echo esc(site_url("items/attributes/$item_id"), 'url') ?>', {
 				'definition_ids': JSON.stringify(attribute_values)
 			}, enable_delete);
 		};
diff --git a/app/Views/attributes/manage.php b/app/Views/attributes/manage.php
index d36f32bda..f9223099e 100644
--- a/app/Views/attributes/manage.php
+++ b/app/Views/attributes/manage.php
@@ -1,14 +1,21 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+	echo view('partial/header')
+
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ */
+?>
 
 <script type="text/javascript">
 	$(document).ready(function()
 	{
-		<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+		<?php echo view('partial/bootstrap_tables_locale') ?>
 
 		table_support.init({
-			resource: '<?php echo site_url($controller_name);?>',
-			headers: <?php echo $table_headers; ?>,
-			pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+			resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+			headers: <?php echo esc($table_headers, 'js') ?>,
+			pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 			uniqueId: 'definition_id'
 		});
 	});
@@ -16,16 +23,16 @@
 
 <div id="title_bar" class="btn-toolbar print_hide">
 
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-	        title='<?php echo $this->lang->line($controller_name . '_new'); ?>'>
-		<span class="glyphicon glyphicon-star">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url($controller_name."/view"), 'url') ?>'
+	        title='<?php echo lang($controller_name . '.new') ?>'>
+		<span class="glyphicon glyphicon-star">&nbsp</span><?php echo lang($controller_name . '.new') ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
 		<button id="delete" class="btn btn-default btn-sm print_hide">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete"); ?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 	</div>
 </div>
@@ -34,4 +41,4 @@
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/barcodes/barcode_sheet.php b/app/Views/barcodes/barcode_sheet.php
index 399162570..74bf6c186 100644
--- a/app/Views/barcodes/barcode_sheet.php
+++ b/app/Views/barcodes/barcode_sheet.php
@@ -1,16 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?php
+/**
+ * @var array $barcode_config
+ * @var array $items
+ */
+?>
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo $this->request->getLocale() ?>">
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title><?php echo $this->lang->line('items_generate_barcodes'); ?></title>
-	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/barcode_font.css" />
+	<title><?php echo lang('Items.generate_barcodes') ?></title>
+	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url() ?>css/barcode_font.css" />
 </head>
 
-<body class=<?php echo "font_".$this->barcode_lib->get_font_name($barcode_config['barcode_font']); ?> 
-      style="font-size:<?php echo $barcode_config['barcode_font_size']; ?>px">
-	<table cellspacing=<?php echo $barcode_config['barcode_page_cellspacing']; ?> width='<?php echo $barcode_config['barcode_page_width']."%"; ?>' >
+<body class=<?php echo "font_".$this->barcode_lib->get_font_name($barcode_config['barcode_font']) ?>
+      style="font-size:<?php echo $barcode_config['barcode_font_size'] ?>px">
+	<table cellspacing=<?php echo $barcode_config['barcode_page_cellspacing'] ?> width='<?php echo $barcode_config['barcode_page_width']."%" ?>' >
 		<tr>
 			<?php
 			$count = 0;
diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php
index 734afb8b3..3d90d93af 100644
--- a/app/Views/cashups/form.php
+++ b/app/Views/cashups/form.php
@@ -1,220 +1,230 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $cash_ups_info
+ * @var array $employees
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('cashups/save/'.$cash_ups_info->cashup_id, array('id'=>'cashups_edit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open(esc('cashups/save/'.$cash_ups_info->cashup_id, 'attr'), ['id' => 'cashups_edit_form', 'class' => 'form-horizontal']) //TODO: String Interpolation ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_info'), 'cash_ups_info', array('class'=>'control-label col-xs-3')); ?>
-			<?php echo form_label(!empty($cash_ups_info->cashup_id) ? $this->lang->line('cashups_id') . ' ' . $cash_ups_info->cashup_id : '', 'cashup_id', array('class'=>'control-label col-xs-8', 'style'=>'text-align:left')); ?>
+			<?php echo form_label(lang('Cashups.info'), 'cash_ups_info', ['class' => 'control-label col-xs-3']) ?>
+			<?php echo form_label(!empty($cash_ups_info->cashup_id) ? lang('Cashups.id') . ' ' . $cash_ups_info->cashup_id : '', 'cashup_id', ['class' => 'control-label col-xs-8', 'style' => 'text-align:left']) ?>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_open_date'), 'open_date', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.open_date'), 'open_date', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
-					<?php echo form_input(array(
-							'name'=>'open_date',
-							'id'=>'open_date',
-							'class'=>'form-control input-sm datepicker',
-							'value'=>to_datetime(strtotime($cash_ups_info->open_date)))
-							);?>
+					<?php echo form_input ([
+							'name' => 'open_date',
+							'id' => 'open_date',
+							'class' => 'form-control input-sm datepicker',
+							'value'=>to_datetime(strtotime($cash_ups_info->open_date))]
+							) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_open_employee'), 'open_employee', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.open_employee'), 'open_employee', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('open_employee_id', $employees, $cash_ups_info->open_employee_id, 'id="open_employee_id" class="form-control"');?>
+				<?php echo form_dropdown('open_employee_id', esc($employees, 'attr'), $cash_ups_info->open_employee_id, 'id="open_employee_id" class="form-control"') ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_open_amount_cash'), 'open_amount_cash', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.open_amount_cash'), 'open_amount_cash', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'open_amount_cash',
-							'id'=>'open_amount_cash',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->open_amount_cash))
-							);?>
+					<?php echo form_input ([
+						'name' => 'open_amount_cash',
+						'id' => 'open_amount_cash',
+						'class' => 'form-control input-sm',
+						'value' => to_currency_no_money($cash_ups_info->open_amount_cash)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_transfer_amount_cash'), 'transfer_amount_cash', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.transfer_amount_cash'), 'transfer_amount_cash', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'transfer_amount_cash',
-							'id'=>'transfer_amount_cash',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->transfer_amount_cash))
-							);?>
+					<?php echo form_input ([
+							'name' => 'transfer_amount_cash',
+							'id' => 'transfer_amount_cash',
+							'class' => 'form-control input-sm',
+							'value'=>to_currency_no_money($cash_ups_info->transfer_amount_cash)
+						])
+					?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_close_date'), 'close_date', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.close_date'), 'close_date', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
-					<?php echo form_input(array(
-							'name'=>'close_date',
-							'id'=>'close_date',
-							'class'=>'form-control input-sm datepicker',
-							'value'=>to_datetime(strtotime($cash_ups_info->close_date)))
-							);?>
+					<?php echo form_input ([
+							'name' => 'close_date',
+							'id' => 'close_date',
+							'class' => 'form-control input-sm datepicker',
+							'value'=>to_datetime(strtotime($cash_ups_info->close_date))]
+							) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_close_employee'), 'close_employee', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.close_employee'), 'close_employee', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('close_employee_id', $employees, $cash_ups_info->close_employee_id, 'id="close_employee_id" class="form-control"');?>
+				<?php echo form_dropdown('close_employee_id', esc($employees, 'attr'), $cash_ups_info->close_employee_id, 'id="close_employee_id" class="form-control"') ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_closed_amount_cash'), 'closed_amount_cash', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.closed_amount_cash'), 'closed_amount_cash', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'closed_amount_cash',
-							'id'=>'closed_amount_cash',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->closed_amount_cash))
-							);?>
+					<?php echo form_input ([
+							'name' => 'closed_amount_cash',
+							'id' => 'closed_amount_cash',
+							'class' => 'form-control input-sm',
+							'value'=>to_currency_no_money($cash_ups_info->closed_amount_cash)]
+							) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_note'), 'note', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.note'), 'note', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_checkbox(array(
-					'name'=>'note',
-					'id'=>'note',
+				<?php echo form_checkbox ([
+					'name' => 'note',
+					'id' => 'note',
 					'value'=>0,
-					'checked'=>($cash_ups_info->note) ? 1 : 0)
-				);?>
+					'checked'=>($cash_ups_info->note) ? 1 : 0]
+				) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_closed_amount_due'), 'closed_amount_due', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.closed_amount_due'), 'closed_amount_due', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'closed_amount_due',
-							'id'=>'closed_amount_due',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->closed_amount_due))
-							);?>
+					<?php echo form_input ([
+							'name' => 'closed_amount_due',
+							'id' => 'closed_amount_due',
+							'class' => 'form-control input-sm',
+							'value'=>to_currency_no_money($cash_ups_info->closed_amount_due)]
+							) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_closed_amount_card'), 'closed_amount_card', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.closed_amount_card'), 'closed_amount_card', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'closed_amount_card',
-							'id'=>'closed_amount_card',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->closed_amount_card))
-							);?>
+					<?php echo form_input ([
+							'name' => 'closed_amount_card',
+							'id' => 'closed_amount_card',
+							'class' => 'form-control input-sm',
+							'value'=>to_currency_no_money($cash_ups_info->closed_amount_card)]
+							) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_closed_amount_check'), 'closed_amount_check', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.closed_amount_check'), 'closed_amount_check', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'closed_amount_check',
-							'id'=>'closed_amount_check',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($cash_ups_info->closed_amount_check))
-							);?>
+					<?php echo form_input ([
+							'name' => 'closed_amount_check',
+							'id' => 'closed_amount_check',
+							'class' => 'form-control input-sm',
+							'value'=>to_currency_no_money($cash_ups_info->closed_amount_check)]
+							) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_closed_amount_total'), 'closed_amount_total', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.closed_amount_total'), 'closed_amount_total', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'closed_amount_total',
-							'id'=>'closed_amount_total',
-							'readonly'=>'true',
-							'class'=>'form-control input-sm',
+					<?php echo form_input ([
+							'name' => 'closed_amount_total',
+							'id' => 'closed_amount_total',
+							'readonly' => 'true',
+							'class' => 'form-control input-sm',
 							'value'=>to_currency_no_money($cash_ups_info->closed_amount_total)
-							));?>
+						]
+					) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('cashups_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Cashups.description'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_textarea(array(
-					'name'=>'description',
-					'id'=>'description',
-					'class'=>'form-control input-sm',
-					'value'=>$cash_ups_info->description)
-					);?>
+				<?php echo form_textarea ([
+					'name' => 'description',
+					'id' => 'description',
+					'class' => 'form-control input-sm',
+					'value'=>esc($cash_ups_info->description)
+					]
+				) ?>
 			</div>
 		</div>
 
@@ -223,35 +233,35 @@
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('cashups_is_deleted').':', 'deleted', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Cashups.is_deleted').':', 'deleted', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-5'>
-					<?php echo form_checkbox(array(
-						'name'=>'deleted',
-						'id'=>'deleted',
+					<?php echo form_checkbox ([
+						'name' => 'deleted',
+						'id' => 'deleted',
 						'value'=>1,
-						'checked'=>($cash_ups_info->deleted) ? 1 : 0)
-					);?>
+						'checked'=>($cash_ups_info->deleted) ? 1 : 0]
+					) ?>
 				</div>
 			</div>
 		<?php
 		}
 		?>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type='text/javascript'>
 //validation and submit handling
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/datepicker_locale'); ?>
+	<?php echo view('partial/datepicker_locale') ?>
 
 	$('#open_date').datetimepicker({
-		format: "<?php echo dateformat_bootstrap($this->config->item('dateformat')) . ' ' . dateformat_bootstrap($this->config->item('timeformat'));?>",
-		startDate: "<?php echo date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), mktime(0, 0, 0, 1, 1, 2010));?>",
+		format: "<?php echo dateformat_bootstrap(config('OSPOS')->dateformat) . ' ' . dateformat_bootstrap(config('OSPOS')->timeformat) ?>",
+		startDate: "<?php echo date(config('OSPOS')->dateformat . ' ' . esc(config('OSPOS')->timeformat, 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
 		<?php
-		$t = $this->config->item('timeformat');
+		$t = config('OSPOS')->timeformat;
 		$m = $t[strlen($t)-1];
-		if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false )
+		if( strpos(config('OSPOS')->timeformat, 'a') !== false || strpos(config('OSPOS')->timeformat, 'A') !== false )
 		{
 		?>
 			showMeridian: true,
@@ -269,16 +279,16 @@ $(document).ready(function()
 		todayBtn: true,
 		todayHighlight: true,
 		bootcssVer: 3,
-		language: '<?php echo current_language_code(); ?>'
+		language: '<?php echo current_language_code() ?>'
 	});
 
 	$('#close_date').datetimepicker({
-		format: "<?php echo dateformat_bootstrap($this->config->item('dateformat')) . ' ' . dateformat_bootstrap($this->config->item('timeformat'));?>",
-		startDate: "<?php echo date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), mktime(0, 0, 0, 1, 1, 2010));?>",
+		format: "<?php echo dateformat_bootstrap(config('OSPOS')->dateformat) . ' ' . dateformat_bootstrap(config('OSPOS')->timeformat) ?>",
+		startDate: "<?php echo date(config('OSPOS')->dateformat . ' ' . esc(config('OSPOS')->timeformat, 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
 		<?php
-		$t = $this->config->item('timeformat');
+		$t = config('OSPOS')->timeformat;
 		$m = $t[strlen($t)-1];
-		if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false )
+		if( strpos(config('OSPOS')->timeformat, 'a') !== false || strpos(config('OSPOS')->timeformat, 'A') !== false )
 		{
 		?>
 			showMeridian: true,
@@ -296,11 +306,11 @@ $(document).ready(function()
 		todayBtn: true,
 		todayHighlight: true,
 		bootcssVer: 3,
-		language: '<?php echo current_language_code(); ?>'
+		language: '<?php echo current_language_code() ?>'
 	});
 
 	$('#open_amount_cash, #transfer_amount_cash, #closed_amount_cash, #closed_amount_due, #closed_amount_card, #closed_amount_check').keyup(function() {
-		$.post("<?php echo site_url($controller_name . '/ajax_cashup_total')?>", {
+		$.post("<?php echo esc(site_url("$controller_name/ajax_cashup_total"), 'url') ?>", {
 				'open_amount_cash': $('#open_amount_cash').val(),
 				'transfer_amount_cash': $('#transfer_amount_cash').val(),
 				'closed_amount_due': $('#closed_amount_due').val(),
@@ -322,7 +332,7 @@ $(document).ready(function()
 			success: function(response)
 			{
 				dialog_support.hide();
-				table_support.handle_submit('<?php echo site_url('cashups'); ?>', response);
+				table_support.handle_submit('<?php echo esc(site_url('cashups'), 'url') ?>', response);
 			},
 			dataType: 'json'
 		});
@@ -342,18 +352,18 @@ $(document).ready(function()
 		{
 			open_date:
 			{
-				required: '<?php echo $this->lang->line('cashups_date_required'); ?>'
+				required: '<?php echo lang('Cashups.date_required') ?>'
 
 			},
 			close_date:
 			{
-				required: '<?php echo $this->lang->line('cashups_date_required'); ?>'
+				required: '<?php echo lang('Cashups.date_required') ?>'
 
 			},
 			amount:
 			{
-				required: '<?php echo $this->lang->line('cashups_amount_required'); ?>',
-				number: '<?php echo $this->lang->line('cashups_amount_number'); ?>'
+				required: '<?php echo lang('Cashups.amount_required') ?>',
+				number: '<?php echo lang('Cashups.amount_number') ?>'
 			}
 		}
 	}, form_support.error));
diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php
index 0cb3f7a7a..98c80b816 100644
--- a/app/Views/cashups/manage.php
+++ b/app/Views/cashups/manage.php
@@ -1,4 +1,11 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ * @var array $filters
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -9,18 +16,18 @@ $(document).ready(function()
 	});
 
 	// load the preset datarange picker
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
 		table_support.refresh();
 	});
 
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers, 'js') ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'cashup_id',
 		queryParams: function() {
 			return $.extend(arguments[0], {
@@ -33,26 +40,33 @@ $(document).ready(function()
 });
 </script>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'takings_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale'=>false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
 	<button onclick="javascript:printdoc()" class='btn btn-info btn-sm pull-right'>
-		<span class="glyphicon glyphicon-print">&nbsp;</span><?php echo $this->lang->line('common_print'); ?>
+		<span class="glyphicon glyphicon-print">&nbsp;</span><?php echo lang('Common.print') ?>
 	</button>
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
-		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo site_url($controller_name."/view") //TODO: String Interpolation ?>'
+			title='<?php echo lang(esc($controller_name, 'attr') . '.new') //TODO: String Interpolation?>'>
+		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo lang(esc($controller_name) . '.new') //TODO: String Interpolation ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
 		<button id="delete" class="btn btn-default btn-sm print_hide">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 
-		<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
-		<?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+		<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
+		<?php echo form_multiselect('filters[]', esc($filters, 'attr'), [''], [
+			'id' => 'filters',
+			'data-none-selected-text'=>lang('Common.none_selected_text'),
+			'class' => 'selectpicker show-menu-arrow',
+			'data-selected-text-format' => 'count > 1',
+			'data-style' => 'btn-default btn-sm',
+			'data-width' => 'fit'
+		]) ?>
 	</div>
 </div>
 
@@ -60,4 +74,4 @@ $(document).ready(function()
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php
index 0ae5710f5..68e1847ef 100644
--- a/app/Views/configs/barcode_config.php
+++ b/app/Views/configs/barcode_config.php
@@ -1,20 +1,25 @@
-<?php echo form_open('config/save_barcode/', array('id' => 'barcode_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $support_barcode
+ */
+?>
+<?php echo form_open('config/save_barcode/', ['id' => 'barcode_config_form', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="barcode_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_type'), 'barcode_type', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.barcode_type'), 'barcode_type', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('barcode_type', $support_barcode, $this->config->item('barcode_type'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('barcode_type', esc($support_barcode, 'attr'), esc(config('OSPOS')->barcode_type, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_width'), 'barcode_width', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.barcode_width'), 'barcode_width', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'step' => '5',
 						'max' => '350',
 						'min' => '60',
@@ -22,195 +27,203 @@
 						'name' => 'barcode_width',
 						'id' => 'barcode_width',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('barcode_width'))); ?>
+						'value' => config('OSPOS')->barcode_width]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_height'), 'barcode_height', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.barcode_height'), 'barcode_height', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'type' => 'number',
 						'min' => 10,
 						'max' => 120,
 						'name' => 'barcode_height',
 						'id' => 'barcode_height',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('barcode_height'))); ?>
+						'value'=>config('OSPOS')->barcode_height
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_font'), 'barcode_font', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.barcode_font'), 'barcode_font', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-sm-2'>
-					<?php echo form_dropdown('barcode_font',
-						$this->barcode_lib->listfonts("fonts"),
-						$this->config->item('barcode_font'), array('class' => 'form-control input-sm required'));
-						?>
+					<?php echo form_dropdown(
+						'barcode_font',
+						esc($this->barcode_lib->listfonts('fonts'), 'attr'),
+						esc(config('OSPOS')->barcode_font, 'attr'),
+						['class' => 'form-control input-sm required']
+					) ?>
 				</div>
 				<div class="col-sm-2">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'type' => 'number',
 						'min' => '1',
 						'max' => '30',
 						'name' => 'barcode_font_size',
 						'id' => 'barcode_font_size',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('barcode_font_size'))); ?>
+						'value' => config('OSPOS')->barcode_font_size
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_allow_duplicate_barcodes'), 'allow_duplicate_barcodes', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.allow_duplicate_barcodes'), 'allow_duplicate_barcodes', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'allow_duplicate_barcodes',
 						'id' => 'allow_duplicate_barcodes',
 						'value' => 'allow_duplicate_barcodes',
-						'checked' => $this->config->item('allow_duplicate_barcodes'))); ?>
+						'checked' => config('OSPOS')->allow_duplicate_barcodes]) ?>
 					&nbsp
 					<label class="control-label">
-						<span class="glyphicon glyphicon-warning-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_barcode_tooltip'); ?>"></span>
+						<span class="glyphicon glyphicon-warning-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.barcode_tooltip') ?>"></span>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_content'), 'barcode_content', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.barcode_content'), 'barcode_content', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-8'>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'barcode_content',
 							'value' => 'id',
-							'checked'=>$this->config->item('barcode_content') === "id")); ?>
-						<?php echo $this->lang->line('config_barcode_id'); ?>
+							'checked' => config('OSPOS')->barcode_content === "id"
+						]) ?>
+						<?php echo lang('Config.barcode_id') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'barcode_content',
 							'value' => 'number',
-							'checked'=>$this->config->item('barcode_content') === "number")); ?>
-						<?php echo $this->lang->line('config_barcode_number'); ?>
+							'checked' => config('OSPOS')->barcode_content === "number"]) ?>
+						<?php echo lang('Config.barcode_number') ?>
 					</label>
 					&nbsp
 					&nbsp
 					<label class="checkbox-inline">
-						<?php echo form_checkbox(array(
+						<?php echo form_checkbox ([
 							'name' => 'barcode_generate_if_empty',
 							'value' => 'barcode_generate_if_empty',
-							'checked'=>$this->config->item('barcode_generate_if_empty'))); ?>
-						<?php echo $this->lang->line('config_barcode_generate_if_empty'); ?>
+							'checked' => config('OSPOS')->barcode_generate_if_empty]) ?>
+						<?php echo lang('Config.barcode_generate_if_empty') ?>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_formats'), 'barcode_formats', array('class'=>'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.barcode_formats'), 'barcode_formats', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
 					<?php
-					$barcode_formats = json_decode($this->config->item('barcode_formats'));
-					echo form_dropdown(array(
+					$barcode_formats = json_decode(config('OSPOS')->barcode_formats);
+					echo form_dropdown ([
 						'name' => 'barcode_formats[]',
 						'id' => 'barcode_formats',
-						'options' => !empty($barcode_formats) ? array_combine($barcode_formats, $barcode_formats) : array(),
+						'options' => !empty($barcode_formats) ? esc(array_combine($barcode_formats, $barcode_formats), 'attr') : [],
 						'multiple' => 'multiple',
-						'data-role' => 'tagsinput'));?>
+						'data-role' => 'tagsinput']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_layout'), 'barcode_layout', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.barcode_layout'), 'barcode_layout', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_first_row').' '; ?></label>
+						<label class="control-label col-sm-1"><?php echo lang('Config.barcode_first_row').' ' ?></label>
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('barcode_first_row', array(
-								'not_show' => $this->lang->line('config_none'),
-								'name' => $this->lang->line('items_name'),
-								'category' => $this->lang->line('items_category'),
-								'cost_price' => $this->lang->line('items_cost_price'),
-								'unit_price' => $this->lang->line('items_unit_price'),
-								'company_name' => $this->lang->line('suppliers_company_name')
-							),
-							$this->config->item('barcode_first_row'), array('class' => 'form-control input-sm')); ?>
+							<?php echo form_dropdown(
+									'barcode_first_row', [
+										'not_show' => lang('Config.none'),
+										'name' => lang('Items.name'),
+										'category' => lang('Items.category'),
+										'cost_price' => lang('Items.cost_price'),
+										'unit_price' => lang('Items.unit_price'),
+										'company_name' => lang('Suppliers.company_name')
+									],
+								config('OSPOS')->barcode_first_row, ['class' => 'form-control input-sm']);
+							?>
 						</div>
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_second_row').' '; ?></label>
+						<label class="control-label col-sm-1"><?php echo lang('Config.barcode_second_row').' ' ?></label>
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('barcode_second_row', array(
-								'not_show' => $this->lang->line('config_none'),
-								'name' => $this->lang->line('items_name'),
-								'category' => $this->lang->line('items_category'),
-								'cost_price' => $this->lang->line('items_cost_price'),
-								'unit_price' => $this->lang->line('items_unit_price'),
-								'item_code' => $this->lang->line('items_item_number'),
-								'company_name' => $this->lang->line('suppliers_company_name')
-							),
-							$this->config->item('barcode_second_row'), array('class' => 'form-control input-sm')); ?>
+							<?php echo form_dropdown('barcode_second_row', [
+								'not_show' => lang('Config.none'),
+								'name' => lang('Items.name'),
+								'category' => lang('Items.category'),
+								'cost_price' => lang('Items.cost_price'),
+								'unit_price' => lang('Items.unit_price'),
+								'item_code' => lang('Items.item_number'),
+								'company_name' => lang('Suppliers.company_name')
+							],
+							config('OSPOS')->barcode_second_row, ['class' => 'form-control input-sm']) ?>
 						</div>
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_third_row').' '; ?></label>
+						<label class="control-label col-sm-1"><?php echo lang('Config.barcode_third_row').' ' ?></label>
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('barcode_third_row', array(
-								'not_show' => $this->lang->line('config_none'),
-								'name' => $this->lang->line('items_name'),
-								'category' => $this->lang->line('items_category'),
-								'cost_price' => $this->lang->line('items_cost_price'),
-								'unit_price' => $this->lang->line('items_unit_price'),
-								'item_code' => $this->lang->line('items_item_number'),
-								'company_name' => $this->lang->line('suppliers_company_name')
-							),
-							$this->config->item('barcode_third_row'), array('class' => 'form-control input-sm')); ?>
+							<?php echo form_dropdown('barcode_third_row', [
+								'not_show' => lang('Config.none'),
+								'name' => lang('Items.name'),
+								'category' => lang('Items.category'),
+								'cost_price' => lang('Items.cost_price'),
+								'unit_price' => lang('Items.unit_price'),
+								'item_code' => lang('Items.item_number'),
+								'company_name' => lang('Suppliers.company_name')
+							],
+							config('OSPOS')->barcode_third_row, ['class' => 'form-control input-sm']) ?>
 						</div>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_barcode_number_in_row'), 'barcode_num_in_row', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.barcode_number_in_row'), 'barcode_num_in_row', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'barcode_num_in_row',
 						'id' => 'barcode_num_in_row',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('barcode_num_in_row'))); ?>
+						'value' => config('OSPOS')->barcode_num_in_row
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('config_barcode_page_width'), 'barcode_page_width', array('class' => 'control-label col-xs-2 required')); ?>
+			<?php echo form_label(lang('Config.barcode_page_width'), 'barcode_page_width', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-sm-2">
 					<div class='input-group'>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'barcode_page_width',
 							'id' => 'barcode_page_width',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('barcode_page_width'))); ?>
+							'value' => config('OSPOS')->barcode_page_width]) ?>
 						<span class="input-group-addon input-sm">%</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('config_barcode_page_cellspacing'), 'barcode_page_cellspacing', array('class' => 'control-label col-xs-2 required')); ?>
+			<?php echo form_label(lang('Config.barcode_page_cellspacing'), 'barcode_page_cellspacing', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-sm-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'barcode_page_cellspacing',
 							'id' => 'barcode_page_cellspacing',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('barcode_page_cellspacing'))); ?>
+							'value' => config('OSPOS')->barcode_page_cellspacing]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_barcode',
 				'id' => 'submit_barcode',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
@@ -257,33 +270,33 @@ $(document).ready(function()
 		{
 			barcode_width:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_width_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_width_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_width_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_width_number') ?>"
 			},
 			barcode_height:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_height_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_height_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_height_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_height_number') ?>"
 			},
 			barcode_font_size:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_font_size_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_font_size_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_font_size_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_font_size_number') ?>"
 			},
 			barcode_num_in_row:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_num_in_row_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_num_in_row_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_num_in_row_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_num_in_row_number') ?>"
 			},
 			barcode_page_width:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_page_width_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_page_width_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_page_width_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_page_width_number') ?>"
 			},
 			barcode_page_cellspacing:
 			{
-				required:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_required'); ?>",
-				number:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_number'); ?>"
+				required:"<?php echo lang('Config.default_barcode_page_cellspacing_required') ?>",
+				number:"<?php echo lang('Config.default_barcode_page_cellspacing_number') ?>"
 			}
 		}
 	}));
diff --git a/app/Views/configs/email_config.php b/app/Views/configs/email_config.php
index 86f924cde..ee6b0634b 100644
--- a/app/Views/configs/email_config.php
+++ b/app/Views/configs/email_config.php
@@ -1,115 +1,122 @@
-<?php echo form_open('config/save_email/', array('id' => 'email_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php echo form_open('config/save_email/', ['id' => 'email_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="email_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_protocol'), 'protocol', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_protocol'), 'protocol', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('protocol', array(
-						'mail' => 'mail',
-						'sendmail' => 'sendmail',
-						'smtp' => 'smtp'
-					),
-					$this->config->item('protocol'), array('class' => 'form-control input-sm', 'id' => 'protocol'));
+					<?php echo form_dropdown(
+					'protocol', [
+							'mail' => 'mail',
+							'sendmail' => 'sendmail',
+							'smtp' => 'smtp'
+						],
+						esc(config('OSPOS')->protocol, 'attr'),
+						['class' => 'form-control input-sm', 'id' => 'protocol'])
 					?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_mailpath'), 'mailpath', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_mailpath'), 'mailpath', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-4">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'mailpath',
 						'id' => 'mailpath',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('mailpath'))); ?>
+						'value' => esc(config('OSPOS')->mailpath, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_host'), 'smtp_host', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_host'), 'smtp_host', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-2">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'smtp_host',
 						'id' => 'smtp_host',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('smtp_host'))); ?>
+						'value' => esc(config('OSPOS')->smtp_host, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_port'), 'smtp_port', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_port'), 'smtp_port', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-2">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'smtp_port',
 						'id' => 'smtp_port',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('smtp_port'))); ?>
+						'value' => config('OSPOS')->smtp_port]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_crypto'), 'smtp_crypto', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_crypto'), 'smtp_crypto', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('smtp_crypto', array(
-						'' => 'None',
-						'tls' => 'TLS',
-						'ssl' => 'SSL'
-					),
-					$this->config->item('smtp_crypto'), array('class' => 'form-control input-sm', 'id' => 'smtp_crypto'));
+					<?php echo form_dropdown('smtp_crypto', [
+							'' => 'None',
+							'tls' => 'TLS',
+							'ssl' => 'SSL'
+						],
+						esc(config('OSPOS')->smtp_crypto, 'attr'),
+						['class' => 'form-control input-sm', 'id' => 'smtp_crypto'])
 					?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_timeout'), 'smtp_timeout', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_timeout'), 'smtp_timeout', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-2">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'smtp_timeout',
 						'id' => 'smtp_timeout',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('smtp_timeout'))); ?>
+						'value' => config('OSPOS')->smtp_timeout]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_user'), 'smtp_user', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_user'), 'smtp_user', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'smtp_user',
 							'id' => 'smtp_user',
 							'class' => 'form-control input-sm',
-							'value' => $this->config->item('smtp_user'))); ?>
+							'value' => esc(config('OSPOS')->smtp_user, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_smtp_pass'), 'smtp_pass', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_smtp_pass'), 'smtp_pass', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-asterisk"></span></span>
-						<?php echo form_password(array(
+						<?php echo form_password ([
 							'name' => 'smtp_pass',
 							'id' => 'smtp_pass',
 							'class' => 'form-control input-sm',
-							'value' => $this->config->item('smtp_pass'))); ?>
+							'value' => esc(config('OSPOS')->smtp_pass, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_email',
 				'id' => 'submit_email',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php
index 93ac3fe0b..2c6c844c1 100644
--- a/app/Views/configs/general_config.php
+++ b/app/Views/configs/general_config.php
@@ -1,19 +1,28 @@
-<?php echo form_open('config/save_general/', array('id' => 'general_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $themes
+ * @var array $image_allowed_types
+ * @var array $selected_image_allowed_types
+ * @var bool $show_office_group
+ * @var string $controller_name
+ */
+?>
+<?php echo form_open('config/save_general/', ['id' => 'general_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="general_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_theme'), 'theme', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.theme'), 'theme', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-sm-10'>
 					<div class="form-group form-group-sm row">
 						<div class='col-sm-3'>
-							<?php echo form_dropdown('theme', $themes, $this->config->item('theme'), array('class' => 'form-control input-sm', 'id' => 'theme-change')); ?>
+							<?php echo form_dropdown('theme', $themes, esc(config('OSPOS')->theme, 'attr'), ['class' => 'form-control input-sm', 'id' => 'theme-change']) ?>
 						</div>
 						<div class="col-sm-7">
-							<a href="<?php echo 'https://bootswatch.com/3/' . ('bootstrap'==($this->config->item('theme')) ? 'default' : $this->config->item('theme')); ?>" target="_blank" rel=”noopener”>
-								<span><?php echo $this->lang->line('config_theme_preview') . ' ' . ucfirst($this->config->item('theme')) . ' '; ?></span><span class="glyphicon glyphicon-new-window"></span>
+							<a href="<?php echo 'https://bootswatch.com/3/' . ('bootstrap' == (config('OSPOS')->theme) ? 'default' : esc(config('OSPOS')->theme)) ?>" target="_blank" rel=”noopener”>
+								<span><?php echo lang('Config.theme_preview') . ' ' . ucfirst(esc(config('OSPOS')->theme)) . ' ' ?></span><span class="glyphicon glyphicon-new-window"></span>
 							</a>
 						</div>
 					</div>
@@ -21,200 +30,215 @@
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_login_form'), 'login_form', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.login_form'), 'login_form', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('login_form', array(
-							'floating_labels' => $this->lang->line('config_floating_labels'),
-							'input_groups' => $this->lang->line('config_input_groups')
-						),
-						$this->config->item('login_form'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown(
+						'login_form',
+						[
+							'floating_labels' => lang('Config.floating_labels'),
+							'input_groups' => lang('Config.input_groups')
+						],
+						esc(config('OSPOS')->login_form, 'attr'),
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_sales_discount'), 'default_sales_discount', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.default_sales_discount'), 'default_sales_discount', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'default_sales_discount',
 							'id' => 'default_sales_discount',
 							'class' => 'form-control input-sm required',
 							'type' => 'number',
 							'min' => 0,
 							'max' => 100,
-							'value' => $this->config->item('default_sales_discount'))); ?>
+							'value' => config('OSPOS')->default_sales_discount]) ?>
 						<span class="input-group-btn">
-							<?php echo form_checkbox(array(
+							<?php echo form_checkbox ([
 								'id' => 'default_sales_discount_type',
 								'name' => 'default_sales_discount_type',
 								'value' => 1,
 								'data-toggle' => 'toggle',
 								'data-size' => 'normal',
 								'data-onstyle' => 'success',
-								'data-on' => '<b>'.$this->config->item('currency_symbol').'</b>',
+								'data-on' => '<b>' . esc(config('OSPOS')->currency_symbol, 'attr').'</b>',
 								'data-off' => '<b>%</b>',
-								'checked' => $this->config->item('default_sales_discount_type'))); ?>
+								'checked' => config('OSPOS')->default_sales_discount_type]) ?>
 						</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_receivings_discount'), 'default_receivings_discount', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.default_receivings_discount'), 'default_receivings_discount', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'default_receivings_discount',
 							'id' => 'default_receivings_discount',
 							'class' => 'form-control input-sm required',
 							'type' => 'number',
 							'min' => 0,
 							'max' => 100,
-							'value' => $this->config->item('default_receivings_discount'))); ?>
+							'value' => config('OSPOS')->default_receivings_discount]) ?>
 						<span class="input-group-btn">
-							<?php echo form_checkbox(array(
+							<?php echo form_checkbox ([
 								'id' => 'default_receivings_discount_type',
 								'name' => 'default_receivings_discount_type',
 								'value' => 1,
 								'data-toggle' => 'toggle',
 								'data-size' => 'normal',
 								'data-onstyle' => 'success',
-								'data-on' => '<b>'.$this->config->item('currency_symbol').'</b>',
+								'data-on' => '<b>' . esc(config('OSPOS')->currency_symbol, 'attr') . '</b>',
 								'data-off' => '<b>%</b>',
-								'checked' => $this->config->item('default_receivings_discount_type'))); ?>
+								'checked' => config('OSPOS')->default_receivings_discount_type]) ?>
 						</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_enforce_privacy'), 'enforce_privacy', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.enforce_privacy'), 'enforce_privacy', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'enforce_privacy',
 						'id' => 'enforce_privacy',
 						'value' => 'enforce_privacy',
-						'checked' => $this->config->item('enforce_privacy'))); ?>
+						'checked' => config('OSPOS')->enforce_privacy]) ?>
 					&nbsp
 					<label class="control-label">
-						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_enforce_privacy_tooltip'); ?>"></span>
+						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.enforce_privacy_tooltip') ?>"></span>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receiving_calculate_average_price'), 'receiving_calculate_average_price', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receiving_calculate_average_price'), 'receiving_calculate_average_price', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receiving_calculate_average_price',
 						'id' => 'receiving_calculate_average_price',
 						'value' => 'receiving_calculate_average_price',
-						'checked' => $this->config->item('receiving_calculate_average_price'))); ?>
+						'checked' => config('OSPOS')->receiving_calculate_average_price]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_lines_per_page'), 'lines_per_page', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.lines_per_page'), 'lines_per_page', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'lines_per_page',
 						'id' => 'lines_per_page',
 						'class' => 'form-control input-sm required',
 						'type' => 'number',
 						'min' => 10,
 						'max' => 1000,
-						'value' => $this->config->item('lines_per_page'))); ?>
+						'value' => config('OSPOS')->lines_per_page
+						]
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_notify_alignment'), 'notify_horizontal_position', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.notify_alignment'), 'notify_horizontal_position', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('notify_vertical_position', array(
-									'top' => $this->lang->line('config_top'),
-									'bottom' => $this->lang->line('config_bottom')
-								),
-								$this->config->item('notify_vertical_position'), array('class' => 'form-control input-sm')); ?>
+							<?php echo form_dropdown(
+								'notify_vertical_position',
+								[
+									'top' => lang('Config.top'),
+									'bottom' => lang('Config.bottom')
+								],
+								esc(config('OSPOS')->notify_vertical_position, 'attr'),
+								['class' => 'form-control input-sm']
+							) ?>
 						</div>
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('notify_horizontal_position', array(
-									'left' => $this->lang->line('config_left'),
-									'center' => $this->lang->line('config_center'),
-									'right' => $this->lang->line('config_right')),
-									$this->config->item('notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
+							<?php echo form_dropdown(
+								'notify_horizontal_position',
+								[
+									'left' => lang('Config.left'),
+									'center' => lang('Config.center'),
+									'right' => lang('Config.right')
+								],
+								esc(config('OSPOS')->notify_horizontal_position, 'attr'),
+								['class' => 'form-control input-sm']
+							) ?>
 						</div>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_image_restrictions'), 'image_restrictions', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.image_restrictions'), 'image_restrictions', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
 						<div class='col-sm-2'>
 							<div class='input-group'>
 								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-resize-horizontal"></span></span>
-								<?php echo form_input(array(
+								<?php echo form_input ([
 									'name' => 'image_max_width',
 									'id' => 'image_max_width',
 									'class' => 'form-control input-sm required',
 									'type' => 'number',
 									'min' => 128,
 									'max' => 3840,
-									'value' => $this->config->item('image_max_width'),
+									'value' => config('OSPOS')->image_max_width,
 									'data-toggle' => 'tooltip',
 									'data-placement' => 'top',
-									'title' => $this->lang->line('config_image_max_width_tooltip')));
-								?>
+									'title' => lang('Config.image_max_width_tooltip')
+								]) ?>
 							</div>
 						</div>
 						<div class='col-sm-2'>
 							<div class='input-group'>
 								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-resize-vertical"></span></span>
-								<?php echo form_input(array(
+								<?php echo form_input ([
 									'name' => 'image_max_height',
 									'id' => 'image_max_height',
 									'class' => 'form-control input-sm required',
 									'type' => 'number',
 									'min' => 128,
 									'max' => 3840,
-									'value' => $this->config->item('image_max_height'),
+									'value' => config('OSPOS')->image_max_height,
 									'data-toggle' => 'tooltip',
 									'data-placement' => 'top',
-									'title' => $this->lang->line('config_image_max_height_tooltip')));
-								?>
+									'title' => lang('Config.image_max_height_tooltip')
+								])	?>
 							</div>
 						</div>
 						<div class='col-sm-2'>
 							<div class='input-group'>
 								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-hdd"></span></span>
-								<?php echo form_input(array(
+								<?php echo form_input ([
 									'name' => 'image_max_size',
 									'id' => 'image_max_size',
 									'class' => 'form-control input-sm required',
 									'type' => 'number',
 									'min' => 128,
 									'max' => 2048,
-									'value' => $this->config->item('image_max_size'),
+									'value' => config('OSPOS')->image_max_size,
 									'data-toggle' => 'tooltip',
 									'data-placement' => 'top',
-									'title' => $this->lang->line('config_image_max_size_tooltip')));
-								?>
+									'title' => lang('Config.image_max_size_tooltip')
+								]) ?>
 							</div>
 						</div>
 						<div class='col-sm-4'>
 							<div class='input-group'>
-								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_image_allowed_file_types');?></span>
-								<?php echo form_multiselect('image_allowed_types[]', $image_allowed_types, $selected_image_allowed_types, array(
-									'id'=>'image_allowed_types',
-									'class'=>'selectpicker show-menu-arrow',
-									'data-none-selected-text'=>$this->lang->line('common_none_selected_text'),
-									'data-selected-text-format'=>'count > 1',
-									'data-style'=>'btn-default btn-sm',
-									'data-width'=>'100%'));
-								?>
+								<span class="input-group-addon input-sm"><?php echo lang('Config.image_allowed_file_types') ?></span>
+								<?php echo form_multiselect('image_allowed_types[]', esc($image_allowed_types), esc($selected_image_allowed_types), [
+									'id' => 'image_allowed_types',
+									'class' => 'selectpicker show-menu-arrow',
+									'data-none-selected-text'=>lang('Common.none_selected_text'),
+									'data-selected-text-format' => 'count > 1',
+									'data-style' => 'btn-default btn-sm',
+									'data-width' => '100%'
+								]) ?>
 							</div>
 						</div>
 					</div>
@@ -222,81 +246,98 @@
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_gcaptcha_enable'), 'gcaptcha_enable', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.gcaptcha_enable'), 'gcaptcha_enable', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'gcaptcha_enable',
 						'id' => 'gcaptcha_enable',
 						'value' => 'gcaptcha_enable',
-						'checked' => $this->config->item('gcaptcha_enable'))); ?>
-					&nbsp;
+						'checked' => config('OSPOS')->gcaptcha_enable
+					]) ?>
 					<label class="control-label">
 						<a href="https://www.google.com/recaptcha/admin" target="_blank">
-							<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
+							<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.gcaptcha_tooltip') ?>"></span>
 						</a>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_gcaptcha_site_key'), 'config_gcaptcha_site_key', array('class' => 'required control-label col-xs-2','id' => 'config_gcaptcha_site_key')); ?>
+				<?php echo form_label(lang('Config.gcaptcha_site_key'), 'config_gcaptcha_site_key', ['class' => 'required control-label col-xs-2','id' => 'config_gcaptcha_site_key']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'gcaptcha_site_key',
 						'id' => 'gcaptcha_site_key',
 						'class' => 'form-control input-sm required',
-						'value' => $this->config->item('gcaptcha_site_key'))); ?>
+						'value' => esc(config('OSPOS')->gcaptcha_site_key, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_gcaptcha_secret_key'), 'config_gcaptcha_secret_key', array('class' => 'required control-label col-xs-2','id' => 'config_gcaptcha_secret_key')); ?>
+				<?php echo form_label(lang('Config.gcaptcha_secret_key'), 'config_gcaptcha_secret_key', ['class' => 'required control-label col-xs-2','id' => 'config_gcaptcha_secret_key']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'gcaptcha_secret_key',
 						'id' => 'gcaptcha_secret_key',
 						'class' => 'form-control input-sm required',
-						'value' => $this->config->item('gcaptcha_secret_key'))); ?>
+						'value' => esc(config('OSPOS')->gcaptcha_secret_key, 'attr')
+						]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_suggestions_layout'), 'suggestions_layout', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.suggestions_layout'), 'suggestions_layout', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
 						<div class='col-sm-3'>
 							<div class='input-group'>
-								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_first_column'); ?></span>
-								<?php echo form_dropdown('suggestions_first_column', array(
-									'name' => $this->lang->line('items_name'),
-									'item_number' => $this->lang->line('items_number_information'),
-									'unit_price' => $this->lang->line('items_unit_price'),
-									'cost_price' => $this->lang->line('items_cost_price')),
-									$this->config->item('suggestions_first_column'), array('class' => 'form-control input-sm')); ?>
+								<span class="input-group-addon input-sm"><?php echo lang('Config.suggestions_first_column') ?></span>
+								<?php echo form_dropdown(
+									'suggestions_first_column',
+									[
+										'name' => lang('Items.name'),
+										'item_number' => lang('Items.number_information'),
+										'unit_price' => lang('Items.unit_price'),
+										'cost_price' => lang('Items.cost_price')
+									],
+									esc(config('OSPOS')->suggestions_first_column, 'attr'),
+									['class' => 'form-control input-sm']
+								) ?>
 							</div>
 						</div>
 						<div class='col-sm-3'>
 							<div class='input-group'>
-								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_second_column'); ?></span>
-								<?php echo form_dropdown('suggestions_second_column', array(
-									'' => $this->lang->line('config_none'),
-									'name' => $this->lang->line('items_name'),
-									'item_number' => $this->lang->line('items_number_information'),
-									'unit_price' => $this->lang->line('items_unit_price'),
-									'cost_price' => $this->lang->line('items_cost_price')),
-									$this->config->item('suggestions_second_column'), array('class' => 'form-control input-sm')); ?>
+								<span class="input-group-addon input-sm"><?php echo lang('Config.suggestions_second_column') ?></span>
+								<?php echo form_dropdown(
+									'suggestions_second_column',
+									[
+										'' => lang('Config.none'),
+										'name' => lang('Items.name'),
+										'item_number' => lang('Items.number_information'),
+										'unit_price' => lang('Items.unit_price'),
+										'cost_price' => lang('Items.cost_price')
+									],
+									esc(config('OSPOS')->suggestions_second_column, 'attr'),
+									['class' => 'form-control input-sm']
+								) ?>
 							</div>
 						</div>
 						<div class='col-sm-3'>
 							<div class='input-group'>
-								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_third_column'); ?></span>
-								<?php echo form_dropdown('suggestions_third_column', array(
-									'' => $this->lang->line('config_none'),
-									'name' => $this->lang->line('items_name'),
-									'item_number' => $this->lang->line('items_number_information'),
-									'unit_price' => $this->lang->line('items_unit_price'),
-									'cost_price' => $this->lang->line('items_cost_price')),
-									$this->config->item('suggestions_third_column'), array('class' => 'form-control input-sm')); ?>
+								<span class="input-group-addon input-sm"><?php echo lang('Config.suggestions_third_column') ?></span>
+								<?php echo form_dropdown(
+									'suggestions_third_column',
+									[
+										'' => lang('Config.none'),
+										'name' => lang('Items.name'),
+										'item_number' => lang('Items.number_information'),
+										'unit_price' => lang('Items.unit_price'),
+										'cost_price' => lang('Items.cost_price')
+									],
+									esc(config('OSPOS')->suggestions_third_column, 'attr'),
+									['class' => 'form-control input-sm']
+								) ?>
 							</div>
 						</div>
 					</div>
@@ -304,101 +345,92 @@
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_giftcard_number'), 'giftcard_number', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.giftcard_number'), 'giftcard_number', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-8'>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'giftcard_number',
 							'value' => 'series',
-							'checked' => $this->config->item('giftcard_number') == 'series')); ?>
-						<?php echo $this->lang->line('config_giftcard_series'); ?>
+							'checked' => config('OSPOS')->giftcard_number == 'series']) ?>
+						<?php echo lang('Config.giftcard_series') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'giftcard_number',
 							'value' => 'random',
-							'checked' => $this->config->item('giftcard_number') == 'random')); ?>
-						<?php echo $this->lang->line('config_giftcard_random'); ?>
+							'checked' => config('OSPOS')->giftcard_number == 'random']) ?>
+						<?php echo lang('Config.giftcard_random') ?>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_derive_sale_quantity'), 'derive_sale_quantity', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.derive_sale_quantity'), 'derive_sale_quantity', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 					'name' => 'derive_sale_quantity',
 					'id' => 'derive_sale_quantity',
 					'value' => 'derive_sale_quantity',
-					'checked' => $this->config->item('derive_sale_quantity'))); ?>
+					'checked' => config('OSPOS')->derive_sale_quantity]) ?>
 					&nbsp
 					<label class="control-label">
-						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_derive_sale_quantity_tooltip'); ?>"></span>
+						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.derive_sale_quantity_tooltip') ?>"></span>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_show_office_group'), 'show_office_group', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.show_office_group'), 'show_office_group', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'show_office_group',
 						'id' => 'show_office_group',
 						'value' => 'show_office_group',
-						'checked' => $show_office_group)); ?>
+						'checked' => $show_office_group]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_multi_pack_enabled'), 'multi_pack_enabled', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.multi_pack_enabled'), 'multi_pack_enabled', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'multi_pack_enabled',
 						'id' => 'multi_pack_enabled',
 						'value' => 'multi_pack_enabled',
-						'checked' => $this->config->item('multi_pack_enabled'))); ?>
+						'checked' => config('OSPOS')->multi_pack_enabled]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_include_hsn'), 'include_hsn', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.include_hsn'), 'include_hsn', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'include_hsn',
 						'id' => 'include_hsn',
 						'value' => 'include_hsn',
-						'checked' => $this->config->item('include_hsn'))); ?>
+						'checked' => config('OSPOS')->include_hsn]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_category_dropdown'), 'category_dropdown', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.category_dropdown'), 'category_dropdown', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'category_dropdown',
 						'id' => 'category_dropdown',
 						'value' => 'category_dropdown',
-						'checked' => $this->config->item('category_dropdown'))); ?>
+						'checked' => config('OSPOS')->category_dropdown]) ?>
 				</div>
 			</div>
 
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_backup_database'), 'config_backup_database', array('class' => 'control-label col-xs-2')); ?>
-				<div class='col-xs-2'>
-					<div id="backup_db" class="btn btn-default btn-sm">
-						<span style="top:22%;"><?php echo $this->lang->line('config_backup_button'); ?></span>
-					</div>
-				</div>
-			</div>
-
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_general',
 				'id' => 'submit_general',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -422,10 +454,6 @@ $(document).ready(function()
 
 	$("#gcaptcha_enable").change(enable_disable_gcaptcha_enable);
 
-	$("#backup_db").click(function() {
-		window.location='<?php echo site_url('config/backup_db') ?>';
-	});
-
 	$('#general_config_form').validate($.extend(form_support.handler, {
 
 		errorLabelContainer: "#general_error_message_box",
@@ -435,12 +463,12 @@ $(document).ready(function()
 			lines_per_page:
 			{
 				required: true,
-				remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+				remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 			},
 			default_sales_discount:
 			{
 				required: true,
-				remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+				remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 			},
 			gcaptcha_site_key:
 			{
@@ -456,21 +484,21 @@ $(document).ready(function()
 		{
 			default_sales_discount:
 			{
-				required: "<?php echo $this->lang->line('config_default_sales_discount_required'); ?>",
-				number: "<?php echo $this->lang->line('config_default_sales_discount_number'); ?>"
+				required: "<?php echo lang('Config.default_sales_discount_required') ?>",
+				number: "<?php echo lang('Config.default_sales_discount_number') ?>"
 			},
 			lines_per_page:
 			{
-				required: "<?php echo $this->lang->line('config_lines_per_page_required'); ?>",
-				number: "<?php echo $this->lang->line('config_lines_per_page_number'); ?>"
+				required: "<?php echo lang('Config.lines_per_page_required') ?>",
+				number: "<?php echo lang('Config.lines_per_page_number') ?>"
 			},
 			gcaptcha_site_key:
 			{
-				required: "<?php echo $this->lang->line('config_gcaptcha_site_key_required'); ?>"
+				required: "<?php echo lang('Config.gcaptcha_site_key_required') ?>"
 			},
 			gcaptcha_secret_key:
 			{
-				required: "<?php echo $this->lang->line('config_gcaptcha_secret_key_required'); ?>"
+				required: "<?php echo lang('Config.gcaptcha_secret_key_required') ?>"
 			}
 		},
 
diff --git a/app/Views/configs/info_config.php b/app/Views/configs/info_config.php
index c5b6b7f89..1b4b8faac 100644
--- a/app/Views/configs/info_config.php
+++ b/app/Views/configs/info_config.php
@@ -1,132 +1,145 @@
-<?php echo form_open('config/save_info/', array('id' => 'info_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var bool $logo_exists
+ * @var string $controller_name
+ */
+?>
+<?php echo form_open('config/save_info/', ['id' => 'info_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="info_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_company'), 'company', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.company'), 'company', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-xs-6">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-home"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'company',
 							'id' => 'company',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('company'))); ?>
+							'value' => esc(config('OSPOS')->company, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_company_logo'), 'company_logo', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.company_logo'), 'company_logo', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-6'>
-					<div class="fileinput <?php echo $logo_exists ? 'fileinput-exists' : 'fileinput-new'; ?>" data-provides="fileinput">
+					<div class="fileinput <?php echo $logo_exists ? 'fileinput-exists' : 'fileinput-new' ?>" data-provides="fileinput">
 						<div class="fileinput-new thumbnail" style="width: 200px; height: 200px;"></div>
 						<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 200px;">
-							<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('config_company_logo'); ?>"
-								 src="<?php if($logo_exists) echo base_url('uploads/' . $this->config->item('company_logo')); else echo ''; ?>"
+							<img data-src="holder.js/100%x100%" alt="<?php echo lang('Config.company_logo') ?>"
+								 src="<?php if($logo_exists) echo esc(base_url('uploads/' . config('OSPOS')->company_logo), 'url'); else echo '' ?>"
 								 style="max-height: 100%; max-width: 100%;">
 						</div>
 						<div>
 							<span class="btn btn-default btn-sm btn-file">
-								<span class="fileinput-new"><?php echo $this->lang->line("config_company_select_image"); ?></span>
-								<span class="fileinput-exists"><?php echo $this->lang->line("config_company_change_image"); ?></span>
+								<span class="fileinput-new"><?php echo lang('Config.company_select_image') ?></span>
+								<span class="fileinput-exists"><?php echo lang('Config.company_change_image') ?></span>
 								<input type="file" name="company_logo">
 							</span>
-							<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("config_company_remove_image"); ?></a>
+							<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo lang('Config.company_remove_image') ?></a>
 						</div>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_address'), 'address', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.address'), 'address', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-6'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'address',
 						'id' => 'address',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('address'))); ?>
+						'value'=> esc(config('OSPOS')->address, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_website'), 'website', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.website'), 'website', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-6">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-globe"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'website',
 							'id' => 'website',
 							'class' => 'form-control input-sm',
-							'value'=>$this->config->item('website'))); ?>
+							'value'=> esc(config('OSPOS')->website, 'url')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('common_email'), 'email', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Common.email'), 'email', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-6">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-envelope"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'email',
 							'id' => 'email',
 							'type' => 'email',
 							'class' => 'form-control input-sm',
-							'value'=>$this->config->item('email'))); ?>
+							'value'=> esc(config('OSPOS')->email, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_phone'), 'phone', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.phone'), 'phone', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-xs-6">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'phone',
 							'id' => 'phone',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('phone'))); ?>
+							'value'=> esc(config('OSPOS')->phone, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_fax'), 'fax', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.fax'), 'fax', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-6">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'fax',
 							'id' => 'fax',
 							'class' => 'form-control input-sm',
-							'value'=>$this->config->item('fax'))); ?>
+							'value'=> esc(config('OSPOS')->fax, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('common_return_policy'), 'return_policy', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Common.return_policy'), 'return_policy', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-6'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'return_policy',
 						'id' => 'return_policy',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('return_policy'))); ?>
+						'value' => esc(config('OSPOS')->return_policy, 'attr')
+					]) ?>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_info',
 				'id' => 'submit_info',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -134,8 +147,8 @@ $(document).ready(function()
 {
 	$("a.fileinput-exists").click(function() {
 		$.ajax({
-			type: 'POST',
-			url: '<?php echo site_url("$controller_name/remove_logo"); ?>',
+			type: 'GET',
+			url: '<?php echo esc(site_url("$controller_name/remove_logo"), 'url') ?>',
 			dataType: 'json'
 		})
 	});
@@ -150,16 +163,16 @@ $(document).ready(function()
 			address: "required",
 			phone: "required",
     		email: "email",
-    		return_policy: "required" 		
+    		return_policy: "required"
    		},
 
 		messages: 
 		{
-			company: "<?php echo $this->lang->line('config_company_required'); ?>",
-			address: "<?php echo $this->lang->line('config_address_required'); ?>",
-			phone: "<?php echo $this->lang->line('config_phone_required'); ?>",
-			email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>",
-			return_policy: "<?php echo $this->lang->line('config_return_policy_required'); ?>"
+			company: "<?php echo lang('Config.company_required') ?>",
+			address: "<?php echo lang('Config.address_required') ?>",
+			phone: "<?php echo lang('Config.phone_required') ?>",
+			email: "<?php echo lang('Common.email_invalid_format') ?>",
+			return_policy: "<?php echo lang('Config.return_policy_required') ?>"
 		}
 	}));
 });
diff --git a/app/Views/configs/integrations_config.php b/app/Views/configs/integrations_config.php
index ff0080d83..526598779 100644
--- a/app/Views/configs/integrations_config.php
+++ b/app/Views/configs/integrations_config.php
@@ -1,57 +1,67 @@
-<?php echo form_open('config/save_mailchimp/', array('id' => 'mailchimp_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $mailchimp
+ * @var string $controller_name
+ */
+?>
+<?php echo form_open('config/save_mailchimp/', ['id' => 'mailchimp_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-			<div id="integrations_header"><?php echo $this->lang->line('config_mailchimp_configuration')?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
+			<div id="integrations_header"><?php echo lang('Config.mailchimp_configuration') ?></div>
 			<ul id="mailchimp_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_mailchimp_api_key'), 'mailchimp_api_key', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.mailchimp_api_key'), 'mailchimp_api_key', ['class' => 'control-label col-xs-2']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-cloud"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'mailchimp_api_key',
 							'id' => 'mailchimp_api_key',
 							'class' => 'form-control input-sm',
-							'value' => $mailchimp['api_key'])); ?>
+							'value' => esc($mailchimp['api_key'], 'attr')
+						]) ?>
 					</div>
 				</div>
 				<div class="col-xs-1">
 					<label class="control-label">
-						<a href="http://eepurl.com/b9a05b" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_mailchimp_tooltip'); ?>"></span></a>
+						<a href="http://eepurl.com/b9a05b" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.mailchimp_tooltip') //TODO: Possibly need to change the URL here to HTTPS? ?>"></span></a>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_mailchimp_lists'), 'mailchimp_list_id', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.mailchimp_lists'), 'mailchimp_list_id', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
-						<?php echo form_dropdown('mailchimp_list_id',
-							$mailchimp['lists'],
-							$mailchimp['list_id'],
-							array('id' => 'mailchimp_list_id', 'class' => 'form-control input-sm')); ?>
+						<?php echo form_dropdown(
+							'mailchimp_list_id',
+							esc($mailchimp['lists'], 'attr'),
+							esc($mailchimp['list_id'], 'attr'),
+							['id' => 'mailchimp_list_id', 'class' => 'form-control input-sm']
+						) ?>
 					</div>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_mailchimp',
 				'id' => 'submit_mailchimp',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
 {
 	$('#mailchimp_api_key').change(function() {
-		$.post("<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>", {
+		$.post("<?php echo esc(site_url($controller_name . '/ajax_check_mailchimp_api_key'), 'url') ?>", {
 				'mailchimp_api_key': $('#mailchimp_api_key').val()
 			},
 			function(response) {
diff --git a/app/Views/configs/invoice_config.php b/app/Views/configs/invoice_config.php
index 844b582fb..dfaf197aa 100644
--- a/app/Views/configs/invoice_config.php
+++ b/app/Views/configs/invoice_config.php
@@ -1,166 +1,179 @@
-<?php echo form_open('config/save_invoice/', array('id' => 'invoice_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $invoice_type_options
+ * @var array $line_sequence_options
+ */
+?>
+<?php echo form_open('config/save_invoice/', ['id' => 'invoice_config_form', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="invoice_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_invoice_enable'), 'invoice_enable', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.invoice_enable'), 'invoice_enable', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'invoice_enable',
 						'value' => 'invoice_enable',
 						'id' => 'invoice_enable',
-						'checked' => $this->config->item('invoice_enable')));?>
+						'checked' => config('OSPOS')->invoice_enable]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_invoice_type'), 'invoice_type', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.invoice_type'), 'invoice_type', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-3'>
-					<?php echo form_dropdown('invoice_type', $invoice_type_options, $this->config->item('invoice_type'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('invoice_type', esc($invoice_type_options, 'attr'), esc(config('OSPOS')->invoice_type, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_recv_invoice_format'), 'recv_invoice_format', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.recv_invoice_format'), 'recv_invoice_format', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'recv_invoice_format',
 						'id' => 'recv_invoice_format',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('recv_invoice_format'))); ?>
+						'value' => esc(config('OSPOS')->recv_invoice_format, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_invoice_default_comments'), 'invoice_default_comments', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.invoice_default_comments'), 'invoice_default_comments', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-5'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'invoice_default_comments',
 						'id' => 'invoice_default_comments',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('invoice_default_comments')));?>
+						'value' => esc(config('OSPOS')->invoice_default_comments, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_invoice_email_message'), 'invoice_email_message', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.invoice_email_message'), 'invoice_email_message', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-5'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'invoice_email_message',
 						'id' => 'invoice_email_message',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('invoice_email_message')));?>
+						'value' => esc(config('OSPOS')->invoice_email_message, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_line_sequence'), 'line_sequence', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.line_sequence'), 'line_sequence', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('line_sequence', $line_sequence_options, $this->config->item('line_sequence'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('line_sequence', esc($line_sequence_options, 'attr'), esc(config('OSPOS')->line_sequence, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_sales_invoice_format'), 'sales_invoice_format', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.sales_invoice_format'), 'sales_invoice_format', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'sales_invoice_format',
 						'id' => 'sales_invoice_format',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('sales_invoice_format'))); ?>
+						'value' => esc(config('OSPOS')->sales_invoice_format, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_last_used_invoice_number'), 'last_used_invoice_number', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.last_used_invoice_number'), 'last_used_invoice_number', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'type' => 'number',
 						'name' => 'last_used_invoice_number',
 						'id' => 'last_used_invoice_number',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('last_used_invoice_number'))); ?>
+						'value' => config('OSPOS')->last_used_invoice_number]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_sales_quote_format'), 'sales_quote_format', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.sales_quote_format'), 'sales_quote_format', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'sales_quote_format',
 						'id' => 'sales_quote_format',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('sales_quote_format'))); ?>
+						'value' => esc(config('OSPOS')->sales_quote_format, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_last_used_quote_number'), 'last_used_quote_number', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.last_used_quote_number'), 'last_used_quote_number', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'type' => 'number',
 						'name' => 'last_used_quote_number',
 						'id' => 'last_used_quote_number',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('last_used_quote_number'))); ?>
+						'value'=>config('OSPOS')->last_used_quote_number]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_quote_default_comments'), 'quote_default_comments', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.quote_default_comments'), 'quote_default_comments', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-5'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'quote_default_comments',
 						'id' => 'quote_default_comments',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('quote_default_comments')));?>
+						'value' => esc(config('OSPOS')->quote_default_comments, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_work_order_enable'), 'work_order_enable', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.work_order_enable'), 'work_order_enable', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'work_order_enable',
 						'value' => 'work_order_enable',
 						'id' => 'work_order_enable',
-						'checked' => $this->config->item('work_order_enable')));?>
+						'checked' => config('OSPOS')->work_order_enable]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_work_order_format'), 'work_order_format', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.work_order_format'), 'work_order_format', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'work_order_format',
 						'id' => 'work_order_format',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('work_order_format'))); ?>
+						'value' => esc(config('OSPOS')->work_order_format, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_last_used_work_order_number'), 'last_used_work_order_number', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.last_used_work_order_number'), 'last_used_work_order_number', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'type' => 'number',
 						'name' => 'last_used_work_order_number',
 						'id' => 'last_used_work_order_number',
 						'class' => 'form-control input-sm required',
-						'value'=>$this->config->item('last_used_work_order_number'))); ?>
+						'value' => config('OSPOS')->last_used_work_order_number]) ?>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_invoice',
 				'id' => 'submit_invoice',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right'));?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
diff --git a/app/Views/configs/license_config.php b/app/Views/configs/license_config.php
index 1b4eefc16..6faf9cea6 100644
--- a/app/Views/configs/license_config.php
+++ b/app/Views/configs/license_config.php
@@ -1,4 +1,9 @@
-<?php echo form_open('', array('id' => 'license_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $licenses
+ */
+?>
+<?php echo form_open('', ['id' => 'license_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset>
 			<?php
@@ -7,14 +12,15 @@
 			{
 			?>
 				<div class="form-group form-group-sm">
-					<?php echo form_label($license['title'], 'license', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(esc($license['title'], 'attr'), 'license', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-6'>
-						<?php echo form_textarea(array(
+						<?php echo form_textarea ([
 							'name' => 'license',
-							'id' => 'license_' . $counter++,
+							'id' => 'license_' . $counter++,	//TODO: String Interpolation
 							'class' => 'form-control',
 							'readonly' => '',
-							'value' => $license['text'])); ?>
+							'value' => esc($license['text'], 'attr')
+						]) ?>
 					</div>
 				</div>
 			<?php
@@ -22,4 +28,4 @@
 			?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
diff --git a/app/Views/configs/locale_config.php b/app/Views/configs/locale_config.php
index b076a8191..74ebe3d1e 100644
--- a/app/Views/configs/locale_config.php
+++ b/app/Views/configs/locale_config.php
@@ -1,23 +1,31 @@
-<?php echo form_open('config/save_locale/', array('id' => 'locale_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var string $currency_code
+ * @var array $rounding_options
+ * @var string $controller_name
+ */
+?>
+
+<?php echo form_open('config/save_locale/', ['id' => 'locale_config_form', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="locale_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_number_locale'), 'number_locale', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.number_locale'), 'number_locale', ['class' => 'control-label col-xs-2']) ?>
 				<div class='row'>
 					<div class='col-xs-1'>
-						<?php echo form_input('number_locale', $this->config->item('number_locale'), array('class' => 'form-control input-sm', 'id' => 'number_locale')); ?>
-						<?php echo form_hidden('save_number_locale', $this->config->item('number_locale')); ?>
+						<?php echo form_input('number_locale', esc(config('OSPOS')->number_locale, 'attr'), ['class' => 'form-control input-sm', 'id' => 'number_locale']) ?>
+						<?php echo form_hidden('save_number_locale', esc(config('OSPOS')->number_locale, 'attr')) ?>
 					</div>
 					<div class="col-xs-2">
 						<label class="control-label">
 							<a href="https://github.com/opensourcepos/opensourcepos/wiki/Localisation-support" target="_blank">
-								<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_number_locale_tooltip'); ?>"></span>
+								<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.number_locale_tooltip') ?>"></span>
 							</a>
 							<span id="number_locale_example">
-								&nbsp&nbsp<?php echo to_currency(1234567890.12300); ?>
+								&nbsp&nbsp<?php echo to_currency(1234567890.12300) ?>
 							</span>
 						</label>
 					</div>
@@ -25,215 +33,235 @@
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_thousands_separator'), 'thousands_separator', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.thousands_separator'), 'thousands_separator', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'thousands_separator',
 						'id' => 'thousands_separator',
 						'value' => 'thousands_separator',
-						'checked'=>$this->config->item('thousands_separator'))); ?>
+						'checked' => config('OSPOS')->thousands_separator
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_currency_symbol'), 'currency_symbol', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.currency_symbol'), 'currency_symbol', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'currency_symbol',
 						'id' => 'currency_symbol',
 						'class' => 'form-control input-sm number_locale',
-						'value'=>$this->config->item('currency_symbol'))); ?>
+						'value' => esc(config('OSPOS')->currency_symbol, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_currency_code'), 'currency_code', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.currency_code'), 'currency_code', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'currency_code',
 						'id' => 'currency_code',
 						'class' => 'form-control input-sm number_locale',
-						'value'=>$currency_code)); ?>
+						'value' => esc($currency_code, 'attr')
+					]) ?>
 				</div>
 			</div>
 			
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_currency_decimals'), 'currency_decimals', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.currency_decimals'), 'currency_decimals', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('currency_decimals', array(
-						'0' => '0',
-						'1' => '1',
-						'2' => '2'
-					),
-					$this->config->item('currency_decimals'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'currency_decimals',
+						[
+							'0' => '0',
+							'1' => '1',
+							'2' => '2'
+						],
+						config('OSPOS')->currency_decimals,
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_tax_decimals'), 'tax_decimals', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.tax_decimals'), 'tax_decimals', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('tax_decimals', array(
-						'0' => '0',
-						'1' => '1',
-						'2' => '2',
-						'3' => '3',
-						'4' => '4'
-					),
-					$this->config->item('tax_decimals'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'tax_decimals',
+						[
+							'0' => '0',
+							'1' => '1',
+							'2' => '2',
+							'3' => '3',
+							'4' => '4'
+						],
+						config('OSPOS')->tax_decimals,
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_quantity_decimals'), 'quantity_decimals', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.quantity_decimals'), 'quantity_decimals', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('quantity_decimals', array(
-						'0' => '0',
-						'1' => '1',
-						'2' => '2',
-						'3' => '3'
-					),
-					$this->config->item('quantity_decimals'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'quantity_decimals',
+						[
+							'0' => '0',
+							'1' => '1',
+							'2' => '2',
+							'3' => '3'
+						],
+						config('OSPOS')->quantity_decimals,
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_cash_decimals'), 'cash_decimals', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.cash_decimals'), 'cash_decimals', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('cash_decimals', array(
-						'-1' => '-1',
-						'0' => '0',
-						'1' => '1',
-						'2' => '2'
-					),
-						$this->config->item('cash_decimals'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'cash_decimals',
+						[
+							'-1' => '-1',
+							'0' => '0',
+							'1' => '1',
+							'2' => '2'
+						],
+						config('OSPOS')->cash_decimals,
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 				<div class='col-xs-1'>
 					<label class="control-label">
-						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_cash_decimals_tooltip'); ?>"></span>
+						<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.cash_decimals_tooltip') ?>"></span>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_cash_rounding'), 'cash_rounding_code', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.cash_rounding'), 'cash_rounding_code', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('cash_rounding_code', $rounding_options, $this->config->item('cash_rounding_code'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown('cash_rounding_code', esc($rounding_options, 'attr'), config('OSPOS')->cash_rounding_code, ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_payment_options_order'), 'payment_options_order', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.payment_options_order'), 'payment_options_order', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_dropdown('payment_options_order', array(
-						'cashdebitcredit' => $this->lang->line('sales_cash') . ' / ' . $this->lang->line('sales_debit') . ' / ' . $this->lang->line('sales_credit'),
-						'debitcreditcash' => $this->lang->line('sales_debit') . ' / ' . $this->lang->line('sales_credit') . ' / ' . $this->lang->line('sales_cash'),
-						'debitcashcredit' => $this->lang->line('sales_debit') . ' / ' . $this->lang->line('sales_cash') . ' / ' . $this->lang->line('sales_credit'),
-						'creditdebitcash' => $this->lang->line('sales_credit') . ' / ' . $this->lang->line('sales_debit') . ' / ' . $this->lang->line('sales_cash'),
-						'creditcashdebit' => $this->lang->line('sales_credit') . ' / ' . $this->lang->line('sales_cash') . ' / ' . $this->lang->line('sales_debit')
-					),
-					$this->config->item('payment_options_order'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'payment_options_order',
+						[
+							'cashdebitcredit' => lang('Sales.cash') . ' / ' . lang('Sales.debit') . ' / ' . lang('Sales.credit'),
+							'debitcreditcash' => lang('Sales.debit') . ' / ' . lang('Sales.credit') . ' / ' . lang('Sales.cash'),
+							'debitcashcredit' => lang('Sales.debit') . ' / ' . lang('Sales.cash') . ' / ' . lang('Sales.credit'),
+							'creditdebitcash' => lang('Sales.credit') . ' / ' . lang('Sales.debit') . ' / ' . lang('Sales.cash'),
+							'creditcashdebit' => lang('Sales.credit') . ' / ' . lang('Sales.cash') . ' / ' . lang('Sales.debit')
+						],
+						esc(config('OSPOS')->payment_options_order, 'attr'),
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_country_codes'), 'country_codes', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.country_codes'), 'country_codes', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_input('country_codes', $this->config->item('country_codes'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_input('country_codes', esc(config('OSPOS')->country_codes, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 				<div class="col-xs-1">
 					<label class="control-label">
-						<a href="http://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_country_codes_tooltip'); ?>"></span></a>
+						<a href="http://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo lang('Config.country_codes_tooltip'); //TODO: May need to change the URL at the beginning to HTTPS?>"></span></a>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_language'), 'language', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.language'), 'language', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
 					<?php echo form_dropdown(
 							'language',
 							get_languages(),
 							current_language_code(TRUE) . ':' . current_language(TRUE),
 							array('class' => 'form-control input-sm')
-						);
+						)
 					?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('config_timezone'), 'timezone', array('class' => 'control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Config.timezone'), 'timezone', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
 				<?php echo form_dropdown(
 					'timezone',
 					get_timezones(),
-					$this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get(), array('class' => 'form-control input-sm'));
-					?>
+					config('OSPOS')->timezone ? esc(config('OSPOS')->timezone, 'attr') : date_default_timezone_get(), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('config_datetimeformat'), 'datetimeformat', array('class' => 'control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Config.datetimeformat'), 'datetimeformat', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-sm-2'>
-				<?php echo form_dropdown('dateformat',
+				<?php echo form_dropdown(
+					'dateformat',
 					get_dateformats(),
-					$this->config->item('dateformat'), array('class' => 'form-control input-sm'));
-					?>
+					esc(config('OSPOS')->dateformat, 'attr'),
+					['class' => 'form-control input-sm']
+				) ?>
 				</div>
 				<div class='col-sm-2'>
 				<?php echo form_dropdown('timeformat',
 					get_timeformats(),
-					$this->config->item('timeformat'), array('class' => 'form-control input-sm'));
-					?>
+					config('OSPOS')->timeformat, ['class' => 'form-control input-sm']
+				) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_date_or_time_format'), 'date_or_time_format', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.date_or_time_format'), 'date_or_time_format', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'date_or_time_format',
 						'id' => 'date_or_time_format',
 						'value' => 'date_or_time_format',
-						'checked'=>$this->config->item('date_or_time_format'))); ?>
+						'checked' => config('OSPOS')->date_or_time_format]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_financial_year'), 'financial_year', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.financial_year'), 'financial_year', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('financial_year', array(
-						'1' => $this->lang->line('config_financial_year_jan'),
-						'2' => $this->lang->line('config_financial_year_feb'),
-						'3' => $this->lang->line('config_financial_year_mar'),
-						'4' => $this->lang->line('config_financial_year_apr'),
-						'5' => $this->lang->line('config_financial_year_may'),
-						'6' => $this->lang->line('config_financial_year_jun'),
-						'7' => $this->lang->line('config_financial_year_jul'),
-						'8' => $this->lang->line('config_financial_year_aug'),
-						'9' => $this->lang->line('config_financial_year_sep'),
-						'10' => $this->lang->line('config_financial_year_oct'),
-						'11' => $this->lang->line('config_financial_year_nov'),
-						'12' => $this->lang->line('config_financial_year_dec')
-					),
-					$this->config->item('financial_year'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'financial_year',
+						[
+							'1' => lang('Config.financial_year_jan'),
+							'2' => lang('Config.financial_year_feb'),
+							'3' => lang('Config.financial_year_mar'),
+							'4' => lang('Config.financial_year_apr'),
+							'5' => lang('Config.financial_year_may'),
+							'6' => lang('Config.financial_year_jun'),
+							'7' => lang('Config.financial_year_jul'),
+							'8' => lang('Config.financial_year_aug'),
+							'9' => lang('Config.financial_year_sep'),
+							'10' => lang('Config.financial_year_oct'),
+							'11' => lang('Config.financial_year_nov'),
+							'12' => lang('Config.financial_year_dec')
+						],
+						config('OSPOS')->financial_year, ['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_locale',
 				'id' => 'submit_locale',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -247,7 +275,7 @@ $(document).ready(function()
 		data['currency_symbol'] = $('#currency_symbol').val();
 		data['currency_code'] = $('#currency_code').val();
 		data['thousands_separator'] = $('#thousands_separator').is(":checked")
-		$.post("<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
+		$.post("<?php echo esc(site_url($controller_name . '/ajax_check_number_locale'), 'url') //TODO: String Interpolation ?>",
 			data,
 			function(response) {
 				$("input[name='save_number_locale']").val(response.save_number_locale);
@@ -267,7 +295,7 @@ $(document).ready(function()
 				required: true,
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
+					url: "<?php echo esc(site_url($controller_name . '/ajax_check_number_locale'), 'url') ?>",
 					type: 'POST',
 					data: {
 						'number_locale': function() { return $('#number_locale').val(); },
@@ -291,8 +319,8 @@ $(document).ready(function()
 		messages:
 		{
 			number_locale: {
-				required: "<?php echo $this->lang->line('config_number_locale_required') ?>",
-				number_locale: "<?php echo $this->lang->line('config_number_locale_invalid') ?>"
+				required: "<?php echo lang('Config.number_locale_required') ?>",
+				number_locale: "<?php echo lang('Config.number_locale_invalid') ?>"
 			}
 		},
 
diff --git a/app/Views/configs/manage.php b/app/Views/configs/manage.php
index 3f5ee1de0..e32ccf170 100644
--- a/app/Views/configs/manage.php
+++ b/app/Views/configs/manage.php
@@ -1,4 +1,4 @@
-<?php $this->load->view("partial/header"); ?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
@@ -6,74 +6,74 @@
 
 <ul class="nav nav-tabs" data-tabs="tabs">
 	<li class="active" role="presentation">
-		<a data-toggle="tab" href="#info_tab" title="<?php echo $this->lang->line('config_info_configuration'); ?>"><?php echo $this->lang->line('config_info'); ?></a>
+		<a data-toggle="tab" href="#info_tab" title="<?php echo lang('Config.info_configuration') ?>"><?php echo lang('Config.info') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#general_tab" title="<?php echo $this->lang->line('config_general_configuration'); ?>"><?php echo $this->lang->line('config_general'); ?></a>
+		<a data-toggle="tab" href="#general_tab" title="<?php echo lang('Config.general_configuration') ?>"><?php echo lang('Config.general') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#tax_tab" title="<?php echo $this->lang->line('config_tax_configuration'); ?>"><?php echo $this->lang->line('config_tax'); ?></a>
+		<a data-toggle="tab" href="#tax_tab" title="<?php echo lang('Config.tax_configuration') ?>"><?php echo lang('Config.tax') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#locale_tab" title="<?php echo $this->lang->line('config_locale_configuration'); ?>"><?php echo $this->lang->line('config_locale'); ?></a>
+		<a data-toggle="tab" href="#locale_tab" title="<?php echo lang('Config.locale_configuration') ?>"><?php echo lang('Config.locale') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#barcode_tab" title="<?php echo $this->lang->line('config_barcode_configuration'); ?>"><?php echo $this->lang->line('config_barcode'); ?></a>
+		<a data-toggle="tab" href="#barcode_tab" title="<?php echo lang('Config.barcode_configuration') ?>"><?php echo lang('Config.barcode') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#stock_tab" title="<?php echo $this->lang->line('config_location_configuration'); ?>"><?php echo $this->lang->line('config_location'); ?></a>
+		<a data-toggle="tab" href="#stock_tab" title="<?php echo lang('Config.location_configuration') ?>"><?php echo lang('Config.location') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#receipt_tab" title="<?php echo $this->lang->line('config_receipt_configuration'); ?>"><?php echo $this->lang->line('config_receipt'); ?></a>
+		<a data-toggle="tab" href="#receipt_tab" title="<?php echo lang('Config.receipt_configuration') ?>"><?php echo lang('Config.receipt') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#invoice_tab" title="<?php echo $this->lang->line('config_invoice_configuration'); ?>"><?php echo $this->lang->line('config_invoice'); ?></a>
+		<a data-toggle="tab" href="#invoice_tab" title="<?php echo lang('Config.invoice_configuration') ?>"><?php echo lang('Config.invoice') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#reward_tab" title="<?php echo $this->lang->line('config_reward_configuration'); ?>"><?php echo $this->lang->line('config_reward'); ?></a>
+		<a data-toggle="tab" href="#reward_tab" title="<?php echo lang('Config.reward_configuration') ?>"><?php echo lang('Config.reward') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#table_tab" title="<?php echo $this->lang->line('config_table_configuration'); ?>"><?php echo $this->lang->line('config_table'); ?></a>
+		<a data-toggle="tab" href="#table_tab" title="<?php echo lang('Config.table_configuration') ?>"><?php echo lang('Config.table') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#system_tab" title="<?php echo $this->lang->line('config_system_conf'); ?>"><?php echo $this->lang->line('config_system_conf'); ?></a>
+		<a data-toggle="tab" href="#system_tab" title="<?php echo lang('Config.system_conf') ?>"><?php echo lang('Config.system_conf') ?></a>
 	</li>
 </ul>
 
 <div class="tab-content">
 	<div class="tab-pane fade in active" id="info_tab">
-		<?php $this->load->view("configs/info_config"); ?>
+		<?php echo view('configs/info_config') ?>
 	</div>
 	<div class="tab-pane" id="general_tab">
-		<?php $this->load->view("configs/general_config"); ?>
+		<?php echo view('configs/general_config') ?>
 	</div>
 	<div class="tab-pane" id="tax_tab">
-		<?php $this->load->view("configs/tax_config"); ?>
+		<?php echo view('configs/tax_config') ?>
 	</div>
 	<div class="tab-pane" id="locale_tab">
-		<?php $this->load->view("configs/locale_config"); ?>
+		<?php echo view('configs/locale_config') ?>
 	</div>
 	<div class="tab-pane" id="barcode_tab">
-		<?php $this->load->view("configs/barcode_config"); ?>
+		<?php echo view('configs/barcode_config') ?>
 	</div>
 	<div class="tab-pane" id="stock_tab">
-		<?php $this->load->view("configs/stock_config"); ?>
+		<?php echo view('configs/stock_config') ?>
 	</div>
 	<div class="tab-pane" id="receipt_tab">
-		<?php $this->load->view("configs/receipt_config"); ?>
+		<?php echo view('configs/receipt_config') ?>
 	</div>
 	<div class="tab-pane" id="invoice_tab">
-		<?php $this->load->view("configs/invoice_config"); ?>
+		<?php echo view('configs/invoice_config') ?>
 	</div>
 	<div class="tab-pane" id="reward_tab">
-		<?php $this->load->view("configs/reward_config"); ?>
+		<?php echo view('configs/reward_config') ?>
 	</div>
 	<div class="tab-pane" id="table_tab">
-		<?php $this->load->view("configs/table_config"); ?>
+		<?php echo view('configs/table_config') ?>
 	</div>
 	<div class="tab-pane" id="system_tab">
-		<?php $this->load->view("configs/system_config"); ?>
+		<?php echo view('configs/system_config') ?>
 	</div>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/configs/message_config.php b/app/Views/configs/message_config.php
old mode 100755
new mode 100644
index 225141d5a..0001316cf
--- a/app/Views/configs/message_config.php
+++ b/app/Views/configs/message_config.php
@@ -1,71 +1,76 @@
-<?php echo form_open('config/save_message/', array('id' => 'message_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal')); ?>
+<?php echo form_open('config/save_message/', ['id' => 'message_config_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="message_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_msg_uid'), 'msg_uid', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.msg_uid'), 'msg_uid', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'msg_uid',
 							'id' => 'msg_uid',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('msg_uid'))); ?>
+							'value' => esc(config('OSPOS')->msg_uid, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_msg_pwd'), 'msg_pwd', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.msg_pwd'), 'msg_pwd', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-						<?php echo form_password(array(
+						<?php echo form_password ([
 							'name' => 'msg_pwd',
 							'id' => 'msg_pwd',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('msg_pwd'))); ?>
+							'value' => esc(config('OSPOS')->msg_pwd, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 			
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_msg_src'), 'msg_src', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.msg_src'), 'msg_src', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class="col-xs-4">
 					<div class="input-group">
 						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-bullhorn"></span></span>
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'name' => 'msg_src',
 							'id' => 'msg_src',
 							'class' => 'form-control input-sm required',
-							'value'=>$this->config->item('msg_src') == NULL ? $this->config->item('company') : $this->config->item('msg_src')));?>
+							'value' => config('OSPOS')->msg_src == NULL ? esc(config('OSPOS')->company, 'attr') : esc(config('OSPOS')->msg_src, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 			
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_msg_msg'), 'msg_msg', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.msg_msg'), 'msg_msg', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_textarea(array(
+					<?php echo form_textarea ([
 						'name' => 'msg_msg',
 						'id' => 'msg_msg',
 						'class' => 'form-control input-sm',
-						'value'=>$this->config->item('msg_msg'),
-						'placeholder'=>$this->lang->line('config_msg_msg_placeholder')));?>
+						'value' => config('OSPOS')->msg_msg,
+						'placeholder' => lang('Config.msg_msg_placeholder')
+					]) ?>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_message',
 				'id' => 'submit_message',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -84,9 +89,9 @@ $(document).ready(function()
 
 		messages: 
 		{
-			msg_uid: "<?php echo $this->lang->line('config_msg_uid_required'); ?>",
-			msg_pwd: "<?php echo $this->lang->line('config_msg_pwd_required'); ?>",
-			msg_src: "<?php echo $this->lang->line('config_msg_src_required'); ?>"
+			msg_uid: "<?php echo lang('Config.msg_uid_required') ?>",
+			msg_pwd: "<?php echo lang('Config.msg_pwd_required') ?>",
+			msg_src: "<?php echo lang('Config.msg_src_required') ?>"
 		}
 	}));
 });
diff --git a/app/Views/configs/receipt_config.php b/app/Views/configs/receipt_config.php
index fc37eb435..c426de925 100644
--- a/app/Views/configs/receipt_config.php
+++ b/app/Views/configs/receipt_config.php
@@ -1,305 +1,329 @@
-<?php echo form_open('config/save_receipt/', array('id' => 'receipt_config_form', 'class' => 'form-horizontal')); ?>
+<?php echo form_open('config/save_receipt/', ['id' => 'receipt_config_form', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="receipt_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_template'), 'receipt_template', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_template'), 'receipt_template', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('receipt_template', array(
-						'receipt_default' => $this->lang->line('config_receipt_default'),
-						'receipt_short' => $this->lang->line('config_receipt_short')
-					),
-					$this->config->item('receipt_template'), array('class' => 'form-control input-sm'));
-					?>
+					<?php echo form_dropdown(
+						'receipt_template', [
+							'receipt_default' => lang('Config.receipt_default'),
+							'receipt_short' => lang('Config.receipt_short')
+						],
+						esc(config('OSPOS')->receipt_template, 'attr'),
+						['class' => 'form-control input-sm']
+					) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_font_size'), 'receipt_font_size', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.receipt_font_size'), 'receipt_font_size', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '20',
 							'name' => 'receipt_font_size',
 							'id' => 'receipt_font_size',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('receipt_font_size'))); ?>
+							'value' => config('OSPOS')->receipt_font_size
+						]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_delay_autoreturn'), 'print_delay_autoreturn', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.print_delay_autoreturn'), 'print_delay_autoreturn', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '30',
 							'name' => 'print_delay_autoreturn',
 							'id' => 'print_delay_autoreturn',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('print_delay_autoreturn'))); ?>
+							'value' => config('OSPOS')->print_delay_autoreturn
+						]) ?>
 						<span class="input-group-addon input-sm">s</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_email_receipt_check_behaviour'), 'email_receipt_check_behaviour', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.email_receipt_check_behaviour'), 'email_receipt_check_behaviour', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-8'>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'email_receipt_check_behaviour',
 							'value' => 'always',
-							'checked' => $this->config->item('email_receipt_check_behaviour') == 'always')); ?>
-						<?php echo $this->lang->line('config_email_receipt_check_behaviour_always'); ?>
+							'checked' => config('OSPOS')->email_receipt_check_behaviour == 'always'
+						]) ?>
+						<?php echo lang('Config.email_receipt_check_behaviour_always') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'email_receipt_check_behaviour',
 							'value' => 'never',
-							'checked' => $this->config->item('email_receipt_check_behaviour') == 'never')); ?>
-						<?php echo $this->lang->line('config_email_receipt_check_behaviour_never'); ?>
+							'checked' => config('OSPOS')->email_receipt_check_behaviour == 'never'
+						]) ?>
+						<?php echo lang('Config.email_receipt_check_behaviour_never') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'email_receipt_check_behaviour',
 							'value' => 'last',
-							'checked' => $this->config->item('email_receipt_check_behaviour') == 'last')); ?>
-						<?php echo $this->lang->line('config_email_receipt_check_behaviour_last'); ?>
+							'checked' => config('OSPOS')->email_receipt_check_behaviour == 'last'
+						]) ?>
+						<?php echo lang('Config.email_receipt_check_behaviour_last') ?>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_receipt_check_behaviour'), 'print_receipt_check_behaviour', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.print_receipt_check_behaviour'), 'print_receipt_check_behaviour', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-8'>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'print_receipt_check_behaviour',
 							'value' => 'always',
-							'checked' => $this->config->item('print_receipt_check_behaviour') == 'always')); ?>
-						<?php echo $this->lang->line('config_print_receipt_check_behaviour_always'); ?>
+							'checked' => config('OSPOS')->print_receipt_check_behaviour == 'always'
+						]) ?>
+						<?php echo lang('Config.print_receipt_check_behaviour_always') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'print_receipt_check_behaviour',
 							'value' => 'never',
-							'checked' => $this->config->item('print_receipt_check_behaviour') == 'never')); ?>
-						<?php echo $this->lang->line('config_print_receipt_check_behaviour_never'); ?>
+							'checked' => config('OSPOS')->print_receipt_check_behaviour == 'never'
+						]) ?>
+						<?php echo lang('Config.print_receipt_check_behaviour_never') ?>
 					</label>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
+						<?php echo form_radio ([
 							'name' => 'print_receipt_check_behaviour',
 							'value' => 'last',
-							'checked' => $this->config->item('print_receipt_check_behaviour') == 'last')); ?>
-						<?php echo $this->lang->line('config_print_receipt_check_behaviour_last'); ?>
+							'checked' => config('OSPOS')->print_receipt_check_behaviour == 'last'
+						]) ?>
+						<?php echo lang('Config.print_receipt_check_behaviour_last') ?>
 					</label>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_company_name'), 'receipt_show_company_name', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_company_name'), 'receipt_show_company_name', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_company_name',
 						'value' => 'receipt_show_company_name',
 						'id' => 'receipt_show_company_name',
-						'checked' => $this->config->item('receipt_show_company_name'))); ?>
+						'checked' => config('OSPOS')->receipt_show_company_name
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_taxes'), 'receipt_show_taxes', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_taxes'), 'receipt_show_taxes', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_taxes',
 						'value' => 'receipt_show_taxes',
 						'id' => 'receipt_show_taxes',
-						'checked' => $this->config->item('receipt_show_taxes'))); ?>
+						'checked' => config('OSPOS')->receipt_show_taxes
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_tax_ind'), 'receipt_show_tax_ind', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_tax_ind'), 'receipt_show_tax_ind', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_tax_ind',
 						'value' => 'receipt_show_tax_ind',
 						'id' => 'receipt_show_tax_ind',
-						'checked' => $this->config->item('receipt_show_tax_ind'))); ?>
+						'checked' => config('OSPOS')->receipt_show_tax_ind
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_total_discount'), 'receipt_show_total_discount', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_total_discount'), 'receipt_show_total_discount', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_total_discount',
 						'value' => 'receipt_show_total_discount',
 						'id' => 'receipt_show_total_discount',
-						'checked' => $this->config->item('receipt_show_total_discount'))); ?>
+						'checked' => config('OSPOS')->receipt_show_total_discount
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_description'), 'receipt_show_description', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_description'), 'receipt_show_description', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_description',
 						'value' => 'receipt_show_description',
 						'id' => 'receipt_show_description',
-						'checked' => $this->config->item('receipt_show_description'))); ?>
+						'checked' => config('OSPOS')->receipt_show_description
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_show_serialnumber'), 'receipt_show_serialnumber', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_show_serialnumber'), 'receipt_show_serialnumber', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'receipt_show_serialnumber',
 						'value' => 'receipt_show_serialnumber',
 						'id' => 'receipt_show_serialnumber',
-						'checked' => $this->config->item('receipt_show_serialnumber'))); ?>
+						'checked' => config('OSPOS')->receipt_show_serialnumber
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_silently'), 'print_silently', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.print_silently'), 'print_silently', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'print_silently',
 						'id' => 'print_silently',
 						'value' => 'print_silently',
-						'checked' => $this->config->item('print_silently'))); ?>
+						'checked' => config('OSPOS')->print_silently
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_header'), 'print_header', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.print_header'), 'print_header', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'print_header',
 						'id' => 'print_header',
 						'value' => 'print_header',
-						'checked' => $this->config->item('print_header'))); ?>
+						'checked' => config('OSPOS')->print_header
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_footer'), 'print_footer', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.print_footer'), 'print_footer', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'print_footer',
 						'id' => 'print_footer',
 						'value' => 'print_footer',
-						'checked' => $this->config->item('print_footer'))); ?>
+						'checked' => config('OSPOS')->print_footer
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_receipt_printer'), 'config_receipt_printer', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.receipt_printer'), 'config_receipt_printer', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('receipt_printer',	array(), ' ', 'id="receipt_printer" class="form-control"'); ?>
+					<?php echo form_dropdown('receipt_printer', array(), ' ', 'id="receipt_printer" class="form-control"') ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_invoice_printer'), 'config_invoice_printer', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.invoice_printer'), 'config_invoice_printer', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('invoice_printer', array(), ' ', 'id="invoice_printer" class="form-control"'); ?>
+					<?php echo form_dropdown('invoice_printer', [], ' ', 'id="invoice_printer" class="form-control"') ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_takings_printer'), 'config_takings_printer', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.takings_printer'), 'config_takings_printer', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('takings_printer', array(), ' ', 'id="takings_printer" class="form-control"'); ?>
+					<?php echo form_dropdown('takings_printer', [], ' ', 'id="takings_printer" class="form-control"') ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_top_margin'), 'print_top_margin', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.print_top_margin'), 'print_top_margin', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '20',
 							'name' => 'print_top_margin',
 							'id' => 'print_top_margin',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('print_top_margin'))); ?>
+							'value' => config('OSPOS')->print_top_margin
+						]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_left_margin'), 'print_left_margin', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.print_left_margin'), 'print_left_margin', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '20',
 							'name' => 'print_left_margin',
 							'id' => 'print_left_margin',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('print_left_margin'))); ?>
+							'value' => config('OSPOS')->print_left_margin
+						]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_bottom_margin'), 'print_bottom_margin', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.print_bottom_margin'), 'print_bottom_margin', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '20',
 							'name' => 'print_bottom_margin',
 							'id' => 'print_bottom_margin',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('print_bottom_margin'))); ?>
+							'value' => config('OSPOS')->print_bottom_margin
+						]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_print_right_margin'), 'print_right_margin', array('class' => 'control-label col-xs-2 required')); ?>
+				<?php echo form_label(lang('Config.print_right_margin'), 'print_right_margin', ['class' => 'control-label col-xs-2 required']) ?>
 				<div class='col-xs-2'>
 					<div class="input-group">
-						<?php echo form_input(array(
+						<?php echo form_input ([
 							'type' => 'number',
 							'min' => '0',
 							'max' => '20',
 							'name' => 'print_right_margin',
 							'id' => 'print_right_margin',
 							'class' => 'form-control input-sm required',
-							'value' => $this->config->item('print_right_margin'))); ?>
+							'value' => config('OSPOS')->print_right_margin
+						]) ?>
 						<span class="input-group-addon input-sm">px</span>
 					</div>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_receipt',
 				'id' => 'submit_receipt',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
 		</fieldset>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -337,7 +361,7 @@ $(document).ready(function()
 		submitHandler: function(form) {
 			$(form).ajaxSubmit({
 				beforeSerialize: function(arr, $form, options) {
-					return ( dialog_confirmed || confirm('<?php echo $this->lang->line('config_jsprintsetup_required'); ?>') );
+					return ( dialog_confirmed || confirm('<?php echo lang('Config.jsprintsetup_required') ?>') );
 				},
 				success: function(response) {
 					$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -386,33 +410,33 @@ $(document).ready(function()
 		{
 			print_top_margin:
 			{
-				required:"<?php echo $this->lang->line('config_print_top_margin_required'); ?>",
-				number:"<?php echo $this->lang->line('config_print_top_margin_number'); ?>"
+				required:"<?php echo lang('Config.print_top_margin_required') ?>",
+				number:"<?php echo lang('Config.print_top_margin_number') ?>"
 			},
 			print_left_margin:
 			{
-				required:"<?php echo $this->lang->line('config_print_left_margin_required'); ?>",
-				number:"<?php echo $this->lang->line('config_print_left_margin_number'); ?>"
+				required:"<?php echo lang('Config.print_left_margin_required') ?>",
+				number:"<?php echo lang('Config.print_left_margin_number') ?>"
 			},
 			print_bottom_margin:
 			{
-				required:"<?php echo $this->lang->line('config_print_bottom_margin_required'); ?>",
-				number:"<?php echo $this->lang->line('config_print_bottom_margin_number'); ?>"
+				required:"<?php echo lang('Config.print_bottom_margin_required') ?>",
+				number:"<?php echo lang('Config.print_bottom_margin_number') ?>"
 			},
 			print_right_margin:
 			{
-				required:"<?php echo $this->lang->line('config_print_right_margin_required'); ?>",
-				number:"<?php echo $this->lang->line('config_print_right_margin_number'); ?>"
+				required:"<?php echo lang('Config.print_right_margin_required') ?>",
+				number:"<?php echo lang('Config.print_right_margin_number') ?>"
 			},
 			receipt_font_size:
 			{
-				required:"<?php echo $this->lang->line('config_receipt_font_size_required'); ?>",
-				number:"<?php echo $this->lang->line('config_receipt_font_size_number'); ?>"
+				required:"<?php echo lang('Config.receipt_font_size_required') ?>",
+				number:"<?php echo lang('Config.receipt_font_size_number') ?>"
 			},
 			print_delay_autoreturn:
 			{
-				required:"<?php echo $this->lang->line('config_print_delay_autoreturn_required'); ?>",
-				number:"<?php echo $this->lang->line('config_print_delay_autoreturn_number'); ?>"
+				required:"<?php echo lang('Config.print_delay_autoreturn_required') ?>",
+				number:"<?php echo lang('Config.print_delay_autoreturn_number') ?>"
 			}
 		}
 	}));
diff --git a/app/Views/configs/reward_config.php b/app/Views/configs/reward_config.php
index bc4922679..9b67cebab 100644
--- a/app/Views/configs/reward_config.php
+++ b/app/Views/configs/reward_config.php
@@ -1,32 +1,39 @@
-<?php echo form_open('config/save_rewards/', array('id' => 'reward_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $customer_rewards
+ */
+?>
+<?php echo form_open('config/save_rewards/', ['id' => 'reward_config_form', 'class' => 'form-horizontal']) ?>
     <div id="config_wrapper">
         <fieldset id="config_info">
-            <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+            <div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
             <ul id="reward_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_customer_reward_enable'), 'customer_reward_enable', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.customer_reward_enable'), 'customer_reward_enable', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'customer_reward_enable',
 						'value' => 'customer_reward_enable',
 						'id' => 'customer_reward_enable',
-						'checked' => $this->config->item('customer_reward_enable')));?>
+						'checked' => config('OSPOS')->customer_reward_enable
+					]) ?>
 				</div>
 			</div>
 
             <div id="customer_rewards">
-				<?php $this->load->view('partial/customer_rewards', array('customer_rewards' => $customer_rewards)); ?>
+				<?php echo view('partial/customer_rewards', ['customer_rewards' => $customer_rewards]) ?>
 			</div>
             
-            <?php echo form_submit(array(
+            <?php echo form_submit ([
                 'name' => 'submit_reward',
                 'id' => 'submit_reward',
-                'value' => $this->lang->line('common_submit'),
-                'class' => 'btn btn-primary btn-sm pull-right')); ?>
+                'value' => lang('Common.submit'),
+                'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
         </fieldset>
     </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -43,14 +50,14 @@ $(document).ready(function()
 		}
 		else
 		{
-			$(".add_customer_reward, .remove_customer_reward").hide();	
+			$(".add_customer_reward, .remove_customer_reward").hide();
 		}
 		return arguments.callee;
 	})();
 
 	$("#customer_reward_enable").change(enable_disable_customer_reward_enable);
 
-	var table_count = <?php echo sizeof($customer_rewards); ?>;
+	var table_count = <?php echo sizeof($customer_rewards) ?>;
 
 	var hide_show_remove = function() {
 		if ($("input[name*='customer_rewards']:enabled").length > 1)
@@ -72,7 +79,7 @@ $(document).ready(function()
 		var new_block = block.insertAfter($(this).parent());
 		var new_block_id = 'customer_reward_' + ++id;
 		var new_block_id_next = 'reward_points_' + id;
-		$(new_block).find('label').html("<?php echo $this->lang->line('config_customer_reward'); ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
+		$(new_block).find('label').html("<?php echo lang('Config.customer_reward') ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
 		$(new_block).find("input[id='"+previous_id+"']").attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
 		$(new_block).find("input[id='"+previous_id_next+"']").attr('id', new_block_id_next).removeAttr('disabled').attr('name', new_block_id_next).attr('class', 'form-control input-sm').val('');
 		hide_show_remove();
@@ -100,11 +107,11 @@ $(document).ready(function()
 			value_count = $(this).val() == value ? value_count + 1 : value_count; 
 		});
 		return value_count < 2;
-    }, "<?php echo $this->lang->line('config_customer_reward_duplicate'); ?>");
+    }, "<?php echo lang('Config.customer_reward_duplicate') ?>");
 
     $.validator.addMethod('valid_chars', function(value, element) {
 		return value.indexOf('_') === -1;
-    }, "<?php echo $this->lang->line('config_customer_reward_invalid_chars'); ?>");
+    }, "<?php echo lang('Config.customer_reward_invalid_chars') ?>");
 	
 	$('#reward_config_form').validate($.extend(form_support.handler, {
 		submitHandler: function(form) {
@@ -115,7 +122,7 @@ $(document).ready(function()
 				},
 				success: function(response)	{
 					$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-					$("#customer_rewards").load('<?php echo site_url("config/ajax_customer_rewards"); ?>', init_add_remove_tables);
+					$("#customer_rewards").load('<?php echo site_url("config/ajax_customer_rewards") ?>', init_add_remove_tables);
 				},
 				dataType: 'json'
 			});
@@ -150,7 +157,7 @@ $(document).ready(function()
 			foreach($customer_rewards as $customer_reward=>$table)
 			{
 			?>
-				<?php echo 'customer_reward_' . ++$i ?>: "<?php echo $this->lang->line('config_customer_reward_required'); ?>",
+				<?php echo 'customer_reward_' . ++$i ?>: "<?php echo lang('Config.customer_reward_required') ?>",
 			<?php
 			}
 			?>
diff --git a/app/Views/configs/stock_config.php b/app/Views/configs/stock_config.php
index ca65824bd..77b6f8136 100644
--- a/app/Views/configs/stock_config.php
+++ b/app/Views/configs/stock_config.php
@@ -1,27 +1,33 @@
-<?php echo form_open('config/save_locations/', array('id' => 'location_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $stock_locations
+ */
+?>
+<?php echo form_open('config/save_locations/', ['id' => 'location_config_form', 'class' => 'form-horizontal']) ?>
     <div id="config_wrapper">
         <fieldset id="config_info">
-            <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+            <div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
             <ul id="stock_error_message_box" class="error_message_box"></ul>
 
             <div id="stock_locations">
-				<?php $this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations)); ?>
+				<?php echo view('partial/stock_locations', ['stock_locations' => $stock_locations]) ?>
 			</div>
             
-            <?php echo form_submit(array(
+            <?php echo form_submit ([
                 'name' => 'submit_stock',
                 'id' => 'submit_stock',
-                'value' => $this->lang->line('common_submit'),
-                'class' => 'btn btn-primary btn-sm pull-right')); ?>
+                'value' => lang('Common.submit'),
+                'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
         </fieldset>
     </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
 {
-	var location_count = <?php echo sizeof($stock_locations); ?>;
+	var location_count = <?php echo sizeof($stock_locations) ?>;
 
 	var hide_show_remove = function() {
 		if ($("input[name*='stock_location']:enabled").length > 1)
@@ -38,7 +44,7 @@ $(document).ready(function()
 		var block = $(this).parent().clone(true);
 		var new_block = block.insertAfter($(this).parent());
 		var new_block_id = 'stock_location[]';
-		$(new_block).find('label').html("<?php echo $this->lang->line('config_stock_location'); ?> " + ++location_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
+		$(new_block).find('label').html("<?php echo lang('Config.stock_location') ?> " + ++location_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
 		$(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
 		hide_show_remove();
 	};
@@ -63,18 +69,18 @@ $(document).ready(function()
 			value_count = $(this).val() == value ? value_count + 1 : value_count; 
 		});
 		return value_count < 2;
-    }, "<?php echo $this->lang->line('config_stock_location_duplicate'); ?>");
+    }, "<?php echo lang('Config.stock_location_duplicate') ?>");
 
     $.validator.addMethod('valid_chars', function(value, element) {
 		return value.indexOf('_') === -1;
-    }, "<?php echo $this->lang->line('config_stock_location_invalid_chars'); ?>");
+    }, "<?php echo lang('Config.stock_location_invalid_chars') ?>");
 	
 	$('#location_config_form').validate($.extend(form_support.handler, {
 		submitHandler: function(form) {
 			$(form).ajaxSubmit({
 				success: function(response)	{
 					$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-					$("#stock_locations").load('<?php echo site_url("config/ajax_stock_locations"); ?>', init_add_remove_locations);
+					$("#stock_locations").load('<?php echo site_url("config/ajax_stock_locations") ?>', init_add_remove_locations);
 				},
 				dataType: 'json'
 			});
@@ -87,7 +93,7 @@ $(document).ready(function()
 			<?php
 			$i = 0;
 
-			foreach($stock_locations as $location=>$location_data)
+			foreach($stock_locations as $location => $location_data)
 			{
 			?>
 				<?php echo 'stock_location_' . ++$i ?>:
@@ -106,10 +112,10 @@ $(document).ready(function()
 			<?php
 			$i = 0;
 
-			foreach($stock_locations as $location=>$location_data)
+			foreach($stock_locations as $location => $location_data)
 			{
 			?>
-				<?php echo 'stock_location_' . ++$i ?>: "<?php echo $this->lang->line('config_stock_location_required'); ?>",
+				<?php echo 'stock_location_' . ++$i ?>: "<?php echo lang('Config.stock_location_required') ?>",
 			<?php
 			}
 			?>
diff --git a/app/Views/configs/system_config.php b/app/Views/configs/system_config.php
index bf9151170..d55f41b80 100644
--- a/app/Views/configs/system_config.php
+++ b/app/Views/configs/system_config.php
@@ -1,17 +1,17 @@
 <br>
 <div class="container-fluid">
 	<ul class="nav nav-tabs" id="myTabs" data-toggle="tab">
-		<li class="active"><a href="#system_tabs" data-toggle="tab" title="<?php echo $this->lang->line('config_system_conf'); ?>"><?php echo $this->lang->line('config_system_conf'); ?></a></li>
-		<li><a href="#email_tabs" data-toggle="tab" title="<?php echo $this->lang->line('config_email_configuration'); ?>"><?php echo $this->lang->line('config_email'); ?></a></li>
-		<li><a href="#message_tabs" data-toggle="tab" title="<?php echo $this->lang->line('config_message_configuration'); ?>"><?php echo $this->lang->line('config_message'); ?></a></li>
-		<li><a href="#integrations_tabs" data-toggle="tab" title="<?php echo $this->lang->line('config_integrations_configuration'); ?>"><?php echo $this->lang->line('config_integrations'); ?></a></li>
-		<li><a href="#license_tabs" data-toggle="tab" title="<?php echo $this->lang->line('config_license_configuration'); ?>"><?php echo $this->lang->line('config_license'); ?></a></li>
+		<li class="active"><a href="#system_tabs" data-toggle="tab" title="<?php echo lang('Config.system_conf') ?>"><?php echo lang('Config.system_conf') ?></a></li>
+		<li><a href="#email_tabs" data-toggle="tab" title="<?php echo lang('Config.email_configuration') ?>"><?php echo lang('Config.email') ?></a></li>
+		<li><a href="#message_tabs" data-toggle="tab" title="<?php echo lang('Config.message_configuration') ?>"><?php echo lang('Config.message') ?></a></li>
+		<li><a href="#integrations_tabs" data-toggle="tab" title="<?php echo lang('Config.integrations_configuration') ?>"><?php echo lang('Config.integrations') ?></a></li>
+		<li><a href="#license_tabs" data-toggle="tab" title="<?php echo lang('Config.license_configuration') ?>"><?php echo lang('Config.license') ?></a></li>
 	</ul>  
 		<div class="tab-content">
-		<div class="tab-pane active" id="system_tabs"><?php $this->load->view("configs/system_info"); ?></div>
-		<div class="tab-pane" id="email_tabs"><?php $this->load->view("configs/email_config"); ?></div>
-		<div class="tab-pane" id="message_tabs"><?php $this->load->view("configs/message_config"); ?></div>
-		<div class="tab-pane" id="integrations_tabs"><?php $this->load->view("configs/integrations_config"); ?></div>
-		<div class="tab-pane" id="license_tabs"><br><?php $this->load->view("configs/license_config"); ?></div>
+		<div class="tab-pane active" id="system_tabs"><?php echo view('configs/system_info') ?></div>
+		<div class="tab-pane" id="email_tabs"><?php echo view('configs/email_config') ?></div>
+		<div class="tab-pane" id="message_tabs"><?php echo view('configs/message_config') ?></div>
+		<div class="tab-pane" id="integrations_tabs"><?php echo view('configs/integrations_config') ?></div>
+		<div class="tab-pane" id="license_tabs"><br><?php echo view('configs/license_config') ?></div>
 	</div>
 </div>
diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php
index 5d8a7bea7..6e690a802 100644
--- a/app/Views/configs/system_info.php
+++ b/app/Views/configs/system_info.php
@@ -1,4 +1,4 @@
-<style type="text/css">
+<style>
 	 a:hover {
 	  cursor:pointer;
 }
@@ -6,36 +6,35 @@
   visibility: hidden;
 }
 </style>
-</style>
-<script type="text/javascript" src="js/clipboard.min.js"></script>
+</style><script type="text/javascript" src="js/clipboard.min.js"></script>
 <div id="config_wrapper" class="col-sm-12">
-	<?php echo $this->lang->line('config_server_notice'); ?>
+	<?php echo lang('Config.server_notice') ?>
 	<div class="container">
 		<div class="row">
-			<div class="col-sm-2" align="left"><br>
+			<div class="col-sm-2" style="text-align: left;"><br>
 			<p style="min-height:14.7em;"><strong>General Info </p> 
 			<p style="min-height:9.9em;">User Setup</p><br> 
 			<p>Permissions</p></strong>
 			</div> 
-			<div class="col-sm-8" id="issuetemplate" align="left"><br>
-				<?php echo $this->lang->line('config_ospos_info') . ':'; ?>
-				<?php echo $this->config->item('application_version'); ?> - <?php echo substr($this->config->item('commit_sha1'), 0, 6); ?><br>
-				Language Code: <?php echo current_language_code(); ?><br><br>
+			<div class="col-sm-8" id="issuetemplate" style="text-align: left;"><br>
+				<?php echo lang('Config.ospos_info') . ':' ?>
+				<?php echo esc(config('OSPOS')->application_version) ?> - <?php echo esc(substr(config('OSPOS')->commit_sha1, 0, 6)) ?><br>
+				Language Code: <?php echo current_language_code() ?><br><br>
 				<div id="TimeError"></div>
 				Extensions & Modules:<br>
 					<?php 
-						echo "&#187; GD: ", extension_loaded('gd') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';
-						echo "&#187; BC Math: ", extension_loaded('bcmath') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';
-						echo "&#187; INTL: ", extension_loaded('intl') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';
-						echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';
-						echo "&#187; MBString: ", extension_loaded('mbstring') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';
-						echo "&#187; Curl: ", extension_loaded('curl') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br>';		
+						echo "&#187; GD: ", extension_loaded('gd') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
+						echo "&#187; BC Math: ", extension_loaded('bcmath') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
+						echo "&#187; INTL: ", extension_loaded('intl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
+						echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
+						echo "&#187; MBString: ", extension_loaded('mbstring') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
+						echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br> <br>';
 						echo "&#187; Xml: ", extension_loaded('xml') ? '<font color="green">Enabled &#x2713</font>' : '<font color="red">Disabled &#x2717</font>', '<br> <br>';		
 					?>
 				User Configuration:<br>
 				.Browser:
 					<?php
-						function get_browser_name($user_agent)
+						function get_browser_name(string $user_agent): string
 						{
 							if (strpos($user_agent, 'Opera') || strpos($user_agent, 'OPR/')) return 'Opera';
 							elseif (strpos($user_agent, 'Edge')) return 'Edge';
@@ -45,115 +44,153 @@
 							elseif (strpos($user_agent, 'MSIE') || strpos($user_agent, 'Trident/7')) return 'Internet Explorer';
 							return 'Other';
 						}
-						 echo get_browser_name($_SERVER['HTTP_USER_AGENT']); 
+						 echo esc(get_browser_name($_SERVER['HTTP_USER_AGENT']));
 					?><br>
-				.Server Software: <?php echo $_SERVER['SERVER_SOFTWARE']; ?><br>
-				.PHP Version: <?php echo PHP_VERSION; ?><br>
-				.DB Version: <?php echo mysqli_get_server_info($this->db->conn_id); ?><br>
-				.Server Port: <?php echo $_SERVER['SERVER_PORT']; ?><br>
-				.OS: <?php echo php_uname('s') .' '. php_uname('r');?><br><br>
+				.Server Software: <?php echo esc($_SERVER['SERVER_SOFTWARE']) ?><br>
+				.PHP Version: <?php echo PHP_VERSION ?><br>
+				.DB Version: <?php echo esc(mysqli_get_server_info($this->db->conn_id)) ?><br>
+				.Server Port: <?php echo esc($_SERVER['SERVER_PORT']) ?><br>
+				.OS: <?php echo php_uname('s') .' '. php_uname('r') ?><br><br>
 				File Permissions:<br>
 						&#187; [application/logs:]
 						<?php $logs = '../application/logs/'; 
 							$uploads = '../public/uploads/'; 
 							$images = '../public/uploads/item_pics/'; 
 							$import = '../import_items.csv';
-							$importcustomers = '../import_customers.csv';
+							$importcustomers = '../import_customers.csv';	//TODO: This variable does not follow naming conventions for the project.
 							
-							if (is_writable($logs)) {
-								echo ' -  ' . substr(sprintf("%o",fileperms($logs)),-4) . ' |  ' . '<font color="green">  Writable &#x2713 </font>';
-							} else {
-								echo ' -  ' . substr(sprintf("%o",fileperms($logs)),-4) . ' |  ' . '<font color="red">	Not Writable &#x2717 </font>';						
+							if(is_writable($logs))
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($logs)),-4) . ' |  ' . '<span style="color: green;">  Writable &#x2713 </span>';
 							}
+							else
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($logs)),-4) . ' |  ' . '<span style="color: red;">	Not Writable &#x2717 </span>';
+							}
+
 							clearstatcache();
-							if (is_writable($logs) && substr(decoct(fileperms($logs)), -4) != 750  ) {
-								echo ' | <font color="red">Vulnerable or Incorrect Permissions &#x2717</font>';
-							} else {
-								echo ' | <font color="green">Security Check Passed &#x2713 </font>';						
+							if(is_writable($logs) && substr(decoct(fileperms($logs)), -4) != 750  )
+							{
+								echo ' | <span style="color: red;">Vulnerable or Incorrect Permissions &#x2717</span>';
+							}
+							else
+							{
+								echo ' | <span style="color: green;">Security Check Passed &#x2713</span>';
 							}	
 							clearstatcache();
 						?>
 						<br>
 						&#187; [public/uploads:]
 						<?php
-							if (is_writable($uploads)) {
-								echo ' -  ' . substr(sprintf("%o",fileperms($uploads)),-4) . ' |  ' . '<font color="green">	 Writable &#x2713 </font>';
-							} else {
-								echo ' -  ' . substr(sprintf("%o",fileperms($uploads)),-4) . ' |  ' . '<font color="red"> Not Writable &#x2717 </font>';
+							if(is_writable($uploads))
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($uploads)),-4) . ' |  ' . '<span style="color: green;">	 Writable &#x2713 </span>';
 							}
+							else
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($uploads)),-4) . ' |  ' . '<span style="color: red;"> Not Writable &#x2717 </span>';
+							}
+
 							clearstatcache();
-							if (is_writable($uploads) && substr(decoct(fileperms($uploads)), -4) != 750  ) {
-								echo ' | <font color="red">Vulnerable or Incorrect Permissions &#x2717</font>';
+							if(is_writable($uploads) && substr(decoct(fileperms($uploads)), -4) != 750  ) {
+								echo ' | <span style="color: red;">Vulnerable or Incorrect Permissions &#x2717</span>';
 							} else {
-								echo ' |  <font color="green">Security Check Passed &#x2713 </font>';						
+								echo ' |  <span style="color: green;">Security Check Passed &#x2713 </span>';
 							}	
 							clearstatcache();
 						?>
 						<br>
 						&#187; [public/uploads/item_pics:]	
 						<?php 
-							if (is_writable($images)) {
-								echo ' -  ' . substr(sprintf("%o",fileperms($images)),-4) . ' |	 ' . '<font color="green"> Writable &#x2713 </font>';
-							} else {
-								echo ' -  ' . substr(sprintf("%o",fileperms($images)),-4) . ' |	 ' . '<font color="red"> Not Writable &#x2717 </font>';
+							if (is_writable($images))
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($images)),-4) . ' |	 ' . '<span style="color: green;"> Writable &#x2713 </span>';
+							}
+							else
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($images)),-4) . ' |	 ' . '<span style="color: red;"> Not Writable &#x2717 </span>';
 							} 
+
 							clearstatcache();
-							if (substr(decoct(fileperms($images)), -4) != 750  ) {
-								echo ' | <font color="red">Vulnerable or Incorrect Permissions &#x2717</font>';
-							} else {
-								echo ' | <font color="green">Security Check Passed &#x2713 </font>';						
-							}	
+							if (substr(decoct(fileperms($images)), -4) != 750  )
+							{
+								echo ' | <span style="color: red;">Vulnerable or Incorrect Permissions &#x2717</span>';
+							}
+							else
+							{
+								echo ' | <span style="color: green;">Security Check Passed &#x2713 </span>';
+							}
 							clearstatcache();
 						?>
 						<br>
 						&#187; [import_customers.csv:]
 						<?php 
-							if (is_readable($importcustomers)) {
-								echo ' -  ' . substr(sprintf("%o",fileperms($importcustomers)),-4) . ' |  ' . '<font color="green">	 Readable &#x2713 </font>';
-							} else {
-								echo ' -  ' . substr(sprintf("%o",fileperms($importcustomers)),-4) . ' |  ' . '<font color="red"> Not Readable &#x2717 </font>';
+							if (is_readable($importcustomers))
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($importcustomers)),-4) . ' |  ' . '<span style="color: green;">	 Readable &#x2713 </span>';
+							}
+							else
+							{
+								echo ' -  ' . substr(sprintf("%o",fileperms($importcustomers)),-4) . ' |  ' . '<span style="color: red;"> Not Readable &#x2717 </span>';
+							}
+							clearstatcache();
+
+							if (!((substr(decoct(fileperms($importcustomers)), -4) == 640) || (substr(decoct(fileperms($importcustomers)), -4) == 660) ))
+							{
+								echo ' | <span style="color: red;">Vulnerable or Incorrect Permissions &#x2717</span>';
+							}
+							else
+							{
+								echo ' | <span style="color: green;">Security Check Passed &#x2713 </span>';
 							}
-							clearstatcache(); 
-							if (!((substr(decoct(fileperms($importcustomers)), -4) == 640) || (substr(decoct(fileperms($importcustomers)), -4) == 660) )) {
-								echo ' | <font color="red">Vulnerable or Incorrect Permissions &#x2717</font>';
-							} else {
-								echo ' | <font color="green">Security Check Passed &#x2713 </font>';						
-							}	
 							clearstatcache();
 						?>
 						<br>
 						<?php
-					
-						if(!((substr(decoct(fileperms($logs)), -4) == 750) && (substr(decoct(fileperms($uploads)), -4) == 750) && (substr(decoct(fileperms($images)), -4) == 750) 
-                             && ((substr(decoct(fileperms($importcustomers)), -4) == 640) || (substr(decoct(fileperms($importcustomers)), -4) == 660)))) {
-							echo '<br><font color="red"><strong>' . $this->lang->line('config_security_issue') . '</strong> <br>' . $this->lang->line('config_perm_risk') . '</font><br>';
-						} 
-						else { 
-							echo '<br><font color="green">' . $this->lang->line('config_no_risk') . '</strong> <br> </font>';
-						}
-						if(substr(decoct(fileperms($logs)), -4) != 750) {
-							echo '<br><font color="red"> &#187; [application/logs:] ' . $this->lang->line('config_is_writable') . '</font>';						
-						}
-						if(substr(decoct(fileperms($uploads)), -4) != 750) {
-							echo '<br><font color="red"> &#187; [public/uploads:] ' . $this->lang->line('config_is_writable') . '</font>';						
-						}
-						if(substr(decoct(fileperms($images)), -4) != 750) {
-							echo '<br><font color="red"> &#187; [public/uploads/item_pics:] ' . $this->lang->line('config_is_writable') . '</font>';						
-						}
-						if(!((substr(decoct(fileperms($importcustomers)), -4) == 640) || (substr(decoct(fileperms($importcustomers)), -4) == 660))) {
-							echo '<br><font color="red"> &#187; [import_customers.csv:] ' . $this->lang->line('config_is_readable') . '</font>';
-						}
+							if(!((substr(decoct(fileperms($logs)), -4) == 750)
+								&& (substr(decoct(fileperms($uploads)), -4) == 750)
+								&& (substr(decoct(fileperms($images)), -4) == 750)
+								&& ((substr(decoct(fileperms($importcustomers)), -4) == 640)
+									|| (substr(decoct(fileperms($importcustomers)), -4) == 660))))
+							{
+								echo '<br><span style="color: red;"><strong>' . lang('Config.security_issue') . '</strong> <br>' . lang('Config.perm_risk') . '</span><br>';
+							}
+							else
+							{
+								echo '<br><span style="color: green;">' . lang('Config.no_risk') . '</strong> <br> </span>';
+							}
+
+							if(substr(decoct(fileperms($logs)), -4) != 750)
+							{
+								echo '<br><span style="color: red;"> &#187; [application/logs:] ' . lang('Config.is_writable') . '</span>';
+							}
+
+							if(substr(decoct(fileperms($uploads)), -4) != 750)
+							{
+								echo '<br><span style="color: red;"> &#187; [public/uploads:] ' . lang('Config.is_writable') . '</span>';
+							}
+
+							if(substr(decoct(fileperms($images)), -4) != 750)
+							{
+								echo '<br><span style="color: red;"> &#187; [public/uploads/item_pics:] ' . lang('Config.is_writable') . '</span>';
+							}
+
+							if(!((substr(decoct(fileperms($importcustomers)), -4) == 640)
+								|| (substr(decoct(fileperms($importcustomers)), -4) == 660)))
+							{
+								echo '<br><span style="color: red;"> &#187; [import_customers.csv:] ' . lang('Config.is_readable') . '</span>';
+							}
 						?>
 						<br>
 				<div id="timezone" style="font-weight:600;"></div><br><br>
-				<div id="ostimezone" style="display:none;" ><?php echo $this->config->item('timezone'); ?></div><br>
+				<div id="ostimezone" style="display:none;" ><?php echo esc(config('OSPOS')->timezone) ?></div><br>
 				<br>	
 			</div>
 		</div>
 	</div>
 </div>
-<div align="center">
-		<a class="copy" data-clipboard-action="copy" data-clipboard-target="#issuetemplate">Copy Info</a> | <a href="https://github.com/opensourcepos/opensourcepos/issues/new" target="_blank"> <?= $this->lang->line('config_report_an_issue'); ?></a>
+<div style="text-align: center;">
+		<a class="copy" data-clipboard-action="copy" data-clipboard-target="#issuetemplate">Copy Info</a> | <a href="https://github.com/opensourcepos/opensourcepos/issues/new" target="_blank"> <?php echo lang('Config.report_an_issue') ?></a>
 		<script>
 			var clipboard = new ClipboardJS('.copy');
 
@@ -161,13 +198,13 @@
 				document.getSelection().removeAllRanges();
 			});
 			
-			document.getElementById("timezone").innerText = Intl.DateTimeFormat().resolvedOptions().timeZone;	
+			document.getElementById("timezone").innerText = Intl.DateTimeFormat().resolvedOptions().timeZone;
 					
 			$(function() {
 				$('#timezone').clone().appendTo('#timezoneE');
 			});
 							
 			if($('#timezone').html() !== $('#ostimezone').html())
-			document.getElementById("TimeError").innerHTML = '<font color="red"><?php echo $this->lang->line('config_timezone_error'); ?></font><br><br><?php echo $this->lang->line('config_user_timezone'); ?><div id="timezoneE" style="font-weight:600;"></div><br><?php echo $this->lang->line('config_os_timezone'); ?><div id="ostimezoneE" style="font-weight:600;"><?php echo $this->config->item('timezone'); ?></div><br>';
+			document.getElementById("TimeError").innerHTML = '<span style="color: red;"><?php echo lang('Config.timezone_error') ?></span><br><br><?php echo lang('Config.user_timezone') ?><div id="timezoneE" style="font-weight:600;"></div><br><?php echo lang('Config.os_timezone') ?><div id="ostimezoneE" style="font-weight:600;"><?php echo esc(config('OSPOS')->timezone) ?></div><br>';
 		</script>
 </div>
diff --git a/app/Views/configs/table_config.php b/app/Views/configs/table_config.php
index 9c62e3d85..69c8afc4a 100644
--- a/app/Views/configs/table_config.php
+++ b/app/Views/configs/table_config.php
@@ -1,32 +1,39 @@
-<?php echo form_open('config/save_tables/', array('id' => 'table_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $dinner_tables
+ */
+?>
+<?php echo form_open('config/save_tables/', ['id' => 'table_config_form', 'class' => 'form-horizontal']) ?>
     <div id="config_wrapper">
         <fieldset id="config_info">
-            <div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+            <div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
             <ul id="table_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('config_dinner_table_enable'), 'dinner_table_enable', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.dinner_table_enable'), 'dinner_table_enable', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-1'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'dinner_table_enable',
 						'value' => 'dinner_table_enable',
 						'id' => 'dinner_table_enable',
-						'checked' => $this->config->item('dinner_table_enable')));?>
+						'checked' => config('OSPOS')->dinner_table_enable
+					]) ?>
 				</div>
 			</div>
 
             <div id="dinner_tables">
-				<?php $this->load->view('partial/dinner_tables', array('dinner_tables' => $dinner_tables)); ?>
+				<?php echo view('partial/dinner_tables', ['dinner_tables' => $dinner_tables]) ?>
 			</div>
             
-            <?php echo form_submit(array(
+            <?php echo form_submit ([
                 'name' => 'submit_table',
                 'id' => 'submit_table',
-                'value' => $this->lang->line('common_submit'),
-                'class' => 'btn btn-primary btn-sm pull-right')); ?>
+                'value' => lang('Common.submit'),
+                'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
         </fieldset>
     </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -49,7 +56,7 @@ $(document).ready(function()
 
 	$("#dinner_table_enable").change(enable_disable_dinner_table_enable);
 
-	var table_count = <?php echo sizeof($dinner_tables); ?>;
+	var table_count = <?php echo sizeof($dinner_tables) ?>;
 
 	var hide_show_remove = function() {
 		if ($("input[name*='dinner_tables']:enabled").length > 1)
@@ -68,7 +75,7 @@ $(document).ready(function()
 		var block = $(this).parent().clone(true);
 		var new_block = block.insertAfter($(this).parent());
 		var new_block_id = 'dinner_table_' + ++id;
-		$(new_block).find('label').html("<?php echo $this->lang->line('config_dinner_table'); ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
+		$(new_block).find('label').html("<?php echo lang('Config.dinner_table') ?> " + ++table_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
 		$(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
 		hide_show_remove();
 	};
@@ -95,11 +102,11 @@ $(document).ready(function()
 			value_count = $(this).val() == value ? value_count + 1 : value_count; 
 		});
 		return value_count < 2;
-    }, "<?php echo $this->lang->line('config_dinner_table_duplicate'); ?>");
+    }, "<?php echo lang('Config.dinner_table_duplicate') ?>");
 
     $.validator.addMethod('valid_chars', function(value, element) {
 		return value.indexOf('_') === -1;
-    }, "<?php echo $this->lang->line('config_dinner_table_invalid_chars'); ?>");
+    }, "<?php echo lang('Config.dinner_table_invalid_chars') ?>");
 	
 	$('#table_config_form').validate($.extend(form_support.handler, {
 		submitHandler: function(form) {
@@ -110,7 +117,7 @@ $(document).ready(function()
 				},
 				success: function(response)	{
 					$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-					$("#dinner_tables").load('<?php echo site_url("config/ajax_dinner_tables"); ?>', init_add_remove_tables);
+					$("#dinner_tables").load('<?php echo esc(site_url("config/ajax_dinner_tables"), 'url') ?>', init_add_remove_tables);
 				},
 				dataType: 'json'
 			});
@@ -145,7 +152,7 @@ $(document).ready(function()
 			foreach($dinner_tables as $dinner_table=>$table)
 			{
 			?>
-				<?php echo 'dinner_table_' . ++$i ?>: "<?php echo $this->lang->line('config_dinner_table_required'); ?>",
+				<?php echo 'dinner_table_' . ++$i ?>: "<?php echo lang('Config.dinner_table_required') ?>",
 			<?php
 			}
 			?>
diff --git a/app/Views/configs/tax_config.php b/app/Views/configs/tax_config.php
index d10e662d3..2c926abe8 100644
--- a/app/Views/configs/tax_config.php
+++ b/app/Views/configs/tax_config.php
@@ -1,110 +1,125 @@
-<?php echo form_open('config/save_tax/', array('id' => 'tax_config_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $tax_code_options
+ * @var array $tax_category_options
+ * @var array $tax_jurisdiction_options
+ * @var string $controller_name
+ */
+?>
+<?php echo form_open('config/save_tax/', ['id' => 'tax_config_form', 'class' => 'form-horizontal']) ?>
 	<div id="config_wrapper">
 		<fieldset id="config_info">
-			<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+			<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 			<ul id="tax_error_message_box" class="error_message_box"></ul>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_tax_id'), 'tax_id', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.tax_id'), 'tax_id', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'tax_id',
 						'id' => 'tax_id',
 						'class' => 'form-control input-sm',
-						'value' => $this->config->item('tax_id'))); ?>
+						'value' => esc(config('OSPOS')->tax_id, 'attr')
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_tax_included'), 'tax_included', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.tax_included'), 'tax_included', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'tax_included',
 						'id' => 'tax_included',
 						'value' => 'tax_included',
-						'checked'=>$this->config->item('tax_included'))); ?>
+						'checked' => config('OSPOS')->tax_included
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_tax_rate_1'), 'default_tax_1_rate', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.default_tax_rate_1'), 'default_tax_1_rate', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'default_tax_1_name',
 						'id' => 'default_tax_1_name',
 						'class' => 'form-control input-sm',
-						'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1'))); ?>
+						'value' => config('OSPOS')->default_tax_1_name !== FALSE ? esc(config('OSPOS')->default_tax_1_name, 'attr') : lang('Items.sales_tax_1')]) ?>
 				</div>
 				<div class="col-xs-1 input-group">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'default_tax_1_rate',
 						'id' => 'default_tax_1_rate',
 						'class' => 'form-control input-sm',
-						'value'=> to_tax_decimals($this->config->item('default_tax_1_rate')))); ?>
+						'value' => to_tax_decimals(config('OSPOS')->default_tax_1_rate)
+					]) ?>
 					<span class="input-group-addon input-sm">%</span>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_tax_rate_2'), 'default_tax_2_rate', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.default_tax_rate_2'), 'default_tax_2_rate', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'default_tax_2_name',
 						'id' => 'default_tax_2_name',
 						'class' => 'form-control input-sm',
-						'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2'))); ?>
+						'value' => config('OSPOS')->default_tax_2_name !== FALSE ? esc(config('OSPOS')->default_tax_2_name, 'attr') : lang('Items.sales_tax_2')
+					]) ?>
 				</div>
 				<div class="col-xs-1 input-group">
-					<?php echo form_input(array(
+					<?php echo form_input ([
 						'name' => 'default_tax_2_rate',
 						'id' => 'default_tax_2_rate',
 						'class' => 'form-control input-sm',
-						'value'=> to_tax_decimals($this->config->item('default_tax_2_rate')))); ?>
+						'value' => to_tax_decimals(config('OSPOS')->default_tax_2_rate)
+					]) ?>
 					<span class="input-group-addon input-sm">%</span>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_use_destination_based_tax'), 'use_destination_based_tax', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.use_destination_based_tax'), 'use_destination_based_tax', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_checkbox(array(
+					<?php echo form_checkbox ([
 						'name' => 'use_destination_based_tax',
 						'id' => 'use_destination_based_tax',
 						'value' => 'use_destination_based_tax',
-						'checked'=>$this->config->item('use_destination_based_tax'))); ?>
+						'checked' => config('OSPOS')->use_destination_based_tax
+					]) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_tax_code'), 'default_tax_code', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.default_tax_code'), 'default_tax_code', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('default_tax_code', $tax_code_options, $this->config->item('default_tax_code'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('default_tax_code', esc($tax_code_options, 'attr'), esc(config('OSPOS')->default_tax_code, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_tax_category'), 'default_tax_category', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.default_tax_category'), 'default_tax_category', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('default_tax_category', $tax_category_options, $this->config->item('default_tax_category'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('default_tax_category', esc($tax_category_options, 'attr'), esc(config('OSPOS')->default_tax_category, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_default_tax_jurisdiction'), 'default_tax_jurisdiction', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Config.default_tax_jurisdiction'), 'default_tax_jurisdiction', ['class' => 'control-label col-xs-2']) ?>
 				<div class='col-xs-2'>
-					<?php echo form_dropdown('default_tax_jurisdiction', $tax_jurisdiction_options, $this->config->item('default_tax_jurisdiction'), array('class' => 'form-control input-sm')); ?>
+					<?php echo form_dropdown('default_tax_jurisdiction', esc($tax_jurisdiction_options, 'attr'), esc(config('OSPOS')->default_tax_jurisdiction, 'attr'), ['class' => 'form-control input-sm']) ?>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
+			<?php echo form_submit ([
 				'name' => 'submit_tax',
 				'id' => 'submit_tax',
-				'value' => $this->lang->line('common_submit'),
-				'class' => 'btn btn-primary btn-sm pull-right')); ?>
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right'
+			]) ?>
 		</fieldset>
 	</div>
 
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -144,11 +159,11 @@ $(document).ready(function()
 		{
 			default_tax_1_rate:
 			{
-				remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+				remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 			},
 			default_tax2_rate:
 			{
-				remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+				remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 			},
 		},
 
@@ -156,7 +171,7 @@ $(document).ready(function()
 		{
 			default_tax_1_rate:
 			{
-				number: "<?php echo $this->lang->line('config_default_tax_rate_number'); ?>"
+				number: "<?php echo lang('Config.default_tax_rate_number') ?>"
 			},
 		}
 	}));
diff --git a/app/Views/customers/form.php b/app/Views/customers/form.php
index edf841977..3e0c2a454 100644
--- a/app/Views/customers/form.php
+++ b/app/Views/customers/form.php
@@ -1,18 +1,29 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var string $controller_name
+ * @var object $person_info
+ * @var array $packages
+ * @var int $selected_package
+ * @var bool $use_destination_based_tax
+ * @var string $sales_tax_code_label
+ * @var string $employee
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open($controller_name . '/save/' . $person_info->person_id, array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("$controller_name/save/$person_info->person_id", ['id' => 'customer_form', 'class' => 'form-horizontal']) ?>
 	<ul class="nav nav-tabs nav-justified" data-tabs="tabs">
 		<li class="active" role="presentation">
-			<a data-toggle="tab" href="#customer_basic_info"><?php echo $this->lang->line("customers_basic_information"); ?></a>
+			<a data-toggle="tab" href="#customer_basic_info"><?php echo lang('Customers.basic_information') ?></a>
 		</li>
 		<?php
 		if(!empty($stats))
 		{
 		?>
 			<li role="presentation">
-				<a data-toggle="tab" href="#customer_stats_info"><?php echo $this->lang->line("customers_stats_info"); ?></a>
+				<a data-toggle="tab" href="#customer_stats_info"><?php echo lang('Customers.stats_info') ?></a>
 			</li>
 		<?php
 		}
@@ -22,7 +33,7 @@
 		{
 		?>
 			<li role="presentation">
-				<a data-toggle="tab" href="#customer_mailchimp_info"><?php echo $this->lang->line("customers_mailchimp_info"); ?></a>
+				<a data-toggle="tab" href="#customer_mailchimp_info"><?php echo lang('Customers.mailchimp_info') ?></a>
 			</li>
 		<?php
 		}
@@ -33,115 +44,117 @@
 		<div class="tab-pane fade in active" id="customer_basic_info">
 			<fieldset>
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_consent'), 'consent', array('class' => 'required control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.consent'), 'consent', ['class' => 'required control-label col-xs-3']) ?>
 					<div class='col-xs-1'>
-						<?php echo form_checkbox('consent', '1', $person_info->consent == '' ? (boolean)!$this->config->item('enforce_privacy') : (boolean)$person_info->consent); ?>
+						<?php echo form_checkbox('consent', '1', $person_info->consent == '' ? !config('OSPOS')->enforce_privacy : (boolean)$person_info->consent) ?>
 					</div>
 				</div>
 
-				<?php $this->load->view("people/form_basic_info"); ?>
+				<?php echo view('people/form_basic_info') ?>
 				
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_discount_type'), 'discount_type', array('class'=>'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.discount_type'), 'discount_type', ['class' => 'control-label col-xs-3']) ?>
 					<div class="col-xs-8">
 						<label class="radio-inline">
-							<?php echo form_radio(array(
-									'name'=>'discount_type',
-									'type'=>'radio',
-									'id'=>'discount_type',
-									'value'=>0,
-									'checked'=>$person_info->discount_type == PERCENT)
-							); ?> <?php echo $this->lang->line('customers_discount_percent'); ?>
+							<?php echo form_radio ([
+									'name' => 'discount_type',
+									'type' => 'radio',
+									'id' => 'discount_type',
+									'value' => 0,
+									'checked' => $person_info->discount_type == PERCENT
+								]
+							) ?> <?php echo lang('Customers.discount_percent') ?>
 						</label>
 						<label class="radio-inline">
-							<?php echo form_radio(array(
-									'name'=>'discount_type',
-									'type'=>'radio',
-									'id'=>'discount_type',
-									'value'=>1,
-									'checked'=>$person_info->discount_type == FIXED)
-							); ?> <?php echo $this->lang->line('customers_discount_fixed'); ?>
+							<?php echo form_radio ([
+									'name' => 'discount_type',
+									'type' => 'radio',
+									'id' => 'discount_type',
+									'value' => 1,
+									'checked' => $person_info->discount_type == FIXED
+								]
+							) ?> <?php echo lang('Customers.discount_fixed') ?>
 						</label>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_discount'), 'discount', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.discount'), 'discount', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-3'>
 						<div class="input-group input-group-sm">
-							<?php echo form_input(array(
-									'name'=>'discount',
-									'id'=>'discount',
-									'class'=>'form-control input-sm',
-									'onClick'=>'this.select();',
-									'value'=>$person_info->discount)
-									); ?>
+							<?php echo form_input ([
+									'name' => 'discount',
+									'id' => 'discount',
+									'class' => 'form-control input-sm',
+									'onClick' => 'this.select();',
+									'value' => $person_info->discount
+								]) ?>
 						</div>
 					</div>	
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_company_name'), 'company_name', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.company_name'), 'company_name', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
-						<?php echo form_input(array(
-								'name'=>'company_name',
-								'id'=>'company_name',
-								'class'=>'form-control input-sm',
-								'value'=>$person_info->company_name)
-								); ?>
+						<?php echo form_input ([
+								'name' => 'company_name',
+								'id' => 'company_name',
+								'class' => 'form-control input-sm',
+								'value' => esc($person_info->company_name, 'attr')
+							]) ?>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_account_number'), 'account_number', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.account_number'), 'account_number', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-4'>
-						<?php echo form_input(array(
-								'name'=>'account_number',
-								'id'=>'account_number',
-								'class'=>'form-control input-sm',
-								'value'=>$person_info->account_number)
-								); ?>
+						<?php echo form_input ([
+								'name' => 'account_number',
+								'id' => 'account_number',
+								'class' => 'form-control input-sm',
+								'value' => esc($person_info->account_number, 'attr')
+							]) ?>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_tax_id'), 'tax_id', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.tax_id'), 'tax_id', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-4'>
-						<?php echo form_input(array(
-								'name'=>'tax_id',
-								'id'=>'tax_id',
-								'class'=>'form-control input-sm',
-								'value'=>$person_info->tax_id)
-						); ?>
+						<?php echo form_input ([
+								'name' => 'tax_id',
+								'id' => 'tax_id',
+								'class' => 'form-control input-sm',
+								'value' => esc($person_info->tax_id, 'attr')
+							]) ?>
 					</div>
 				</div>
 
-				<?php if($this->config->item('customer_reward_enable') == TRUE): ?>
+				<?php if(config('OSPOS')->customer_reward_enable == TRUE): ?>
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('rewards_package'), 'rewards', array('class'=>'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.rewards_package'), 'rewards', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-8'>
-							<?php echo form_dropdown('package_id', $packages, $selected_package, array('class'=>'form-control')); ?>
+							<?php echo form_dropdown('package_id', esc($packages, 'attr'), $selected_package, ['class' => 'form-control']) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_available_points'), 'available_points', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.available_points'), 'available_points', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'available_points',
-									'id'=>'available_points',
-									'class'=>'form-control input-sm',
-									'value'=>$person_info->points,
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'available_points',
+									'id' => 'available_points',
+									'class' => 'form-control input-sm',
+									'value' => $person_info->points,
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 				<?php endif; ?>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_taxable'), 'taxable', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.taxable'), 'taxable', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-1'>
-						<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable); ?>
+						<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' || $person_info->taxable) ?>
 					</div>
 				</div>
 
@@ -150,17 +163,17 @@
 				{
 				?>
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_tax_code'), 'sales_tax_code_name', array('class'=>'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.tax_code'), 'sales_tax_code_name', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-8'>
 							<div class="input-group input-group-sm">
-								<?php echo form_input(array(
-										'name'=>'sales_tax_code_name',
-										'id'=>'sales_tax_code_name',
-										'class'=>'form-control input-sm',
-										'size'=>'50',
-										'value'=>$sales_tax_code_label)
-								); ?>
-								<?php echo form_hidden('sales_tax_code_id', $person_info->sales_tax_code_id); ?>
+								<?php echo form_input ([
+										'name' => 'sales_tax_code_name',
+										'id' => 'sales_tax_code_name',
+										'class' => 'form-control input-sm',
+										'size' => '50',
+										'value' => esc($sales_tax_code_label, 'attr')
+								]) ?>
+								<?php echo form_hidden('sales_tax_code_id', $person_info->sales_tax_code_id) ?>
 							</div>
 						</div>
 					</div>
@@ -169,35 +182,35 @@
 				?>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_date'), 'date', array('class'=>'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.date'), 'date', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
-							<?php echo form_input(array(
-									'name'=>'date',
-									'id'=>'datetime',
-									'class'=>'form-control input-sm',
-									'value'=>to_datetime(strtotime($person_info->date)),
-									'readonly'=>'true')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'date',
+									'id' => 'datetime',
+									'class' => 'form-control input-sm',
+									'value' => to_datetime(strtotime($person_info->date)),
+									'readonly' => 'true'
+								]) ?>
 						</div>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('customers_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Customers.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
-						<?php echo form_input(array(
-								'name'=>'employee',
-								'id'=>'employee',
-								'class'=>'form-control input-sm',
-								'value'=>$employee,
-								'readonly'=>'true')
-								); ?>
+						<?php echo form_input ([
+								'name' => 'employee',
+								'id' => 'employee',
+								'class' => 'form-control input-sm',
+								'value' => esc($employee, 'attr'),
+								'readonly' => 'true'
+							]) ?>
 					</div>
 				</div>
 
-				<?php echo form_hidden('employee_id', $person_info->employee_id); ?>
+				<?php echo form_hidden('employee_id', $person_info->employee_id) ?>
 			</fieldset>
 		</div>
 
@@ -208,115 +221,115 @@
 			<div class="tab-pane" id="customer_stats_info">
 				<fieldset>
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_total'), 'total', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.total'), 'total', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-4">
 							<div class="input-group input-group-sm">
 								<?php if (!currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
-								<?php echo form_input(array(
-										'name'=>'total',
-										'id'=>'total',
-										'class'=>'form-control input-sm',
-										'value'=>to_currency_no_money($stats->total),
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'total',
+										'id' => 'total',
+										'class' => 'form-control input-sm',
+										'value' => to_currency_no_money($stats->total),
+										'disabled' => ''
+								]) ?>
 								<?php if (currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
 							</div>
 						</div>
 					</div>
 					
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_max'), 'max', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.max'), 'max', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-4">
 							<div class="input-group input-group-sm">
 								<?php if (!currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
-								<?php echo form_input(array(
-										'name'=>'max',
-										'id'=>'max',
-										'class'=>'form-control input-sm',
-										'value'=>to_currency_no_money($stats->max),
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'max',
+										'id' => 'max',
+										'class' => 'form-control input-sm',
+										'value' => to_currency_no_money($stats->max),
+										'disabled' => ''
+									]) ?>
 								<?php if (currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
 							</div>
 						</div>
 					</div>
 					
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_min'), 'min', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.min'), 'min', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-4">
 							<div class="input-group input-group-sm">
 								<?php if (!currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
-								<?php echo form_input(array(
-										'name'=>'min',
-										'id'=>'min',
-										'class'=>'form-control input-sm',
-										'value'=>to_currency_no_money($stats->min),
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'min',
+										'id' => 'min',
+										'class' => 'form-control input-sm',
+										'value' => to_currency_no_money($stats->min),
+										'disabled' => ''
+									]) ?>
 								<?php if (currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
 							</div>
 						</div>
 					</div>
 					
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_average'), 'average', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.average'), 'average', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-4">
 							<div class="input-group input-group-sm">
 								<?php if (!currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
-								<?php echo form_input(array(
-										'name'=>'average',
-										'id'=>'average',
-										'class'=>'form-control input-sm',
-										'value'=>to_currency_no_money($stats->average),
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'average',
+										'id' => 'average',
+										'class' => 'form-control input-sm',
+										'value' => to_currency_no_money($stats->average),
+										'disabled' => ''
+									]) ?>
 								<?php if (currency_side()): ?>
-									<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+									<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 								<?php endif; ?>
 							</div>
 						</div>
 					</div>
 					
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_quantity'), 'quantity', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.quantity'), 'quantity', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-4">
 							<div class="input-group input-group-sm">
-								<?php echo form_input(array(
-										'name'=>'quantity',
-										'id'=>'quantity',
-										'class'=>'form-control input-sm',
-										'value'=>$stats->quantity,
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'quantity',
+										'id' => 'quantity',
+										'class' => 'form-control input-sm',
+										'value' => $stats->quantity,
+										'disabled' => ''
+									]) ?>
 							</div>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_avg_discount'), 'avg_discount', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.avg_discount'), 'avg_discount', ['class' => 'control-label col-xs-3']) ?>
 						<div class="col-xs-3">
 							<div class="input-group input-group-sm">
-								<?php echo form_input(array(
-										'name'=>'avg_discount',
-										'id'=>'avg_discount',
-										'class'=>'form-control input-sm',
-										'value'=>$stats->avg_discount,
-										'disabled'=>'')
-										); ?>
+								<?php echo form_input ([
+										'name' => 'avg_discount',
+										'id' => 'avg_discount',
+										'class' => 'form-control input-sm',
+										'value' => $stats->avg_discount,
+										'disabled' => ''
+									]) ?>
 								<span class="input-group-addon input-sm"><b>%</b></span>
 							</div>
 						</div>
@@ -334,108 +347,108 @@
 			<div class="tab-pane" id="customer_mailchimp_info">
 				<fieldset>
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_status'), 'mailchimp_status', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_status'), 'mailchimp_status', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
 							<?php echo form_dropdown('mailchimp_status', 
-								array(
+								[
 									'subscribed' => 'subscribed',
 									'unsubscribed' => 'unsubscribed',
 									'cleaned' => 'cleaned',
 									'pending' => 'pending'
-								),
-								$mailchimp_info['status'],
-								array('id' => 'mailchimp_status', 'class' => 'form-control input-sm')); ?>
+								],
+								esc($mailchimp_info['status'], 'attr'),
+								['id' => 'mailchimp_status', 'class' => 'form-control input-sm']) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_vip'), 'mailchimp_vip', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_vip'), 'mailchimp_vip', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-1'>
-							<?php echo form_checkbox('mailchimp_vip', '1', $mailchimp_info['vip'] == '' ? FALSE : (boolean)$mailchimp_info['vip']); ?>
+							<?php echo form_checkbox('mailchimp_vip', '1', !($mailchimp_info['vip'] == '') && $mailchimp_info['vip']) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_member_rating'), 'mailchimp_member_rating', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_member_rating'), 'mailchimp_member_rating', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_member_rating',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_info['member_rating'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_member_rating',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_info['member_rating'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_activity_total'), 'mailchimp_activity_total', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_activity_total'), 'mailchimp_activity_total', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_activity_total',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_activity['total'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_activity_total',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_activity['total'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_activity_lastopen'), 'mailchimp_activity_lastopen', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_activity_lastopen'), 'mailchimp_activity_lastopen', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_activity_lastopen',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_activity['lastopen'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_activity_lastopen',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_activity['lastopen'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_activity_open'), 'mailchimp_activity_open', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_activity_open'), 'mailchimp_activity_open', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_activity_open',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_activity['open'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_activity_open',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_activity['open'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_activity_click'), 'mailchimp_activity_click', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_activity_click'), 'mailchimp_activity_click', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_activity_click',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_activity['click'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_activity_click',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_activity['click'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_activity_unopen'), 'mailchimp_activity_unopen', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_activity_unopen'), 'mailchimp_activity_unopen', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_activity_unopen',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_activity['unopen'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_activity_unopen',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_activity['unopen'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 
 					<div class="form-group form-group-sm">
-						<?php echo form_label($this->lang->line('customers_mailchimp_email_client'), 'mailchimp_email_client', array('class' => 'control-label col-xs-3')); ?>
+						<?php echo form_label(lang('Customers.mailchimp_email_client'), 'mailchimp_email_client', ['class' => 'control-label col-xs-3']) ?>
 						<div class='col-xs-4'>
-							<?php echo form_input(array(
-									'name'=>'mailchimp_email_client',
-									'class'=>'form-control input-sm',
-									'value'=>$mailchimp_info['email_client'],
-									'disabled'=>'')
-									); ?>
+							<?php echo form_input ([
+									'name' => 'mailchimp_email_client',
+									'class' => 'form-control input-sm',
+									'value' => esc($mailchimp_info['email_client'], 'attr'),
+									'disabled' => ''
+								]) ?>
 						</div>
 					</div>
 				</fieldset>
@@ -444,7 +457,7 @@
 		}
 		?>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -463,7 +476,7 @@ $(document).ready(function()
 	};
 
 	$('#sales_tax_code_name').autocomplete({
-		source: "<?php echo site_url('taxes/suggest_tax_codes'); ?>",
+		source: "<?php echo esc(site_url('taxes/suggest_tax_codes'), 'url') ?>",
 		minChars: 0,
 		delay: 15,
 		cacheLength: 1,
@@ -478,7 +491,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -495,10 +508,10 @@ $(document).ready(function()
 			{
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/ajax_check_email') ?>",
+					url: "<?php echo esc(site_url("$controller_name/ajax_check_email"), 'url') ?>",
 					type: 'POST',
 					data: {
-						'person_id': "<?php echo $person_info->person_id; ?>"
+						'person_id': "<?php echo $person_info->person_id ?>"
 						// email is posted by default
 					}
 				}
@@ -507,10 +520,10 @@ $(document).ready(function()
 			{
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/ajax_check_account_number') ?>",
+					url: "<?php echo esc(site_url("$controller_name/ajax_check_account_number"), 'url') ?>",
 					type: 'POST',
 					data: {
-						'person_id': "<?php echo $person_info->person_id; ?>"
+						'person_id': "<?php echo $person_info->person_id ?>"
 						// account_number is posted by default
 					}
 				}
@@ -519,11 +532,11 @@ $(document).ready(function()
 
 		messages:
 		{
-			first_name: "<?php echo $this->lang->line('common_first_name_required'); ?>",
-			last_name: "<?php echo $this->lang->line('common_last_name_required'); ?>",
-			consent: "<?php echo $this->lang->line('customers_consent_required'); ?>",
-			email: "<?php echo $this->lang->line('customers_email_duplicate'); ?>",
-			account_number: "<?php echo $this->lang->line('customers_account_number_duplicate'); ?>"
+			first_name: "<?php echo lang('Common.first_name_required') ?>",
+			last_name: "<?php echo lang('Common.last_name_required') ?>",
+			consent: "<?php echo lang('Customers.consent_required') ?>",
+			email: "<?php echo lang('Customers.email_duplicate') ?>",
+			account_number: "<?php echo lang('Customers.account_number_duplicate') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/customers/form_csv_import.php b/app/Views/customers/form_csv_import.php
index b19512512..1f21597ef 100644
--- a/app/Views/customers/form_csv_import.php
+++ b/app/Views/customers/form_csv_import.php
@@ -1,10 +1,10 @@
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open_multipart('customers/do_csv_import/', array('id'=>'csv_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open_multipart('customers/do_csv_import/', ['id' => 'csv_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
 			<div class="col-xs-12">
-				<a href="<?php echo site_url('customers/csv'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
+				<a href="<?php echo esc(site_url('customers/csv'), 'url') ?>"><?php echo lang('Common.download_import_template') ?></a>
 			</div>
 		</div>
 
@@ -12,13 +12,13 @@
 			<div class='col-xs-12'>
 				<div class="fileinput fileinput-new input-group" data-provides="fileinput">
 					<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
-					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
-					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("common_import_remove_file"); ?></a>
+					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo lang('Common.import_select_file') ?></span><span class="fileinput-exists"><?php echo lang('Common.import_change_file') ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
+					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo lang('Common.import_remove_file') ?></a>
 				</div>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -30,7 +30,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit('<?php echo site_url('customers'); ?>', response);
+					table_support.handle_submit('<?php echo esc(site_url('customers'), 'url') ?>', response);
 				},
 				dataType: 'json'
 			});
@@ -45,7 +45,7 @@ $(document).ready(function()
    
 		messages: 
 		{
-   			file_path: "<?php echo $this->lang->line('common_import_full_path'); ?>"
+   			file_path: "<?php echo lang('Common.import_full_path') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/employees/form.php b/app/Views/employees/form.php
index 959a69264..b5dbc26de 100644
--- a/app/Views/employees/form.php
+++ b/app/Views/employees/form.php
@@ -1,81 +1,90 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var string $controller_name
+ * @var object $person_info
+ * @var array $all_modules
+ * @var array $all_subpermissions
+ * @var int $employee_id
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open($controller_name . '/save/' . $person_info->person_id, array('id'=>'employee_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("$controller_name/save/$person_info->person_id", ['id' => 'employee_form', 'class' => 'form-horizontal']) ?>
 	<ul class="nav nav-tabs nav-justified" data-tabs="tabs">
 		<li class="active" role="presentation">
-			<a data-toggle="tab" href="#employee_basic_info"><?php echo $this->lang->line("employees_basic_information"); ?></a>
+			<a data-toggle="tab" href="#employee_basic_info"><?php echo lang('Employees.basic_information') ?></a>
 		</li>
 		<li role="presentation">
-			<a data-toggle="tab" href="#employee_login_info"><?php echo $this->lang->line("employees_login_info"); ?></a>
+			<a data-toggle="tab" href="#employee_login_info"><?php echo lang('Employees.login_info') ?></a>
 		</li>
 		<li role="presentation">
-			<a data-toggle="tab" href="#employee_permission_info"><?php echo $this->lang->line("employees_permission_info"); ?></a>
+			<a data-toggle="tab" href="#employee_permission_info"><?php echo lang('Employees.permission_info') ?></a>
 		</li>
 	</ul>
 
 	<div class="tab-content">
 		<div class="tab-pane fade in active" id="employee_basic_info">
 			<fieldset>
-				<?php $this->load->view("people/form_basic_info"); ?>
+				<?php echo view('people/form_basic_info') ?>
 			</fieldset>
 		</div>
 
 		<div class="tab-pane" id="employee_login_info">
 			<fieldset>
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_username'), 'username', array('class'=>'required control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Employees.username'), 'username', ['class' => 'required control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
-							<?php echo form_input(array(
-									'name'=>'username',
-									'id'=>'username',
-									'class'=>'form-control input-sm',
-									'value'=>$person_info->username)
-									);?>
+							<?php echo form_input ([
+								'name' => 'username',
+								'id' => 'username',
+								'class' => 'form-control input-sm',
+								'value' => esc($person_info->username, 'attr')
+							]) ?>
 						</div>
 					</div>
 				</div>
 
-				<?php $password_label_attributes = $person_info->person_id == "" ? array('class'=>'required') : array(); ?>
+				<?php $password_label_attributes = $person_info->person_id == "" ? ['class' => 'required'] : []; ?>
 
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_password'), 'password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+					<?php echo form_label(lang('Employees.password'), 'password', esc(array_merge($password_label_attributes, ['class' => 'control-label col-xs-3']), 'attr'))?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-							<?php echo form_password(array(
-									'name'=>'password',
-									'id'=>'password',
-									'class'=>'form-control input-sm')
-									);?>
+							<?php echo form_password ([
+									'name' => 'password',
+									'id' => 'password',
+									'class' => 'form-control input-sm'
+								]) ?>
 						</div>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+				<?php echo form_label(lang('Employees.repeat_password'), 'repeat_password', esc(array_merge($password_label_attributes, ['class' => 'control-label col-xs-3']), 'attr')) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-							<?php echo form_password(array(
-									'name'=>'repeat_password',
-									'id'=>'repeat_password',
-									'class'=>'form-control input-sm')
-									);?>
+							<?php echo form_password ([
+									'name' => 'repeat_password',
+									'id' => 'repeat_password',
+									'class' => 'form-control input-sm'
+								]) ?>
 						</div>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">
-					<?php echo form_label($this->lang->line('employees_language'), 'language', array('class' => 'control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Employees.language'), 'language', ['class' => 'control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<?php 
 								$languages = get_languages();
-								$languages[':'] = $this->lang->line('employees_system_language');
+								$languages[':'] = lang('Employees.system_language');
 								$language_code = current_language_code();
 								$language = current_language();
 								
@@ -88,9 +97,9 @@
 								
 								echo form_dropdown(
 									'language',
-									$languages,
-									$language_code . ':' . $language,
-									array('class' => 'form-control input-sm')
+									esc($languages, 'attr'),
+									esc("$language_code:$language", 'attr'),
+									['class' => 'form-control input-sm']
 									);
 							?>
 						</div>
@@ -101,7 +110,7 @@
 
 		<div class="tab-pane" id="employee_permission_info">
 			<fieldset>
-				<p><?php echo $this->lang->line("employees_permission_desc"); ?></p>
+				<p><?php echo lang('Employees.permission_desc') ?></p>
 
 				<ul id="permission_list">
 					<?php
@@ -109,30 +118,35 @@
 					{
 					?>
 						<li>	
-							<?php echo form_checkbox("grant_".$module->module_id, $module->module_id, $module->grant, "class='module'"); ?>
-							<?php echo form_dropdown("menu_group_".$module->module_id, array(
-								'home' => $this->lang->line('module_home'),
-								'office' => $this->lang->line('module_office'),
-								'both' => $this->lang->line('module_both')
-							), $module->menu_group, "class='module'"); ?>
-							<span class="medium"><?php echo $this->lang->line('module_'.$module->module_id);?>:</span>
-							<span class="small"><?php echo $this->lang->line('module_'.$module->module_id.'_desc');?></span>
+							<?php echo form_checkbox("grant_$module->module_id", $module->module_id, $module->grant, "class=\'module\'") ?>
+							<?php echo form_dropdown(
+								"menu_group_$module->module_id", [
+									'home' => lang('Module.home'),
+									'office' => lang('Module.office'),
+									'both' => lang('Module.both')
+								],
+								$module->menu_group,
+								"class=\'module\'"
+							) ?>
+
+							<span class="medium"><?php echo lang("Module.$module->module_id") ?>:</span>
+							<span class="small"><?php echo lang("Module.$module->module_id" . '_desc') ?></span>
 							<?php
 								foreach($all_subpermissions as $permission)
 								{
 									$exploded_permission = explode('_', $permission->permission_id, 2);
 									if($permission->module_id == $module->module_id)
 									{
-										$lang_key = $module->module_id.'_'.$exploded_permission[1];
-										$lang_line = $this->lang->line($lang_key);
+										$lang_key = $module->module_id . '_' . $exploded_permission[1];
+										$lang_line = lang($lang_key);
 										$lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? ucwords(str_replace("_", " ",$exploded_permission[1])) : $lang_line;
 										if(!empty($lang_line))
 										{
 							?>
 											<ul>
 												<li>
-													<?php echo form_checkbox("grant_".$permission->permission_id, $permission->permission_id, $permission->grant); ?>
-													<?php echo form_hidden("menu_group_".$permission->permission_id, "--"); ?>
+													<?php echo form_checkbox("grant_$permission->permission_id", $permission->permission_id, $permission->grant) ?>
+													<?php echo form_hidden("menu_group_$permission->permission_id", "--") ?>
 													<span class="medium"><?php echo $lang_line ?></span>
 												</li>
 											</ul>
@@ -149,7 +163,7 @@
 			</fieldset>
 		</div>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -169,7 +183,7 @@ $(document).ready(function()
 			}
 		});
 		return result;
-	}, "<?php echo $this->lang->line('employees_subpermission_required'); ?>");
+	}, "<?php echo lang('Employees.subpermission_required') ?>");
 
 	$('ul#permission_list > li > input.module').each(function()
 	{
@@ -195,7 +209,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -212,7 +226,7 @@ $(document).ready(function()
 
 				required: true,
 				minlength: 5,
-				remote: '<?php echo site_url("$controller_name/check_username/$employee_id")?>'
+				remote: '<?php echo esc(site_url("$controller_name/check_username/$employee_id"), 'url') ?>'
 			},
 			password:
 			{
@@ -235,13 +249,13 @@ $(document).ready(function()
 
 		messages: 
 		{
-			first_name: "<?php echo $this->lang->line('common_first_name_required'); ?>",
-			last_name: "<?php echo $this->lang->line('common_last_name_required'); ?>",
+			first_name: "<?php echo lang('Common.first_name_required') ?>",
+			last_name: "<?php echo lang('Common.last_name_required') ?>",
 			username:
 			{
-				required: "<?php echo $this->lang->line('employees_username_required'); ?>",
-				minlength: "<?php echo $this->lang->line('employees_username_minlength'); ?>",
-				remote: "<?php echo $this->lang->line('employees_username_duplicate'); ?>"
+				required: "<?php echo lang('Employees.username_required') ?>",
+				minlength: "<?php echo lang('Employees.username_minlength') ?>",
+				remote: "<?php echo lang('Employees.username_duplicate') ?>"
             },
 			password:
 			{
@@ -249,17 +263,17 @@ $(document).ready(function()
 				if($person_info->person_id == "")
 				{
 				?>
-				required: "<?php echo $this->lang->line('employees_password_required'); ?>",
+				required: "<?php echo lang('Employees.password_required') ?>",
 				<?php
 				}
 				?>
-				minlength: "<?php echo $this->lang->line('employees_password_minlength'); ?>"
+				minlength: "<?php echo lang('Employees.password_minlength') ?>"
 			},
 			repeat_password:
 			{
-				equalTo: "<?php echo $this->lang->line('employees_password_must_match'); ?>"
+				equalTo: "<?php echo lang('Employees.password_must_match') ?>"
 			},
-			email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>"
+			email: "<?php echo lang('Common.email_invalid_format') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/errors/cli/error_404.php b/app/Views/errors/cli/error_404.php
index 6984b61e9..40ca291c4 100644
--- a/app/Views/errors/cli/error_404.php
+++ b/app/Views/errors/cli/error_404.php
@@ -1,8 +1,10 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+/**
+ * @var string $code
+ * @var string $message
+ */
+use CodeIgniter\CLI\CLI;
 
-echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+CLI::error('ERROR: ' . $code);
+CLI::write($message);
+CLI::newLine();
diff --git a/app/Views/errors/cli/error_db.php b/app/Views/errors/cli/error_db.php
index 2ff43ffc7..c2a6d75ca 100644
--- a/app/Views/errors/cli/error_db.php
+++ b/app/Views/errors/cli/error_db.php
@@ -1,8 +1,10 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
+/**
+ * @var string $heading
+ * @var string $message
+ */
 echo "\nDatabase error: ",
-	$heading,
+	esc($heading),
 	"\n\n",
-	$message,
+	esc($message),
 	"\n\n";
\ No newline at end of file
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index efa6a66d1..411124533 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -1,21 +1,80 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+<?php
+/**
+ * @var object $exception
+ * @var string $message
+ */
 
-An uncaught Exception was encountered
+use CodeIgniter\CLI\CLI;
 
-Type:        <?php echo get_class($exception), "\n"; ?>
-Message:     <?php echo $message, "\n"; ?>
-Filename:    <?php echo $exception->getFile(), "\n"; ?>
-Line Number: <?php echo $exception->getLine(); ?>
+// The main Exception
+CLI::newLine();
+CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::newLine();
+CLI::write($message);
+CLI::newLine();
+CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
+CLI::newLine();
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+// The backtrace
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE)
+{
+	$backtraces = $exception->getTrace();
 
-Backtrace:
-<?php	foreach ($exception->getTrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
-	File: <?php echo $error['file'], "\n"; ?>
-	Line: <?php echo $error['line'], "\n"; ?>
-	Function: <?php echo $error['function'], "\n\n"; ?>
-<?php		endif ?>
-<?php	endforeach ?>
+	if ($backtraces)
+	{
+		CLI::write('Backtrace:', 'green');
+	}
 
-<?php endif ?>
+	foreach ($backtraces as $i => $error)
+	{
+		$padFile  = '    '; // 4 spaces
+		$padClass = '       '; // 7 spaces
+		$c        = str_pad($i + 1, 3, ' ', STR_PAD_LEFT);
+
+		if (isset($error['file']))
+		{
+			$filepath = clean_path($error['file']) . ':' . $error['line'];
+
+			CLI::write($c . $padFile . CLI::color($filepath, 'yellow'));
+		}
+		else
+		{
+			CLI::write($c . $padFile . CLI::color('[internal function]', 'yellow'));
+		}
+
+		$function = '';
+
+		if (isset($error['class']))
+		{
+			$type = ($error['type'] === '->') ? '()' . $error['type'] : $error['type'];
+			$function .= $padClass . $error['class'] . $type . $error['function'];
+		}
+		elseif (isset($error['function']))
+		{
+			$function .= $padClass . $error['function'];
+		}
+
+		$args = implode(', ', array_map(static function ($value)
+		{
+			switch (true)
+			{
+				case is_object($value):
+					return 'Object(' . get_class($value) . ')';
+
+				case is_array($value):
+					return count($value) ? '[...]' : '[]';
+
+				case $value === null:
+					return 'null'; // return the lowercased version
+
+				default:
+					return var_export($value, true);
+			}
+		}, array_values($error['args'] ?? [])));
+
+		$function .= '(' . $args . ')';
+
+		CLI::write($function);
+		CLI::newLine();
+	}
+}
diff --git a/app/Views/errors/cli/error_general.php b/app/Views/errors/cli/error_general.php
index 6984b61e9..0efd45dcf 100644
--- a/app/Views/errors/cli/error_general.php
+++ b/app/Views/errors/cli/error_general.php
@@ -1,8 +1,10 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
+/**
+ * @var string $heading
+ * @var string $message
+ */
 echo "\nERROR: ",
-	$heading,
+	esc($heading),
 	"\n\n",
-	$message,
+	esc($message),
 	"\n\n";
\ No newline at end of file
diff --git a/app/Views/errors/cli/error_php.php b/app/Views/errors/cli/error_php.php
index 8a24b6491..982092c26 100644
--- a/app/Views/errors/cli/error_php.php
+++ b/app/Views/errors/cli/error_php.php
@@ -1,20 +1,26 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
-
+<?php
+/**
+ * @var string $severity
+ * @var string $message
+ * @var string $filepath
+ * @var int $line
+ */
+?>
 A PHP Error was encountered
 
-Severity:    <?php echo $severity, "\n"; ?>
-Message:     <?php echo $message, "\n"; ?>
-Filename:    <?php echo $filepath, "\n"; ?>
-Line Number: <?php echo $line; ?>
+Severity:    <?php echo esc($severity), "\n" ?>
+Message:     <?php echo esc($message), "\n" ?>
+Filename:    <?php echo esc($filepath), "\n" ?>
+Line Number: <?php echo $line ?>
 
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
 <?php	foreach (debug_backtrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
-	File: <?php echo $error['file'], "\n"; ?>
-	Line: <?php echo $error['line'], "\n"; ?>
-	Function: <?php echo $error['function'], "\n\n"; ?>
+<?php		if (isset($error['file']) && strpos($error['file'], realpath(ROOTPATH)) !== 0): ?>
+	File: <?php echo esc($error['file']), "\n" ?>
+	Line: <?php echo $error['line'], "\n" ?>
+	Function: <?php echo esc($error['function']), "\n\n" ?>
 <?php		endif ?>
 <?php	endforeach ?>
 
diff --git a/app/Views/errors/cli/index.html b/app/Views/errors/cli/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Views/errors/cli/index.html
+++ b/app/Views/errors/cli/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/errors/cli/production.php b/app/Views/errors/cli/production.php
new file mode 100644
index 000000000..7db744ece
--- /dev/null
+++ b/app/Views/errors/cli/production.php
@@ -0,0 +1,5 @@
+<?php
+
+// On the CLI, we still want errors in productions
+// so just use the exception template.
+include __DIR__ . '/error_exception.php';
diff --git a/app/Views/errors/error.php b/app/Views/errors/error.php
new file mode 100644
index 000000000..a38e268dd
--- /dev/null
+++ b/app/Views/errors/error.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @var string $error
+ */
+?>
+<div class="error"><?= esc($error) ?></div>
\ No newline at end of file
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
new file mode 100644
index 000000000..384d66d95
--- /dev/null
+++ b/app/Views/errors/html/debug.css
@@ -0,0 +1,197 @@
+:root {
+	--main-bg-color: #fff;
+	--main-text-color: #555;
+	--dark-text-color: #222;
+	--light-text-color: #c7c7c7;
+	--brand-primary-color: #E06E3F;
+	--light-bg-color: #ededee;
+	--dark-bg-color: #404040;
+}
+
+body {
+	height: 100%;
+	background: var(--main-bg-color);
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	color: var(--main-text-color);
+	font-weight: 300;
+	margin: 0;
+	padding: 0;
+}
+h1 {
+	font-weight: lighter;
+	letter-spacing: 0.8;
+	font-size: 3rem;
+	color: var(--dark-text-color);
+	margin: 0;
+}
+h1.headline {
+	margin-top: 20%;
+	font-size: 5rem;
+}
+.text-center {
+	text-align: center;
+}
+p.lead {
+	font-size: 1.6rem;
+}
+.container {
+	max-width: 75rem;
+	margin: 0 auto;
+	padding: 1rem;
+}
+.header {
+	background: var(--light-bg-color);
+	color: var(--dark-text-color);
+}
+.header .container {
+	padding: 1rem 1.75rem 1.75rem 1.75rem;
+}
+.header h1 {
+	font-size: 2.5rem;
+	font-weight: 500;
+}
+.header p {
+	font-size: 1.2rem;
+	margin: 0;
+	line-height: 2.5;
+}
+.header a {
+	color: var(--brand-primary-color);
+	margin-left: 2rem;
+	display: none;
+	text-decoration: none;
+}
+.header:hover a {
+	display: inline;
+}
+
+.footer {
+	background: var(--dark-bg-color);
+	color: var(--light-text-color);
+}
+.footer .container {
+	border-top: 1px solid #e7e7e7;
+	margin-top: 1rem;
+	text-align: center;
+}
+
+.source {
+	background: #343434;
+	color: var(--light-text-color);
+	padding: 0.5em 1em;
+	border-radius: 5px;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-size: 0.85rem;
+	margin: 0;
+	overflow-x: scroll;
+}
+.source span.line {
+	line-height: 1.4;
+}
+.source span.line .number {
+	color: #666;
+}
+.source .line .highlight {
+	display: block;
+	background: var(--dark-text-color);
+	color: var(--light-text-color);
+}
+.source span.highlight .number {
+	color: #fff;
+}
+
+.tabs {
+	list-style: none;
+	list-style-position: inside;
+	margin: 0;
+	padding: 0;
+	margin-bottom: -1px;
+}
+.tabs li {
+	display: inline;
+}
+.tabs a:link,
+.tabs a:visited {
+	padding: 0rem 1rem;
+	line-height: 2.7;
+	text-decoration: none;
+	color: var(--dark-text-color);
+	background: var(--light-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
+	border-bottom: 0;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	display: inline-block;
+}
+.tabs a:hover {
+	background: var(--light-bg-color);
+	border-color: rgba(0,0,0,0.15);
+}
+.tabs a.active {
+	background: var(--main-bg-color);
+	color: var(--main-text-color);
+}
+.tab-content {
+	background: var(--main-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
+}
+.content {
+	padding: 1rem;
+}
+.hide {
+	display: none;
+}
+
+.alert {
+	margin-top: 2rem;
+	display: block;
+	text-align: center;
+	line-height: 3.0;
+	background: #d9edf7;
+	border: 1px solid #bcdff1;
+	border-radius: 5px;
+	color: #31708f;
+}
+ul, ol {
+	line-height: 1.8;
+}
+
+table {
+	width: 100%;
+	overflow: hidden;
+}
+th {
+	text-align: left;
+	border-bottom: 1px solid #e7e7e7;
+	padding-bottom: 0.5rem;
+}
+td {
+	padding: 0.2rem 0.5rem 0.2rem 0;
+}
+tr:hover td {
+	background: #f1f1f1;
+}
+td pre {
+	white-space: pre-wrap;
+}
+
+.trace a {
+	color: inherit;
+}
+.trace table {
+	width: auto;
+}
+.trace tr td:first-child {
+	min-width: 5em;
+	font-weight: bold;
+}
+.trace td {
+	background: var(--light-bg-color);
+	padding: 0 1rem;
+}
+.trace td pre {
+	margin: 0;
+}
+.args {
+	display: none;
+}
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
new file mode 100644
index 000000000..2b4d06381
--- /dev/null
+++ b/app/Views/errors/html/debug.js
@@ -0,0 +1,118 @@
+// Tabs
+
+var tabLinks    = new Array();
+var contentDivs = new Array();
+
+function init()
+{
+	// Grab the tab links and content divs from the page
+	var tabListItems = document.getElementById('tabs').childNodes;
+	console.log(tabListItems);
+	for (var i = 0; i < tabListItems.length; i ++)
+	{
+		if (tabListItems[i].nodeName == "LI")
+		{
+			var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
+			var id          = getHash(tabLink.getAttribute('href'));
+			tabLinks[id]    = tabLink;
+			contentDivs[id] = document.getElementById(id);
+		}
+	}
+
+	// Assign onclick events to the tab links, and
+	// highlight the first tab
+	var i = 0;
+
+	for (var id in tabLinks)
+	{
+		tabLinks[id].onclick = showTab;
+		tabLinks[id].onfocus = function () {
+			this.blur()
+		};
+		if (i == 0)
+		{
+			tabLinks[id].className = 'active';
+		}
+		i ++;
+	}
+
+	// Hide all content divs except the first
+	var i = 0;
+
+	for (var id in contentDivs)
+	{
+		if (i != 0)
+		{
+			console.log(contentDivs[id]);
+			contentDivs[id].className = 'content hide';
+		}
+		i ++;
+	}
+}
+
+function showTab()
+{
+	var selectedId = getHash(this.getAttribute('href'));
+
+	// Highlight the selected tab, and dim all others.
+	// Also show the selected content div, and hide all others.
+	for (var id in contentDivs)
+	{
+		if (id == selectedId)
+		{
+			tabLinks[id].className    = 'active';
+			contentDivs[id].className = 'content';
+		}
+		else
+		{
+			tabLinks[id].className    = '';
+			contentDivs[id].className = 'content hide';
+		}
+	}
+
+	// Stop the browser following the link
+	return false;
+}
+
+function getFirstChildWithTagName(element, tagName)
+{
+	for (var i = 0; i < element.childNodes.length; i ++)
+	{
+		if (element.childNodes[i].nodeName == tagName)
+		{
+			return element.childNodes[i];
+		}
+	}
+}
+
+function getHash(url)
+{
+	var hashPos = url.lastIndexOf('#');
+	return url.substring(hashPos + 1);
+}
+
+function toggle(elem)
+{
+	elem = document.getElementById(elem);
+
+	if (elem.style && elem.style['display'])
+	{
+		// Only works with the "style" attr
+		var disp = elem.style['display'];
+	}
+	else if (elem.currentStyle)
+	{
+		// For MSIE, naturally
+		var disp = elem.currentStyle['display'];
+	}
+	else if (window.getComputedStyle)
+	{
+		// For most other browsers
+		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+	}
+
+	// Toggle the state of the "display" style
+	elem.style.display = disp == 'block' ? 'none' : 'block';
+
+	return false;
+}
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index 756ea9d62..1cca20c48 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -1,64 +1,84 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
-<meta charset="utf-8">
-<title>404 Page Not Found</title>
-<style type="text/css">
+	<meta charset="utf-8">
+	<title>404 Page Not Found</title>
 
-::selection { background-color: #E13300; color: white; }
-::-moz-selection { background-color: #E13300; color: white; }
-
-body {
-	background-color: #fff;
-	margin: 40px;
-	font: 13px/20px normal Helvetica, Arial, sans-serif;
-	color: #4F5155;
-}
-
-a {
-	color: #003399;
-	background-color: transparent;
-	font-weight: normal;
-}
-
-h1 {
-	color: #444;
-	background-color: transparent;
-	border-bottom: 1px solid #D0D0D0;
-	font-size: 19px;
-	font-weight: normal;
-	margin: 0 0 14px 0;
-	padding: 14px 15px 10px 15px;
-}
-
-code {
-	font-family: Consolas, Monaco, Courier New, Courier, monospace;
-	font-size: 12px;
-	background-color: #f9f9f9;
-	border: 1px solid #D0D0D0;
-	color: #002166;
-	display: block;
-	margin: 14px 0 14px 0;
-	padding: 12px 10px 12px 10px;
-}
-
-#container {
-	margin: 10px;
-	border: 1px solid #D0D0D0;
-	box-shadow: 0 0 8px #D0D0D0;
-}
-
-p {
-	margin: 12px 15px 12px 15px;
-}
-</style>
+	<style>
+		div.logo {
+			height: 200px;
+			width: 155px;
+			display: inline-block;
+			opacity: 0.08;
+			position: absolute;
+			top: 2rem;
+			left: 50%;
+			margin-left: -73px;
+		}
+		body {
+			height: 100%;
+			background: #fafafa;
+			font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+			color: #777;
+			font-weight: 300;
+		}
+		h1 {
+			font-weight: lighter;
+			letter-spacing: 0.8;
+			font-size: 3rem;
+			margin-top: 0;
+			margin-bottom: 0;
+			color: #222;
+		}
+		.wrap {
+			max-width: 1024px;
+			margin: 5rem auto;
+			padding: 2rem;
+			background: #fff;
+			text-align: center;
+			border: 1px solid #efefef;
+			border-radius: 0.5rem;
+			position: relative;
+		}
+		pre {
+			white-space: normal;
+			margin-top: 1.5rem;
+		}
+		code {
+			background: #fafafa;
+			border: 1px solid #efefef;
+			padding: 0.5rem 1rem;
+			border-radius: 5px;
+			display: block;
+		}
+		p {
+			margin-top: 1.5rem;
+		}
+		.footer {
+			margin-top: 2rem;
+			border-top: 1px solid #efefef;
+			padding: 1em 2em 0 2em;
+			font-size: 85%;
+			color: #999;
+		}
+		a:active,
+		a:link,
+		a:visited {
+			color: #dd4814;
+		}
+	</style>
 </head>
 <body>
-	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
+	<div class="wrap">
+		<h1>404 - File Not Found</h1>
+
+		<p>
+			<?php if (! empty($message) && $message !== '(null)') : ?>
+				<?= nl2br(esc($message)) ?>
+			<?php else : ?>
+				Sorry! Cannot seem to find the page you were looking for.
+			<?php endif ?>
+		</p>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/Views/errors/html/error_db.php b/app/Views/errors/html/error_db.php
index f5a43f638..9f7c5acf0 100644
--- a/app/Views/errors/html/error_db.php
+++ b/app/Views/errors/html/error_db.php
@@ -1,11 +1,15 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+/**
+ * @var string $heading
+ * @var string $message
+ */
+?>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <title>Database Error</title>
-<style type="text/css">
+<style>
 
 ::selection { background-color: #E13300; color: white; }
 ::-moz-selection { background-color: #E13300; color: white; }
@@ -57,8 +61,8 @@ p {
 </head>
 <body>
 	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
+		<h1><?php echo esc($heading) ?></h1>
+		<?php echo esc($message) ?>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 87848866a..2e6025b30 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -1,32 +1,410 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+use CodeIgniter\CodeIgniter;
+use Config\Services;
+
+/**
+ * @var string $title
+ * @var object $exception
+ * @var string $file
+ * @var int $line
+ * @var array $trace
+ */
+
+	$error_id = uniqid('error', true);
 ?>
+<!doctype html>
+<html lang="<?php echo $this->request->getLocale() ?>">
+<head>
+	<meta charset="UTF-8">
+	<meta name="robots" content="noindex">
 
-<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+	<title><?= esc($title) ?></title>
+	<style>
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+	</style>
 
-<h4>An uncaught Exception was encountered</h4>
+	<script type="text/javascript">
+		<?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
+	</script>
+</head>
+<body onload="init()">
 
-<p>Type: <?php echo get_class($exception); ?></p>
-<p>Message: <?php echo $message; ?></p>
-<p>Filename: <?php echo $exception->getFile(); ?></p>
-<p>Line Number: <?php echo $exception->getLine(); ?></p>
-
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
-
-	<p>Backtrace:</p>
-	<?php foreach ($exception->getTrace() as $error): ?>
-
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
-
-			<p style="margin-left:10px">
-			File: <?php echo $error['file']; ?><br />
-			Line: <?php echo $error['line']; ?><br />
-			Function: <?php echo $error['function']; ?>
+	<!-- Header -->
+	<div class="header">
+		<div class="container">
+			<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
+			<p>
+				<?= nl2br(esc($exception->getMessage())) ?>
+				<a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+				   rel="noreferrer" target="_blank">search &rarr;</a>
 			</p>
-		<?php endif ?>
+		</div>
+	</div>
 
-	<?php endforeach ?>
+	<!-- Source -->
+	<div class="container">
+		<p><b><?= esc(static::cleanPath($file, $line)) ?></b> at line <b><?= esc($line) ?></b></p>
 
-<?php endif ?>
+		<?php if (is_file($file)) : ?>
+			<div class="source">
+				<?= static::highlightFile($file, $line, 15); ?>
+			</div>
+		<?php endif; ?>
+	</div>
 
-</div>
\ No newline at end of file
+	<div class="container">
+
+		<ul class="tabs" id="tabs">
+			<li><a href="#backtrace">Backtrace</a></li>
+			<li><a href="#server">Server</a></li>
+			<li><a href="#request">Request</a></li>
+			<li><a href="#response">Response</a></li>
+			<li><a href="#files">Files</a></li>
+			<li><a href="#memory">Memory</a></li>
+		</ul>
+
+		<div class="tab-content">
+
+			<!-- Backtrace -->
+			<div class="content" id="backtrace">
+
+				<ol class="trace">
+				<?php foreach ($trace as $index => $row) : ?>
+
+					<li>
+						<p>
+							<!-- Trace info -->
+							<?php if (isset($row['file']) && is_file($row['file'])) :?>
+								<?php
+                                if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
+                                    echo esc($row['function'] . ' ' . static::cleanPath($row['file']));
+                                } else {
+                                    echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
+                                }
+                                ?>
+							<?php else : ?>
+								{PHP internal code}
+							<?php endif; ?>
+
+							<!-- Class/Method -->
+							<?php if (isset($row['class'])) : ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
+								<?php if (! empty($row['args'])) : ?>
+									<?php $args_id = $error_id . 'args' . $index ?>
+									( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
+									<div class="args" id="<?= esc($args_id, 'attr') ?>">
+										<table style="border-spacing: 0;">
+
+										<?php
+                                        $params = null;
+                                        // Reflection by name is not available for closure function
+                                        if (substr($row['function'], -1) !== '}') {
+                                            $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);	//TODO: isset($row['class']) will always evaluate to true at this point.
+                                            $params = $mirror->getParameters();
+                                        }
+
+                                        foreach ($row['args'] as $key => $value) : ?>
+											<tr>
+												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
+												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
+											</tr>
+										<?php endforeach ?>
+
+										</table>
+									</div>
+								<?php else : ?>
+									()
+								<?php endif; ?>
+							<?php endif; ?>
+
+							<?php if (! isset($row['class']) && isset($row['function'])) : ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;	<?= esc($row['function']) ?>()
+							<?php endif; ?>
+						</p>
+
+						<!-- Source? -->
+						<?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
+							<div class="source">
+								<?= static::highlightFile($row['file'], $row['line']) ?>
+							</div>
+						<?php endif; ?>
+					</li>
+
+				<?php endforeach; ?>
+				</ol>
+
+			</div>
+
+			<!-- Server -->
+			<div class="content" id="server">
+				<?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
+					<?php
+                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                        continue;
+                    } ?>
+
+					<h3>$<?= esc($var) ?></h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endforeach ?>
+
+				<!-- Constants -->
+				<?php $constants = get_defined_constants(true); ?>
+				<?php if (! empty($constants['user'])) : ?>
+					<h3>Constants</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($constants['user'] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+				<?php endif; ?>
+			</div>
+
+			<!-- Request -->
+			<div class="content" id="request">
+				<?php $request = service('request'); ?>
+
+				<table>
+					<tbody>
+						<tr>
+							<td style="width: 10em">Path</td>
+							<td><?= esc($request->getUri()) ?></td>
+						</tr>
+						<tr>
+							<td>HTTP Method</td>
+							<td><?= esc($request->getMethod(true)) ?></td>
+						</tr>
+						<tr>
+							<td>IP Address</td>
+							<td><?= esc($request->getIPAddress()) ?></td>
+						</tr>
+						<tr>
+							<td style="width: 10em">Is AJAX Request?</td>
+							<td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>Is CLI Request?</td>
+							<td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>Is Secure Request?</td>
+							<td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
+						</tr>
+						<tr>
+							<td>User Agent</td>
+							<td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
+						</tr>
+
+					</tbody>
+				</table>
+
+
+				<?php $empty = true; ?>
+				<?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
+					<?php
+                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                        continue;
+                    } ?>
+
+					<?php $empty = false; ?>
+
+					<h3>$<?= esc($var) ?></h3>
+
+					<table style="width: 100%">
+						<thead>
+							<tr>
+								<th>Key</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+							<tr>
+								<td><?= esc($key) ?></td>
+								<td>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
+									<?php else: ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
+									<?php endif; ?>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endforeach ?>
+
+				<?php if ($empty) : ?>
+
+					<div class="alert">
+						No $_GET, $_POST, or $_COOKIE Information to show.
+					</div>
+
+				<?php endif; ?>
+
+				<?php $headers = $request->getHeaders(); ?>
+				<?php if (! empty($headers)) : ?>
+
+					<h3>Headers</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Header</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($headers as $value) : ?>
+							<?php
+                            if (empty($value)) {
+                                continue;
+                            }
+
+                            if (! is_array($value)) {
+                                $value = [$value];
+                            } ?>
+							<?php foreach ($value as $h) : ?>
+								<tr>
+									<td><?= esc($h->getName(), 'html') ?></td>
+									<td><?= esc($h->getValueLine(), 'html') ?></td>
+								</tr>
+							<?php endforeach; ?>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endif; ?>
+			</div>
+
+			<!-- Response -->
+			<?php
+                $response = service('response');
+                $response->setStatusCode(http_response_code());
+            ?>
+			<div class="content" id="response">
+				<table>
+					<tr>
+						<td style="width: 15em">Response Status</td>
+						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReason()) ?></td>
+					</tr>
+				</table>
+
+				<?php $headers = $response->getHeaders(); ?>
+				<?php if (! empty($headers)) : ?>
+					<?php natsort($headers) ?>
+
+					<h3>Headers</h3>
+
+					<table>
+						<thead>
+							<tr>
+								<th>Header</th>
+								<th>Value</th>
+							</tr>
+						</thead>
+						<tbody>
+						<?php foreach ($headers as $name => $value) : ?>
+							<tr>
+								<td><?= esc($name, 'html') ?></td>
+								<td><?= esc($response->getHeaderLine($name), 'html') ?></td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+
+				<?php endif; ?>
+			</div>
+
+			<!-- Files -->
+			<div class="content" id="files">
+				<?php $files = get_included_files(); ?>
+
+				<ol>
+				<?php foreach ($files as $file) :?>
+					<li><?= esc(static::cleanPath($file)) ?></li>
+				<?php endforeach ?>
+				</ol>
+			</div>
+
+			<!-- Memory -->
+			<div class="content" id="memory">
+
+				<table>
+					<tbody>
+						<tr>
+							<td>Memory Usage</td>
+							<td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
+						</tr>
+						<tr>
+							<td style="width: 12em">Peak Memory Usage:</td>
+							<td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
+						</tr>
+						<tr>
+							<td>Memory Limit:</td>
+							<td><?= esc(ini_get('memory_limit')) ?></td>
+						</tr>
+					</tbody>
+				</table>
+
+			</div>
+
+		</div>  <!-- /tab-content -->
+
+	</div> <!-- /container -->
+
+	<div class="footer">
+		<div class="container">
+
+			<p>
+				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+				PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+				CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?>
+			</p>
+
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/app/Views/errors/html/error_general.php b/app/Views/errors/html/error_general.php
index fc3b2ebad..5f930fa39 100644
--- a/app/Views/errors/html/error_general.php
+++ b/app/Views/errors/html/error_general.php
@@ -1,11 +1,15 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+/**
+ * @var string $heading
+ * @var string $message
+ */
+?>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <title>Error</title>
-<style type="text/css">
+<style>
 
 ::selection { background-color: #E13300; color: white; }
 ::-moz-selection { background-color: #E13300; color: white; }
@@ -57,8 +61,8 @@ p {
 </head>
 <body>
 	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
+		<h1><?php echo esc($heading) ?></h1>
+		<?php echo esc($message) ?>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/Views/errors/html/error_php.php b/app/Views/errors/html/error_php.php
index b146f9c5b..c9813e40f 100644
--- a/app/Views/errors/html/error_php.php
+++ b/app/Views/errors/html/error_php.php
@@ -1,22 +1,26 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+/**
+ * @var string $severity
+ * @var string $message
+ * @var string $filepath
+ * @var int $line
+ */
 ?>
-
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
 
 <h4>A PHP Error was encountered</h4>
 
-<p>Severity: <?php echo $severity; ?></p>
-<p>Message:  <?php echo $message; ?></p>
-<p>Filename: <?php echo $filepath; ?></p>
-<p>Line Number: <?php echo $line; ?></p>
+<p>Severity: <?php echo esc($severity) ?></p>
+<p>Message:  <?php echo esc($message) ?></p>
+<p>Filename: <?php echo esc($filepath) ?></p>
+<p>Line Number: <?php echo $line ?></p>
 
 <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 	<p>Backtrace:</p>
 	<?php foreach (debug_backtrace() as $error): ?>
 
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+		<?php if (isset($error['file']) && strpos($error['file'], realpath(ROOTPATH)) !== 0): ?>
 
 			<p style="margin-left:10px">
 			File: <?php echo $error['file'] ?><br />
diff --git a/app/Views/errors/html/index.html b/app/Views/errors/html/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Views/errors/html/index.html
+++ b/app/Views/errors/html/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php
new file mode 100644
index 000000000..0035bd89b
--- /dev/null
+++ b/app/Views/errors/html/production.php
@@ -0,0 +1,25 @@
+<!doctype html>
+<html lang="<?php echo $this->request->getLocale() ?>">
+<head>
+	<meta charset="UTF-8">
+	<meta name="robots" content="noindex">
+
+	<title>Whoops!</title>
+
+	<style>
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+	</style>
+</head>
+<body>
+
+	<div class="container text-center">
+
+		<h1 class="headline">Whoops!</h1>
+
+		<p class="lead">We seem to have hit a snag. Please try again later...</p>
+
+	</div>
+
+</body>
+
+</html>
diff --git a/app/Views/errors/index.html b/app/Views/errors/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Views/errors/index.html
+++ b/app/Views/errors/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php
index 6340355ba..afd91ecf0 100644
--- a/app/Views/expenses/form.php
+++ b/app/Views/expenses/form.php
@@ -1,43 +1,53 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $expenses_info
+ * @var array $payment_options
+ * @var array $expense_categories
+ * @var array $employees
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('expenses/save/'.$expenses_info->expense_id, array('id'=>'expenses_edit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("expenses/save/$expenses_info->expense_id", ['id' => 'expenses_edit_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_info'), 'expenses_info', array('class'=>'control-label col-xs-3')); ?>
-			<?php echo form_label(!empty($expenses_info->expense_id) ? $this->lang->line('expenses_expense_id') . ' ' . $expenses_info->expense_id : '', 'expenses_info_id', array('class'=>'control-label col-xs-8', 'style'=>'text-align:left')); ?>
+			<?php echo form_label(lang('Expenses.info'), 'expenses_info', ['class' => 'control-label col-xs-3']) ?>
+			<?php echo form_label(!empty($expenses_info->expense_id) ? lang('Expenses.expense_id') . " $expenses_info->expense_id" : '', 'expenses_info_id', ['class' => 'control-label col-xs-8', 'style' => 'text-align:left']) ?>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_date'), 'date', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.date'), 'date', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
-					<?php echo form_input(array(
-							'name'=>'date',
-							'class'=>'form-control input-sm datetime',
- 							'value'=>to_datetime(strtotime($expenses_info->date)),
-                            'readonly'=>'readonly')
-							);?>
+					<?php echo form_input ([
+						'name' => 'date',
+						'class' => 'form-control input-sm datetime',
+ 						'value' => to_datetime(strtotime($expenses_info->date)),
+                        'readonly' => 'readonly'
+						]
+					) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_supplier_name'), 'supplier_name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.supplier_name'), 'supplier_name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_input(array(
-						'name'=>'supplier_name',
-						'id'=>'supplier_name',
-						'class'=>'form-control input-sm',
-						'value'=>$this->lang->line('expenses_start_typing_supplier_name'))
-					);
-					echo form_input(array(
-						'type'=>'hidden',
-						'name'=>'supplier_id',
-						'id'=>'supplier_id')
-						);?>
+				<?php echo form_input ([
+						'name' => 'supplier_name',
+						'id' => 'supplier_name',
+						'class' => 'form-control input-sm',
+						'value'=>lang('Expenses.start_typing_supplier_name')
+					]);
+					echo form_input ([
+						'type' => 'hidden',
+						'name' => 'supplier_id',
+						'id' => 'supplier_id'
+				]) ?>
 			</div>
 			<div class="col-xs-2">
 				<a id="remove_supplier_button" class="btn btn-danger btn-sm" title="Remove Supplier">
@@ -47,87 +57,87 @@
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_supplier_tax_code'), 'supplier_tax_code', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.supplier_tax_code'), 'supplier_tax_code', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_input(array(
-						'name'=>'supplier_tax_code',
-						'id'=>'supplier_tax_code',
-						'class'=>'form-control input-sm',
-						'value'=>$expenses_info->supplier_tax_code)
-						);?>
+				<?php echo form_input ([
+					'name' => 'supplier_tax_code',
+					'id' => 'supplier_tax_code',
+					'class' => 'form-control input-sm',
+					'value' => esc($expenses_info->supplier_tax_code, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_amount'), 'amount', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.amount'), 'amount', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'amount',
-							'id'=>'amount',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($expenses_info->amount))
-							);?>
+					<?php echo form_input ([
+						'name' => 'amount',
+						'id' => 'amount',
+						'class' => 'form-control input-sm',
+						'value' => to_currency_no_money($expenses_info->amount)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_tax_amount'), 'tax_amount', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.tax_amount'), 'tax_amount', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'tax_amount',
-							'id'=>'tax_amount',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($expenses_info->tax_amount))
-							);?>
+					<?php echo form_input ([
+						'name' => 'tax_amount',
+						'id' => 'tax_amount',
+						'class' => 'form-control input-sm',
+						'value' => to_currency_no_money($expenses_info->tax_amount)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_payment'), 'payment_type', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.payment'), 'payment_type', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('payment_type', $payment_options, $expenses_info->payment_type, array('class'=>'form-control', 'id'=>'payment_type'));?>
+				<?php echo form_dropdown('payment_type', esc($payment_options, 'attr'), esc($expenses_info->payment_type, 'attr'), ['class' => 'form-control', 'id' => 'payment_type']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_categories_name'), 'category', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses_categories.name'), 'category', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('expense_category_id', $expense_categories, $expenses_info->expense_category_id, array('class'=>'form-control', 'id'=>'category')); ?>
+				<?php echo form_dropdown('expense_category_id', esc($expense_categories, 'attr'), $expenses_info->expense_category_id, ['class' => 'form-control', 'id' => 'category']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_dropdown('employee_id', $employees, $expenses_info->employee_id, 'id="employee_id" class="form-control"');?>
+				<?php echo form_dropdown('employee_id', esc($employees, 'attr'), $expenses_info->employee_id, 'id="employee_id" class="form-control"') ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses.description'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-6'>
-				<?php echo form_textarea(array(
-					'name'=>'description',
-					'id'=>'description',
-					'class'=>'form-control input-sm',
-					'value'=>$expenses_info->description)
-					);?>
+				<?php echo form_textarea ([
+					'name' => 'description',
+					'id' => 'description',
+					'class' => 'form-control input-sm',
+					'value' => esc($expenses_info->description, 'attr')
+				]) ?>
 			</div>
 		</div>
 
@@ -136,31 +146,31 @@
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('expenses_is_deleted').':', 'deleted', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Expenses.is_deleted').':', 'deleted', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-5'>
-					<?php echo form_checkbox(array(
-						'name'=>'deleted',
-						'id'=>'deleted',
-						'value'=>1,
-						'checked'=>($expenses_info->deleted) ? 1 : 0)
-					);?>
+					<?php echo form_checkbox ([
+						'name' => 'deleted',
+						'id' => 'deleted',
+						'value' => 1,
+						'checked' => ($expenses_info->deleted) ? 1 : 0
+					]) ?>
 				</div>
 			</div>
 		<?php
 		}
 		?>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type='text/javascript'>
 //validation and submit handling
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/datepicker_locale'); ?>
+	<?php echo view('partial/datepicker_locale') ?>
 
 	var amount_validator = function(field) {
 		return {
-			url: "<?php echo site_url($controller_name . '/ajax_check_amount')?>",
+			url: "<?php echo esc(site_url("$controller_name/ajax_check_amount"), 'url') ?>",
 			type: 'POST',
 			dataFilter: function(data) {
 				var response = JSON.parse(data);
@@ -174,7 +184,7 @@ $(document).ready(function()
 	});
 
 	$('#supplier_name').autocomplete({
-		source: '<?php echo site_url("suppliers/suggest"); ?>',
+		source: '<?php echo esc(site_url("suppliers/suggest"), 'url') ?>',
 		minChars:0,
 		delay:10,
 		select: function (event, ui) {
@@ -187,7 +197,7 @@ $(document).ready(function()
 	});
 
 	$('#supplier_name').blur(function() {
-		$(this).attr('value',"<?php echo $this->lang->line('expenses_start_typing_supplier_name'); ?>");
+		$(this).attr('value',"<?php echo lang('Expenses.start_typing_supplier_name') ?>");
 	});
 
 	$('#remove_supplier_button').css('display', 'none');
@@ -204,7 +214,7 @@ $(document).ready(function()
 	{
 	?>
 		$('#supplier_id').val('<?php echo $expenses_info->supplier_id ?>');
-		$('#supplier_name').val('<?php echo $expenses_info->supplier_name ?>').attr('readonly', 'readonly');
+		$('#supplier_name').val('<?php echo esc($expenses_info->supplier_name, 'js') ?>').attr('readonly', 'readonly');
 		$('#remove_supplier_button').css('display', 'inline-block');
 	<?php
 	}
@@ -216,7 +226,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -246,20 +256,20 @@ $(document).ready(function()
 
 		messages:
 		{
-			category: "<?php echo $this->lang->line('expenses_category_required'); ?>",
+			category: "<?php echo lang('Expenses.category_required') ?>",
 			date:
 			{
-				required: "<?php echo $this->lang->line('expenses_date_required'); ?>"
+				required: "<?php echo lang('Expenses.date_required') ?>"
 
 			},
 			amount:
 			{
-				required: "<?php echo $this->lang->line('expenses_amount_required'); ?>",
-				remote: "<?php echo $this->lang->line('expenses_amount_number'); ?>"
+				required: "<?php echo lang('Expenses.amount_required') ?>",
+				remote: "<?php echo lang('Expenses.amount_number') ?>"
 			},
 			tax_amount:
 			{
-				remote: "<?php echo $this->lang->line('expenses_tax_amount_number'); ?>"
+				remote: "<?php echo lang('Expenses.tax_amount_number') ?>"
 			}
 		}
 	}, form_support.error));
diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php
index ed5133f08..71f76610f 100644
--- a/app/Views/expenses/manage.php
+++ b/app/Views/expenses/manage.php
@@ -1,4 +1,11 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ * @var array $filters
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -9,24 +16,23 @@ $(document).ready(function()
 	});
 	
 	// load the preset datarange picker
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
 		table_support.refresh();
 	});
 
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers) ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'expense_id',
 		onLoadSuccess: function(response) {
 			if($("#table tbody tr").length > 1) {
 				$("#payment_summary").html(response.payment_summary);
 				$("#table tbody tr:last td:first").html("");
-				$("#table tbody tr:last").css('font-weight', 'bold');
 			}
 		},
 		queryParams: function() {
@@ -40,26 +46,26 @@ $(document).ready(function()
 });
 </script>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'takings_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
 	<button onclick="javascript:printdoc()" class='btn btn-info btn-sm pull-right'>
-		<span class="glyphicon glyphicon-print">&nbsp;</span><?php echo $this->lang->line('common_print'); ?>
+		<span class="glyphicon glyphicon-print">&nbsp;</span><?php echo lang('Common.print') ?>
 	</button>
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
-		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang($controller_name . 'new') ?>'>
+		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo lang($controller_name . '.new') ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
 		<button id="delete" class="btn btn-default btn-sm print_hide">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 
-		<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
-		<?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+		<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
+		<?php echo form_multiselect('filters[]', esc($filters, 'attr'), [''], ['id' => 'filters', 'data-none-selected-text' => lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 	</div>
 </div>
 
@@ -70,4 +76,4 @@ $(document).ready(function()
 <div id="payment_summary">
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/expenses_categories/form.php b/app/Views/expenses_categories/form.php
index 21997b94f..b531a9538 100644
--- a/app/Views/expenses_categories/form.php
+++ b/app/Views/expenses_categories/form.php
@@ -1,35 +1,41 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $category_info
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('expenses_categories/save/'.$category_info->expense_category_id, array('id'=>'expense_category_edit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("expenses_categories/save/$category_info->expense_category_id", ['id' => 'expense_category_edit_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="expenses_categories">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_categories_name'), 'category_name', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses_categories.name'), 'category_name', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'category_name',
-						'id'=>'category_name',
-						'class'=>'form-control input-sm',
-						'value'=>$category_info->category_name)
-						);?>
+				<?php echo form_input ([
+					'name' => 'category_name',
+					'id' => 'category_name',
+					'class' => 'form-control input-sm',
+					'value' => esc($category_info->category_name, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('expenses_categories_description'), 'category_description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Expenses_categories.description'), 'category_description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array(
-						'name'=>'category_description',
-						'id'=>'category_description',
-						'class'=>'form-control input-sm',
-						'value'=>$category_info->category_description)
-						);?>
+				<?php echo form_textarea ([
+					'name' => 'category_description',
+					'id' => 'category_description',
+					'class' => 'form-control input-sm',
+					'value' => esc($category_info->category_description, 'attr')
+				]) ?>
 			</div>
 		</div>
 		
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type='text/javascript'>
 //validation and submit handling
@@ -41,7 +47,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -56,7 +62,7 @@ $(document).ready(function()
 
 		messages:
 		{
-			category_name: "<?php echo $this->lang->line('category_name_required'); ?>"
+			category_name: "<?php echo lang('Expenses_categories.category_name_required') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/expenses_categories/manage.php b/app/Views/expenses_categories/manage.php
index 391509ee3..f57b1e185 100644
--- a/app/Views/expenses_categories/manage.php
+++ b/app/Views/expenses_categories/manage.php
@@ -1,14 +1,20 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers) ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'expense_category_id',
 		
 	});
@@ -22,16 +28,16 @@ $(document).ready(function()
 </script>
 
 <div id="title_bar" class="btn-toolbar">
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
-		<span class="glyphicon glyphicon-list">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang($controller_name . '.new') ?>'>
+		<span class="glyphicon glyphicon-list">&nbsp</span><?php echo lang($controller_name . '.new') ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
 		<button id="delete" class="btn btn-default btn-sm print_hide">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 	</div>
 </div>
@@ -40,4 +46,4 @@ $(document).ready(function()
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/giftcards/form.php b/app/Views/giftcards/form.php
index 22285ea3a..6cae79aa7 100644
--- a/app/Views/giftcards/form.php
+++ b/app/Views/giftcards/form.php
@@ -1,62 +1,72 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var int $giftcard_id
+ * @var string $selected_person_name
+ * @var int $selected_person_id
+ * @var string $giftcard_number
+ * @var float $giftcard_value
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('giftcards/save/'.$giftcard_id, array('id'=>'giftcard_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("giftcards/save/$giftcard_id", ['id' => 'giftcard_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="giftcard_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('giftcards_person_id'), 'person_name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Giftcards.person_id'), 'person_name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'person_name',
-						'id'=>'person_name',
-						'class'=>'form-control input-sm',
-						'value'=>$selected_person_name)
-						);?>
-				<?php echo form_hidden('person_id', $selected_person_id);?>
+				<?php echo form_input ([
+					'name' => 'person_name',
+					'id' => 'person_name',
+					'class' => 'form-control input-sm',
+					'value' => esc($selected_person_name, 'attr')
+				]) ?>
+				<?php echo form_hidden('person_id', $selected_person_id) ?>
 			</div>
 		</div>
 
 		<?php 
 		$class = '';
-		if($this->config->item('giftcard_number') == 'series')
+		if(config('OSPOS')->giftcard_number == 'series')
 		{
 			$class = ' required';
 		}
 		?>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('giftcards_giftcard_number'), 'giftcard_number', array('class'=>'control-label col-xs-3'.$class)); ?>
-			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'giftcard_number',
-						'id'=>'giftcard_number',
-						'class'=>'form-control input-sm',
-						'value'=>$giftcard_number)
-						);?>
+			<?php echo form_label(lang('Giftcards.giftcard_number'), 'giftcard_number', ['class'=>"control-label col-xs-3$class"]) ?>
+			<div class="col-xs-4'>
+				<?php echo form_input ([
+					'name' => 'giftcard_number',
+					'id' => 'giftcard_number',
+					'class' => 'form-control input-sm',
+					'value' => esc($giftcard_number, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('giftcards_card_value'), 'giftcard_amount', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Giftcards.card_value'), 'giftcard_amount', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><?php echo $this->config->item('currency_symbol'); ?></span>
+						<span class="input-group-addon input-sm"><?php echo esc(config('OSPOS')->currency_symbol) ?></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'giftcard_amount',
-							'id'=>'giftcard_amount',
-							'class'=>'form-control input-sm',
-							'value'=>to_currency_no_money($giftcard_value))
-							);?>
+					<?php echo form_input ([
+						'name' => 'giftcard_amount',
+						'id' => 'giftcard_amount',
+						'class' => 'form-control input-sm',
+						'value'=>to_currency_no_money($giftcard_value)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -73,7 +83,7 @@ $(document).ready(function()
 	};
 
 	$('#person_name').autocomplete({
-		source: "<?php echo site_url('customers/suggest'); ?>",
+		source: "<?php echo esc(site_url('customers/suggest'), 'url') ?>",
 		minChars: 0,
 		delay: 15, 
 	   	cacheLength: 1,
@@ -88,11 +98,11 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				error: function(jqXHR, textStatus, errorThrown) 
 				{
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", {message: errorThrown});
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", {message: errorThrown});
 				},
 				dataType: 'json'
 			});
@@ -103,7 +113,7 @@ $(document).ready(function()
 		rules:
 		{
 			<?php
-			if($this->config->item('giftcard_number') == 'series')
+			if(config('OSPOS')->giftcard_number == 'series')
 			{
 			?>
 			giftcard_number:
@@ -119,7 +129,7 @@ $(document).ready(function()
 				required: true,
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/ajax_check_number_giftcard')?>",
+					url: "<?php echo esc(site_url("$controller_name/ajax_check_number_giftcard"), 'url') ?>",
 					type: 'POST',
 					data: {
 						'amount': $('#giftcard_amount').val()
@@ -136,21 +146,21 @@ $(document).ready(function()
 		messages:
 		{
 			<?php
-			if($this->config->item('giftcard_number') == 'series')
+			if(config('OSPOS')->giftcard_number == 'series')
 			{
 			?>
 				giftcard_number:
 				{
-					required: "<?php echo $this->lang->line('giftcards_number_required'); ?>",
-					number: "<?php echo $this->lang->line('giftcards_number'); ?>"
+					required: "<?php echo lang('Giftcards.number_required') ?>",
+					number: "<?php echo lang('Giftcards.number') ?>"
 				},
  			<?php
 			}
 			?>
 			giftcard_amount:
 			{
-				required: "<?php echo $this->lang->line('giftcards_value_required'); ?>",
-				remote: "<?php echo $this->lang->line('giftcards_value'); ?>"
+				required: "<?php echo lang('Giftcards.value_required') ?>",
+				remote: "<?php echo lang('Giftcards.value') ?>"
 			}
 		}
 	}, form_support.error));
diff --git a/app/Views/giftcards/manage.php b/app/Views/giftcards/manage.php
index 3c7f9843d..4f551bc20 100644
--- a/app/Views/giftcards/manage.php
+++ b/app/Views/giftcards/manage.php
@@ -1,28 +1,34 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ */
+?>
+<?php echo view('partial/header') ?>
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers) ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'giftcard_id'
 	});
 });
 </script>
 
 <div id="title_bar" class="btn-toolbar">
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
-		<span class="glyphicon glyphicon-heart">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang($controller_name . '.new') ?>'>
+		<span class="glyphicon glyphicon-heart">&nbsp</span><?php echo lang($controller_name . '.new') ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left btn-toolbar">
 		<button id="delete" class="btn btn-default btn-sm">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete"); ?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 	</div>
 </div>
@@ -31,4 +37,4 @@ $(document).ready(function()
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
+<?php echo view('partial/footer') ?>
\ No newline at end of file
diff --git a/app/Views/home/form_change_password.php b/app/Views/home/form_change_password.php
index 3602a1b74..39448c650 100644
--- a/app/Views/home/form_change_password.php
+++ b/app/Views/home/form_change_password.php
@@ -1,74 +1,79 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $person_info
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('home/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("home/save/$person_info->person_id", ['id' => 'employee_form', 'class' => 'form-horizontal']) ?>
 	<div class="tab-content">
 		<div class="tab-pane fade in active" id="employee_login_info">
 			<fieldset>
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_username'), 'username', array('class'=>'required control-label col-xs-3')); ?>
+					<?php echo form_label(lang('Employees.username'), 'username', ['class' => 'required control-label col-xs-3']) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
-							<?php echo form_input(array(
-									'name'=>'username',
-									'id'=>'username',
-									'class'=>'form-control input-sm',
-									'value'=>$person_info->username,
-									'readonly'=>'true')
-									);?>
+							<?php echo form_input ([
+								'name' => 'username',
+								'id' => 'username',
+								'class' => 'form-control input-sm',
+								'value' => esc($person_info->username, 'attr'),
+								'readonly' => 'true'
+							]) ?>
 						</div>
 					</div>
 				</div>
 
-				<?php $password_label_attributes = $person_info->person_id == "" ? array('class'=>'required') : array(); ?>
+				<?php $password_label_attributes = $person_info->person_id == "" ? ['class' => 'required'] : []; ?>
 
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_current_password'), 'current_password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+					<?php echo form_label(lang('Employees.current_password'), 'current_password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-							<?php echo form_password(array(
-									'name'=>'current_password',
-									'id'=>'current_password',
-									'class'=>'form-control input-sm')
-									);?>
+							<?php echo form_password ([
+								'name' => 'current_password',
+								'id' => 'current_password',
+								'class' => 'form-control input-sm'
+							]) ?>
 						</div>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">	
-					<?php echo form_label($this->lang->line('employees_password'), 'password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+					<?php echo form_label(lang('Employees.password'), 'password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-							<?php echo form_password(array(
-									'name'=>'password',
-									'id'=>'password',
-									'class'=>'form-control input-sm')
-									);?>
+							<?php echo form_password ([
+								'name' => 'password',
+								'id' => 'password',
+								'class' => 'form-control input-sm'
+							]) ?>
 						</div>
 					</div>
 				</div>
 
 				<div class="form-group form-group-sm">	
-				<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password', array_merge($password_label_attributes, array('class'=>'control-label col-xs-3'))); ?>
+				<?php echo form_label(lang('Employees.repeat_password'), 'repeat_password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
 					<div class='col-xs-8'>
 						<div class="input-group">
 							<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
-							<?php echo form_password(array(
-									'name'=>'repeat_password',
-									'id'=>'repeat_password',
-									'class'=>'form-control input-sm')
-									);?>
+							<?php echo form_password ([
+								'name' => 'repeat_password',
+								'id' => 'repeat_password',
+								'class' => 'form-control input-sm'
+							]) ?>
 						</div>
 					</div>
 				</div>
 			</fieldset>
 		</div>
 	</div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -78,7 +83,7 @@ $(document).ready(function()
 
 	$.validator.addMethod("notEqualTo", function(value, element, param) {
 		return this.optional(element) || value != $(param).val();
-	}, '<?php echo $this->lang->line('employees_password_not_must_match'); ?>');
+	}, '<?php echo lang('Employees.password_not_must_match') ?>');
 	
 	$('#employee_form').validate($.extend({
 		submitHandler: function(form) {
@@ -104,7 +109,7 @@ $(document).ready(function()
 				required:true,
 				minlength: 8,
 				notEqualTo: "#current_password"
-			},	
+			},
 			repeat_password:
 			{
  				equalTo: "#password"
@@ -115,12 +120,12 @@ $(document).ready(function()
 		{
 			password:
 			{
-				required:"<?php echo $this->lang->line('employees_password_required'); ?>",
-				minlength: "<?php echo $this->lang->line('employees_password_minlength'); ?>"
+				required:"<?php echo lang('Employees.password_required') ?>",
+				minlength: "<?php echo lang('Employees.password_minlength') ?>"
 			},
 			repeat_password:
 			{
-				equalTo: "<?php echo $this->lang->line('employees_password_must_match'); ?>"
+				equalTo: "<?php echo lang('Employees.password_must_match') ?>"
      		}
 		}
 	}, form_support.error));
diff --git a/app/Views/home/home.php b/app/Views/home/home.php
index ce2ebeebf..911adae17 100644
--- a/app/Views/home/home.php
+++ b/app/Views/home/home.php
@@ -1,23 +1,28 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var array $allowed_modules
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
-<h3 class="text-center"><?php echo $this->lang->line('common_welcome_message'); ?></h3>
+<h3 class="text-center"><?php echo lang('Common.welcome_message') ?></h3>
 
 <div id="home_module_list">
 	<?php
 	foreach($allowed_modules as $module)
 	{
 	?>
-		<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
-			<a href="<?php echo site_url("$module->module_id");?>"><img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a>
-			<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
+		<div class="module_item" title="<?php echo lang("Module.$module->module_id" . '_desc') ?>">
+			<a href="<?php echo esc(site_url($module->module_id), 'url') ?>"><img src="<?php echo esc(base_url() . "images/menubar/$module->module_id.png", 'url') ?>" style="border-width: 0;" alt="Menubar Image" /></a>
+			<a href="<?php echo esc(site_url($module->module_id), 'url') ?>"><?php echo lang("Module.$module->module_id") ?></a>
 		</div>
 	<?php
 	}
 	?>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/home/office.php b/app/Views/home/office.php
index 9bacfbb66..c1c6614eb 100644
--- a/app/Views/home/office.php
+++ b/app/Views/home/office.php
@@ -1,23 +1,28 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var array $allowed_modules
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
-<h3 class="text-center"><?php echo $this->lang->line('common_welcome_message'); ?></h3>
+<h3 class="text-center"><?php echo lang('Common.welcome_message') ?></h3>
 
 <div id="office_module_list">
 	<?php
 	foreach($allowed_modules as $module)
 	{
 	?>
-		<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
-			<a href="<?php echo site_url("$module->module_id");?>"><img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a>
-			<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
+		<div class="module_item" title="<?php echo lang("Module.$module->module_id" . '_desc') ?>">
+			<a href="<?php echo esc(site_url($module->module_id), 'url') ?>"><img src="<?php echo esc(base_url() . "images/menubar/$module->module_id.png", 'url') ?>" style="border-width: 0;" alt="Menubar Image" /></a>
+			<a href="<?php echo esc(site_url($module->module_id), 'url') ?>"><?php echo lang("Module.$module->module_id") ?></a>
 		</div>
 	<?php
 	}
 	?>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/index.html b/app/Views/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Views/index.html
+++ b/app/Views/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/item_kits/form.php b/app/Views/item_kits/form.php
index 93aac9e0c..416132f63 100644
--- a/app/Views/item_kits/form.php
+++ b/app/Views/item_kits/form.php
@@ -1,148 +1,157 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $item_kit_info
+ * @var string $selected_kit_item
+ * @var int $selected_kit_item_id
+ * @var array $item_kit_items
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('item_kits/save/'.$item_kit_info->item_kit_id, array('id'=>'item_kit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("item_kits/save/$item_kit_info->item_kit_id", ['id' => 'item_kit_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="item_kit_basic_info">
-        <div class="form-group form-group-sm">
-            <?php echo form_label($this->lang->line('item_kits_item_kit_number'), 'item_kit_number', array('class'=>'control-label col-xs-3')); ?>
-            <div class='col-xs-8'>
-                <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
-                    <?php echo form_input(array(
-                            'name'=>'item_kit_number',
-                            'id'=>'item_kit_number',
-                            'class'=>'form-control input-sm',
-                            'value'=>$item_kit_info->item_kit_number)
-                    );?>
-                </div>
-            </div>
-        </div>
+		<div class="form-group form-group-sm">
+			<?php echo form_label(lang('Item_kits.item_kit_number'), 'item_kit_number', ['class' => 'control-label col-xs-3']) ?>
+			<div class='col-xs-8'>
+				<div class="input-group">
+					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
+					<?php echo form_input ([
+						'name' => 'item_kit_number',
+						'id' => 'item_kit_number',
+						'class' => 'form-control input-sm',
+						'value' => esc($item_kit_info->item_kit_number, 'attr')
+					]) ?>
+				</div>
+			</div>
+		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_name'), 'name', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.name'), 'name', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'name',
-						'id'=>'name',
-						'class'=>'form-control input-sm',
-						'value'=>$item_kit_info->name)
-						);?>
+				<?php echo form_input ([
+					'name' => 'name',
+					'id' => 'name',
+					'class' => 'form-control input-sm',
+					'value' => esc($item_kit_info->name, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group  form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_find_kit_item'), 'item_name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.find_kit_item'), 'item_name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group input-group-sm">
-				<?php echo form_input(array(
-						'name'=>'item_name',
-						'id'=>'item_name',
-						'class'=>'form-control input-sm',
-						'size'=>'50',
-						'value'=>$selected_kit_item)
-						); ?>
-					<?php echo form_hidden('kit_item_id', $selected_kit_item_id);?>
+				<?php echo form_input ([
+					'name' => 'item_name',
+					'id' => 'item_name',
+					'class' => 'form-control input-sm',
+					'size' => '50',
+					'value' => esc($selected_kit_item, 'attr')
+				]) ?>
+					<?php echo form_hidden('kit_item_id', $selected_kit_item_id) ?>
 
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_discount_type'), 'kit_discount_type', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.discount_type'), 'kit_discount_type', ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'kit_discount_type',
-							'type'=>'radio',
-							'value'=>0,
-							'checked'=>$item_kit_info->kit_discount_type == PERCENT)
-					); ?> <?php echo $this->lang->line('item_kits_discount_percent'); ?>
+					<?php echo form_radio ([
+						'name' => 'kit_discount_type',
+						'type' => 'radio',
+						'value' => 0,
+						'checked' => $item_kit_info->kit_discount_type == PERCENT
+					]) ?> <?php echo lang('Item_kits.discount_percent') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'kit_discount_type',
-							'type'=>'radio',
-							'value'=>1,
-							'checked'=>$item_kit_info->kit_discount_type == FIXED)
-					); ?> <?php echo $this->lang->line('item_kits_discount_fixed'); ?>
+					<?php echo form_radio ([
+						'name' => 'kit_discount_type',
+						'type' => 'radio',
+						'value' => 1,
+						'checked' => $item_kit_info->kit_discount_type == FIXED
+					]) ?> <?php echo lang('Item_kits.discount_fixed') ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_discount'), 'kit_discount', array('class' => 'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.discount'), 'kit_discount', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-3'>
 				<div class="input-group input-group-sm">
-					<?php echo form_input(array(
-							'name'=>'kit_discount',
-							'size'=>'5',
-							'maxlength'=>'5',
-							'id'=>'kit_discount',
-							'class'=>'form-control input-sm',
-							'value'=>$item_kit_info->kit_discount)
-					);?>
+					<?php echo form_input ([
+						'name' => 'kit_discount',
+						'size' => '5',
+						'maxlength' => '5',
+						'id' => 'kit_discount',
+						'class' => 'form-control input-sm',
+						'value' => $item_kit_info->kit_discount
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_price_option'), 'price_option', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.price_option'), 'price_option', !empty($basic_version) ? ['class' => 'required control-label col-xs-3'] : ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'price_option',
-							'type'=>'radio',
-							'value'=>0,
-							'checked'=>$item_kit_info->price_option == PRICE_ALL)
-					); ?> <?php echo $this->lang->line('item_kits_kit_and_components'); ?>
+					<?php echo form_radio ([
+						'name' => 'price_option',
+						'type' => 'radio',
+						'value' => 0,
+						'checked' => $item_kit_info->price_option == PRICE_ALL
+					]) ?> <?php echo lang('Item_kits.kit_and_components') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'price_option',
-							'type'=>'radio',
-							'value'=>1,
-							'checked'=>$item_kit_info->price_option == PRICE_KIT)
-					); ?> <?php echo $this->lang->line('item_kits_kit_only'); ?>
+					<?php echo form_radio ([
+						'name' => 'price_option',
+						'type' => 'radio',
+						'value' => 1,
+						'checked' => $item_kit_info->price_option == PRICE_KIT
+					]) ?> <?php echo lang('Item_kits.kit_only') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'price_option',
-							'type'=>'radio',
-							'value'=>2,
-							'checked'=>$item_kit_info->price_option == PRICE_KIT_ITEMS)
-					); ?> <?php echo $this->lang->line('item_kits_kit_and_stock'); ?>
+					<?php echo form_radio ([
+						'name' => 'price_option',
+						'type' => 'radio',
+						'value' => 2,
+						'checked' => $item_kit_info->price_option == PRICE_KIT_ITEMS	//TODO: === for all of these?
+					]) ?> <?php echo lang('Item_kits.kit_and_stock') ?>
 				</label>
 
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_print_option'), 'print_option', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.print_option'), 'print_option', !empty($basic_version) ? ['class' => 'required control-label col-xs-3'] : ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'print_option',
-							'type'=>'radio',
-							'value'=>0,
-							'checked'=>$item_kit_info->print_option == PRINT_ALL)
-					); ?> <?php echo $this->lang->line('item_kits_all'); ?>
+					<?php echo form_radio ([
+						'name' => 'print_option',
+						'type' => 'radio',
+						'value' => 0,
+						'checked' => $item_kit_info->print_option == PRINT_ALL
+					]) ?> <?php echo lang('Item_kits.all') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'print_option',
-							'type'=>'radio',
-							'value'=>1,
-							'checked'=>$item_kit_info->print_option == PRINT_PRICED)
-					); ?> <?php echo $this->lang->line('item_kits_priced_only'); ?>
+					<?php echo form_radio ([
+						'name' => 'print_option',
+						'type' => 'radio',
+						'value' => 1,
+						'checked' => $item_kit_info->print_option == PRINT_PRICED
+					]) ?> <?php echo lang('Item_kits.priced_only') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'print_option',
-							'type'=>'radio',
-							'value'=>2,
-							'checked'=>$item_kit_info->print_option == PRINT_KIT)
-					); ?> <?php echo $this->lang->line('item_kits_kit_only'); ?>
+					<?php echo form_radio ([
+						'name' => 'print_option',
+						'type' => 'radio',
+						'value' => 2,
+						'checked' => $item_kit_info->print_option == PRINT_KIT
+					]) ?> <?php echo lang('Item_kits.kit_only') ?>
 				</label>
 
 			</div>
@@ -150,35 +159,35 @@
 
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.description'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array(
-						'name'=>'description',
-						'id'=>'description',
-						'class'=>'form-control input-sm',
-						'value'=>$item_kit_info->description)
-						);?>
+				<?php echo form_textarea ([
+					'name' => 'description',
+					'id' => 'description',
+					'class' => 'form-control input-sm',
+					'value' => esc($item_kit_info->description, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('item_kits_add_item'), 'item', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Item_kits.add_item'), 'item', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'item',
-						'id'=>'item',
-						'class'=>'form-control input-sm')
-						);?>
+				<?php echo form_input ([
+					'name' => 'item',
+					'id' => 'item',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 
 		<table id="item_kit_items" class="table table-striped table-hover">
 			<thead>
 				<tr>
-					<th width="10%"><?php echo $this->lang->line('common_delete'); ?></th>
-					<th width="10%"><?php echo $this->lang->line('item_kits_sequence'); ?></th>
-					<th width="60%"><?php echo $this->lang->line('item_kits_item'); ?></th>
-					<th width="20%"><?php echo $this->lang->line('item_kits_quantity'); ?></th>
+					<th style="width: 10%;"><?php echo lang('Common.delete') ?></th>
+					<th style="width: 10%;"><?php echo lang('Item_kits.sequence') ?></th>
+					<th style="width: 60%;"><?php echo lang('Item_kits.item') ?></th>
+					<th style="width: 20%;"><?php echo lang('Item_kits.quantity') ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -189,7 +198,7 @@
 					<tr>
 						<td><a href='#' onclick='return delete_item_kit_row(this);'><span class='glyphicon glyphicon-trash'></span></a></td>
 						<td><input class='quantity form-control input-sm' id='item_seq_<?php echo $item_kit_item['item_id'] ?>' name=item_kit_seq[<?php echo $item_kit_item['item_id'] ?>] value="<?php echo to_quantity_decimals($item_kit_item['kit_sequence']) ?>"/></td>
-						<td><?php echo $item_kit_item['name']; ?></td>
+						<td><?php echo esc($item_kit_item['name']) ?></td>
 						<td><input class='quantity form-control input-sm' id='item_qty_<?php echo $item_kit_item['item_id'] ?>' name=item_kit_qty[<?php echo $item_kit_item['item_id'] ?>] value="<?php echo to_quantity_decimals($item_kit_item['quantity']) ?>"/></td>
 					</tr>
 				<?php
@@ -199,14 +208,14 @@
 		</table>
 	</fieldset>
 
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
 {
 	$('#item').autocomplete({
-		source: "<?php echo site_url('items/suggest'); ?>",
+		source: "<?php echo site_url('items/suggest') ?>",
 		minChars: 0,
 		autoFocus: false,
 		delay: 10,
@@ -244,7 +253,7 @@ $(document).ready(function()
 
 
 	$('#item_name').autocomplete({
-		source: "<?php echo site_url('items/suggest_kits'); ?>",
+		source: "<?php echo site_url('items/suggest_kits') ?>",
 		minChars: 0,
 		delay: 15,
 		cacheLength: 1,
@@ -259,7 +268,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -276,11 +285,11 @@ $(document).ready(function()
 				required: false,
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/check_item_number')?>",
+					url: "<?php echo esc(site_url("$controller_name/check_item_number"), 'url') ?>",
 					type: 'POST',
 					data: 
 					{
-						'item_kit_id' : "<?php echo $item_kit_info->item_kit_id; ?>",
+						'item_kit_id' : "<?php echo $item_kit_info->item_kit_id ?>",
 						'item_kit_number' : function()
 						{
 							return $('#item_kit_number').val();
@@ -292,9 +301,9 @@ $(document).ready(function()
 
 		messages:
 		{
-			name: "<?php echo $this->lang->line('items_name_required'); ?>",
-			category: "<?php echo $this->lang->line('items_category_required'); ?>",
-			item_kit_number: "<?php echo $this->lang->line('item_kits_item_number_duplicate'); ?>"
+			name: "<?php echo lang('Items.name_required') ?>",
+			category: "<?php echo lang('Items.category_required') ?>",
+			item_kit_number: "<?php echo lang('Item_kits.item_number_duplicate') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/item_kits/manage.php b/app/Views/item_kits/manage.php
index 12db8f8c5..6fb4990f6 100644
--- a/app/Views/item_kits/manage.php
+++ b/app/Views/item_kits/manage.php
@@ -1,14 +1,20 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers) ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'item_kit_id'
 	});
 
@@ -24,20 +30,20 @@ $(document).ready(function()
 </script>
 
 <div id="title_bar" class="btn-toolbar">
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name. '_new'); ?>'>
-		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang($controller_name . '.new') ?>'>
+		<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo lang($controller_name . '.new') ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left btn-toolbar">
 		<button id="delete" class="btn btn-default btn-sm">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete"); ?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 
-		<button id="generate_barcodes" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/generate_barcodes"); ?>'>
-			<span class="glyphicon glyphicon-barcode">&nbsp</span><?php echo $this->lang->line("items_generate_barcodes");?>
+		<button id="generate_barcodes" class="btn btn-default btn-sm" data-href='<?php echo esc(site_url("$controller_name/generate_barcodes"), 'url') ?>'>
+			<span class="glyphicon glyphicon-barcode">&nbsp</span><?php echo lang('Items.generate_barcodes') ?>
 		</button>
 	</div>
 </div>
@@ -46,4 +52,4 @@ $(document).ready(function()
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
+<?php echo view('partial/footer') ?>
\ No newline at end of file
diff --git a/app/Views/items/form.php b/app/Views/items/form.php
index 0022a2257..3a3e0acfc 100644
--- a/app/Views/items/form.php
+++ b/app/Views/items/form.php
@@ -1,54 +1,79 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $item_info
+ * @var array $categories
+ * @var int $selected_category
+ * @var bool $standard_item_locked
+ * @var bool $item_kit_disabled
+ * @var int $allow_temp_item
+ * @var array $suppliers
+ * @var int $selected_supplier
+ * @var bool $use_destination_based_tax
+ * @var float $default_tax_1_rate
+ * @var float $default_tax_2_rate
+ * @var string $tax_category
+ * @var int $tax_category_id
+ * @var bool $include_hsn
+ * @var string $hsn_code
+ * @var array $stock_locations
+ * @var bool $logo_exists
+ * @var string $image_path
+ * @var string $selected_low_sell_item
+ * @var int $selected_low_sell_item_id
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('items/save/'.$item_info->item_id, array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("items/save/$item_info->item_id", ['id' => 'item_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_item_number'), 'item_number', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.item_number'), 'item_number', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
-					<?php echo form_input(array(
-							'name'=>'item_number',
-							'id'=>'item_number',
-							'class'=>'form-control input-sm',
-							'value'=>$item_info->item_number)
-							);?>
+					<?php echo form_input ([
+						'name' => 'item_number',
+						'id' => 'item_number',
+						'class' => 'form-control input-sm',
+						'value' => esc($item_info->item_number, 'attr')
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.name'), 'name', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'name',
-						'id'=>'name',
-						'class'=>'form-control input-sm',
-						'value'=>$item_info->name)
-						);?>
+				<?php echo form_input ([
+					'name' => 'name',
+					'id' => 'name',
+					'class' => 'form-control input-sm',
+					'value' => esc($item_info->name, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.category'), 'category', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
 					<?php
-						if($this->Appconfig->get('category_dropdown'))
+						if(config('OSPOS')->category_dropdown)
 						{
-							echo form_dropdown('category', $categories, $selected_category, array('class'=>'form-control'));
+							echo form_dropdown('category', esc($categories, 'attr'), $selected_category, ['class' => 'form-control']);
 						}
 						else
 						{
-							echo form_input(array(
-								'name'=>'category',
-								'id'=>'category',
-								'class'=>'form-control input-sm',
-								'value'=>$item_info->category)
-								);
+							echo form_input ([
+								'name' => 'category',
+								'id' => 'category',
+								'class' => 'form-control input-sm',
+								'value' => esc($item_info->category, 'attr')
+							]);
 						}
 					?>
 				</div>
@@ -57,78 +82,81 @@
 
 		<div id="attributes">
 			<script type="text/javascript">
-				$('#attributes').load('<?php echo site_url("items/attributes/$item_info->item_id");?>');
+				$('#attributes').load('<?php echo site_url("items/attributes/$item_info->item_id") ?>');
 			</script>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_stock_type'), 'stock_type', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.stock_type'), 'stock_type', !empty($basic_version) ? ['class' => 'required control-label col-xs-3'] : ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'stock_type',
-							'type'=>'radio',
-							'id'=>'stock_type',
-							'value'=>0,
-							'checked'=>$item_info->stock_type == HAS_STOCK)
-					); ?> <?php echo $this->lang->line('items_stock'); ?>
+					<?php echo form_radio ([
+						'name' => 'stock_type',
+						'type' => 'radio',
+						'id' => 'stock_type',
+						'value' => 0,
+						'checked' => $item_info->stock_type == HAS_STOCK
+					]) ?> <?php echo lang('Items.stock') ?>
 				</label>
 				<label class="radio-inline">
-					<?php echo form_radio(array(
-							'name'=>'stock_type',
-							'type'=>'radio',
-							'id'=>'stock_type',
-							'value'=>1,
-							'checked'=>$item_info->stock_type == HAS_NO_STOCK)
-					); ?><?php echo $this->lang->line('items_nonstock'); ?>
+					<?php echo form_radio ([
+						'name' => 'stock_type',
+						'type' => 'radio',
+						'id' => 'stock_type',
+						'value' => 1,
+						'checked' => $item_info->stock_type == HAS_NO_STOCK
+					]) ?><?php echo lang('Items.nonstock') ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_type'), 'item_type', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.type'), 'item_type', !empty($basic_version) ? ['class' => 'required control-label col-xs-3'] : ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<label class="radio-inline">
 					<?php
-						$radio_button = array(
-							'name'=>'item_type',
-							'type'=>'radio',
-							'id'=>'item_type',
-							'value'=>0,
-							'checked'=>$item_info->item_type == ITEM);
+						$radio_button = [
+							'name' => 'item_type',
+							'type' => 'radio',
+							'id' => 'item_type',
+							'value' => 0,
+							'checked' => $item_info->item_type == ITEM
+						];
+
 						if($standard_item_locked)
 						{
 							$radio_button['disabled'] = TRUE;
 						}
-						echo form_radio($radio_button); ?> <?php echo $this->lang->line('items_standard'); ?>
+						echo form_radio($radio_button) ?> <?php echo lang('Items.standard') ?>
 				</label>
 				<label class="radio-inline">
 					<?php
-						$radio_button = array(
-							'name'=>'item_type',
-							'type'=>'radio',
-							'id'=>'item_type',
-							'value'=>1,
-							'checked'=>$item_info->item_type == ITEM_KIT);
+						$radio_button = [
+							'name' => 'item_type',
+							'type' => 'radio',
+							'id' => 'item_type',
+							'value' => 1,
+							'checked' => $item_info->item_type == ITEM_KIT
+						];
+
 						if($item_kit_disabled)
 						{
 							$radio_button['disabled'] = TRUE;
 						}
-						echo form_radio($radio_button); ?> <?php echo $this->lang->line('items_kit');
-					?>
+						echo form_radio($radio_button) ?> <?php echo lang('Items.kit') ?>
 				</label>
 				<?php
-				if($this->config->item('derive_sale_quantity') == '1')
+				if(config('OSPOS')->derive_sale_quantity == '1')
 				{
 				?>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
-								'name' => 'item_type',
-								'type' => 'radio',
-								'id' => 'item_type',
-								'value' => 2,
-								'checked' => $item_info->item_type == ITEM_AMOUNT_ENTRY)
-						); ?><?php echo $this->lang->line('items_amount_entry'); ?>
+						<?php echo form_radio ([
+							'name' => 'item_type',
+							'type' => 'radio',
+							'id' => 'item_type',
+							'value' => 2,
+							'checked' => $item_info->item_type == ITEM_AMOUNT_ENTRY
+						]) ?><?php echo lang('Items.amount_entry') ?>
 					</label>
 				<?php
 				}
@@ -138,13 +166,13 @@
 				{
 				?>
 					<label class="radio-inline">
-						<?php echo form_radio(array(
-								'name'=>'item_type',
-								'type'=>'radio',
-								'id'=>'item_type',
-								'value'=>3,
-								'checked'=>$item_info->item_type == ITEM_TEMP)
-						); ?> <?php echo $this->lang->line('items_temp'); ?>
+						<?php echo form_radio ([
+							'name' => 'item_type',
+							'type' => 'radio',
+							'id' => 'item_type',
+							'value' => 3,
+							'checked' => $item_info->item_type == ITEM_TEMP
+						]) ?> <?php echo lang('Items.temp') ?>
 					</label>
 				<?php
 				}
@@ -153,49 +181,49 @@
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.supplier'), 'supplier', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('supplier_id', $suppliers, $selected_supplier, array('class'=>'form-control')); ?>
+				<?php echo form_dropdown('supplier_id', esc($suppliers, 'attr'), $selected_supplier, ['class' => 'form-control']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.cost_price'), 'cost_price', ['class' => 'required control-label col-xs-3']) ?>
 			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'cost_price',
-							'id'=>'cost_price',
-							'class'=>'form-control input-sm',
-							'onClick'=>'this.select();',
-							'value'=>to_currency_no_money($item_info->cost_price))
-							);?>
+					<?php echo form_input ([
+						'name' => 'cost_price',
+						'id' => 'cost_price',
+						'class' => 'form-control input-sm',
+						'onClick' => 'this.select();',
+						'value' => to_currency_no_money($item_info->cost_price)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.unit_price'), 'unit_price', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'unit_price',
-							'id'=>'unit_price',
-							'class'=>'form-control input-sm',
-							'onClick'=>'this.select();',
-							'value'=>to_currency_no_money($item_info->unit_price))
-							);?>
+					<?php echo form_input ([
+						'name' => 'unit_price',
+						'id' => 'unit_price',
+						'class' => 'form-control input-sm',
+						'onClick' => 'this.select();',
+						'value' => to_currency_no_money($item_info->unit_price)
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
@@ -206,46 +234,46 @@
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.tax_1'), 'tax_percent_1', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
-							'name'=>'tax_names[]',
-							'id'=>'tax_name_1',
-							'class'=>'form-control input-sm',
-							'value'=>isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->config->item('default_tax_1_name'))
-							);?>
+					<?php echo form_input ([
+						'name' => 'tax_names[]',
+						'id' => 'tax_name_1',
+						'class' => 'form-control input-sm',
+						'value' => isset($item_tax_info[0]['name']) ? esc($item_tax_info[0]['name'], 'attr') : esc(config('OSPOS')->default_tax_1_name, 'attr')
+					]) ?>
 				</div>
 				<div class="col-xs-4">
 					<div class="input-group input-group-sm">
-						<?php echo form_input(array(
-								'name'=>'tax_percents[]',
-								'id'=>'tax_percent_name_1',
-								'class'=>'form-control input-sm',
-								'value'=>isset($item_tax_info[0]['percent']) ? to_tax_decimals($item_tax_info[0]['percent']) : to_tax_decimals($default_tax_1_rate))
-								);?>
+						<?php echo form_input ([
+							'name' => 'tax_percents[]',
+							'id' => 'tax_percent_name_1',
+							'class' => 'form-control input-sm',
+							'value' => isset($item_tax_info[0]['percent']) ? to_tax_decimals($item_tax_info[0]['percent']) : to_tax_decimals($default_tax_1_rate)
+						]) ?>
 						<span class="input-group-addon input-sm"><b>%</b></span>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.tax_2'), 'tax_percent_2', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
-							'name'=>'tax_names[]',
-							'id'=>'tax_name_2',
-							'class'=>'form-control input-sm',
-							'value'=>isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->config->item('default_tax_2_name'))
-							);?>
+					<?php echo form_input ([
+						'name' => 'tax_names[]',
+						'id' => 'tax_name_2',
+						'class' => 'form-control input-sm',
+						'value' => isset($item_tax_info[1]['name']) ? esc($item_tax_info[1]['name'], 'attr') : esc(config('OSPOS')->default_tax_2_name, 'attr')
+					]) ?>
 				</div>
 				<div class="col-xs-4">
 					<div class="input-group input-group-sm">
-						<?php echo form_input(array(
-								'name'=>'tax_percents[]',
-								'class'=>'form-control input-sm',
-								'id'=>'tax_percent_name_2',
-								'value'=>isset($item_tax_info[1]['percent']) ? to_tax_decimals($item_tax_info[1]['percent']) : to_tax_decimals($default_tax_2_rate))
-								);?>
+						<?php echo form_input ([
+							'name' => 'tax_percents[]',
+							'class' => 'form-control input-sm',
+							'id' => 'tax_percent_name_2',
+							'value' => isset($item_tax_info[1]['percent']) ? to_tax_decimals($item_tax_info[1]['percent']) : to_tax_decimals($default_tax_2_rate)
+						]) ?>
 						<span class="input-group-addon input-sm"><b>%</b></span>
 					</div>
 				</div>
@@ -256,17 +284,16 @@
 
 		<?php if($use_destination_based_tax): ?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('taxes_tax_category'), 'tax_category', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Taxes.tax_category'), 'tax_category', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-8'>
 					<div class="input-group input-group-sm">
-						<?php echo form_input(array(
-								'name'=>'tax_category',
-								'id'=>'tax_category',
-								'class'=>'form-control input-sm',
-								'size'=>'50',
-								'value'=>$tax_category)
-						); ?>
-						<?php echo form_hidden('tax_category_id', $tax_category_id); ?>
+						<?php echo form_input ([
+							'name' => 'tax_category',
+							'id' => 'tax_category',
+							'class' => 'form-control input-sm',
+							'size' => '50',
+							'value' => esc($tax_category, 'attr')
+						]) ?><?php echo form_hidden('tax_category_id', $tax_category_id) ?>
 					</div>
 				</div>
 			</div>
@@ -274,34 +301,34 @@
 
 		<?php if($include_hsn): ?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_hsn_code'), 'category', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.hsn_code'), 'category', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-8'>
 					<div class="input-group">
-						<?php echo form_input(array(
-								'name'=>'hsn_code',
-								'id'=>'hsn_code',
-								'class'=>'form-control input-sm',
-								'value'=>$hsn_code)
-						);?>
+						<?php echo form_input ([
+							'name' => 'hsn_code',
+							'id' => 'hsn_code',
+							'class' => 'form-control input-sm',
+							'value' => esc($hsn_code, 'attr')
+						]) ?>
 					</div>
 				</div>
 			</div>
 		<?php endif; ?>
 
 		<?php
-		foreach($stock_locations as $key=>$location_detail)
+		foreach($stock_locations as $key => $location_detail)
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_quantity').' '.$location_detail['location_name'], 'quantity_' . $key, array('class'=>'required control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.quantity') . ' ' . $location_detail['location_name'], "quantity_$key", ['class' => 'required control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
-							'name'=>'quantity_' . $key,
-							'id'=>'quantity_' . $key,
-							'class'=>'required quantity form-control',
-							'onClick'=>'this.select();',
-							'value'=>isset($item_info->item_id) ? to_quantity_decimals($location_detail['quantity']) : to_quantity_decimals(0))
-							);?>
+					<?php echo form_input ([
+						'name' => "quantity_$key",
+						'id' => "quantity_$key",
+						'class' => 'required quantity form-control',
+						'onClick' => 'this.select();',
+						'value' => isset($item_info->item_id) ? to_quantity_decimals($location_detail['quantity']) : to_quantity_decimals(0)
+					]) ?>
 				</div>
 			</div>
 		<?php
@@ -309,126 +336,125 @@
 		?>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.receiving_quantity'), 'receiving_quantity', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'receiving_quantity',
-						'id'=>'receiving_quantity',
-						'class'=>'required form-control input-sm',
-						'onClick'=>'this.select();',
-						'value'=>isset($item_info->item_id) ? to_quantity_decimals($item_info->receiving_quantity) : to_quantity_decimals(0))
-						);?>
+				<?php echo form_input ([
+					'name' => 'receiving_quantity',
+					'id' => 'receiving_quantity',
+					'class' => 'required form-control input-sm',
+					'onClick' => 'this.select();',
+					'value' => isset($item_info->item_id) ? to_quantity_decimals($item_info->receiving_quantity) : to_quantity_decimals(0)
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.reorder_level'), 'reorder_level', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'reorder_level',
-						'id'=>'reorder_level',
-						'class'=>'form-control input-sm',
-						'onClick'=>'this.select();',
-						'value'=>isset($item_info->item_id) ? to_quantity_decimals($item_info->reorder_level) : to_quantity_decimals(0))
-						);?>
+				<?php echo form_input ([
+					'name' => 'reorder_level',
+					'id' => 'reorder_level',
+					'class' => 'form-control input-sm',
+					'onClick' => 'this.select();',
+					'value' => isset($item_info->item_id) ? to_quantity_decimals($item_info->reorder_level) : to_quantity_decimals(0)
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.description'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array(
-						'name'=>'description',
-						'id'=>'description',
-						'class'=>'form-control input-sm',
-						'value'=>$item_info->description)
-						);?>
+				<?php echo form_textarea ([
+						'name' => 'description',
+						'id' => 'description',
+						'class' => 'form-control input-sm',
+						'value' => esc($item_info->description, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_image'), 'items_image', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.image'), 'items_image', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<div class="fileinput <?php echo $logo_exists ? 'fileinput-exists' : 'fileinput-new'; ?>" data-provides="fileinput">
+				<div class="fileinput <?php echo $logo_exists ? 'fileinput-exists' : 'fileinput-new' ?>" data-provides="fileinput">
 					<div class="fileinput-new thumbnail" style="width: 100px; height: 100px;"></div>
 					<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 100px; max-height: 100px;">
-						<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('items_image'); ?>"
-							 src="<?php echo $image_path; ?>"
+						<img data-src="holder.js/100%x100%" alt="<?php echo lang('Items.image') ?>"
+							 src="<?php echo esc($image_path, 'url') ?>"
 							 style="max-height: 100%; max-width: 100%;">
 					</div>
 					<div>
 						<span class="btn btn-default btn-sm btn-file">
-							<span class="fileinput-new"><?php echo $this->lang->line("items_select_image"); ?></span>
-							<span class="fileinput-exists"><?php echo $this->lang->line("items_change_image"); ?></span>
+							<span class="fileinput-new"><?php echo lang('Items.select_image') ?></span>
+							<span class="fileinput-exists"><?php echo lang('Items.change_image') ?></span>
 							<input type="file" name="item_image" accept="image/*">
 						</span>
-						<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("items_remove_image"); ?></a>
+						<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo lang('Items.remove_image') ?></a>
 					</div>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.allow_alt_description'), 'allow_alt_description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-1'>
-				<?php echo form_checkbox(array(
-						'name'=>'allow_alt_description',
-						'id'=>'allow_alt_description',
-						'value'=>1,
-						'checked'=>($item_info->allow_alt_description) ? 1 : 0)
-						);?>
+				<?php echo form_checkbox ([
+					'name' => 'allow_alt_description',
+					'id' => 'allow_alt_description',
+					'value' => 1,
+					'checked' => ($item_info->allow_alt_description) ? 1 : 0
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.is_serialized'), 'is_serialized', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-1'>
-				<?php echo form_checkbox(array(
-						'name'=>'is_serialized',
-						'id'=>'is_serialized',
-						'value'=>1,
-						'checked'=>($item_info->is_serialized) ? 1 : 0)
-						);?>
+				<?php echo form_checkbox ([
+					'name' => 'is_serialized',
+					'id' => 'is_serialized',
+					'value' => 1,
+					'checked' => ($item_info->is_serialized) ? 1 : 0
+				]) ?>
 			</div>
 		</div>
 
 		<?php
-		if($this->config->item('multi_pack_enabled') == '1')
+		if(config('OSPOS')->multi_pack_enabled == '1')
 		{
 			?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_qty_per_pack'), 'qty_per_pack', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.qty_per_pack'), 'qty_per_pack', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_input(array(
-							'name'=>'qty_per_pack',
-							'id'=>'qty_per_pack',
-							'class'=>'form-control input-sm',
-							'value'=>isset($item_info->item_id) ? to_quantity_decimals($item_info->qty_per_pack) : to_quantity_decimals(0))
-					);?>
+					<?php echo form_input ([
+						'name' => 'qty_per_pack',
+						'id' => 'qty_per_pack',
+						'class' => 'form-control input-sm',
+						'value' => isset($item_info->item_id) ? to_quantity_decimals($item_info->qty_per_pack) : to_quantity_decimals(0)
+					]) ?>
 				</div>
 			</div>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('items_pack_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.pack_name'), 'name', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-8'>
-					<?php echo form_input(array(
-							'name'=>'pack_name',
-							'id'=>'pack_name',
-							'class'=>'form-control input-sm',
-							'value'=>$item_info->pack_name)
-					);?>
+					<?php echo form_input ([
+						'name' => 'pack_name',
+						'id' => 'pack_name',
+						'class' => 'form-control input-sm',
+						'value' => esc($item_info->pack_name, 'attr')
+					]) ?>
 				</div>
 			</div>
 			<div class="form-group  form-group-sm">
-				<?php echo form_label($this->lang->line('items_low_sell_item'), 'low_sell_item_name', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Items.low_sell_item'), 'low_sell_item_name', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-8'>
 					<div class="input-group input-group-sm">
-						<?php echo form_input(array(
-								'name'=>'low_sell_item_name',
-								'id'=>'low_sell_item_name',
-								'class'=>'form-control input-sm',
-								'value'=>$selected_low_sell_item)
-						); ?>
-						<?php echo form_hidden('low_sell_item_id', $selected_low_sell_item_id);?>
+						<?php echo form_input ([
+							'name' => 'low_sell_item_name',
+							'id' => 'low_sell_item_name',
+							'class' => 'form-control input-sm',
+							'value' => esc($selected_low_sell_item, 'attr')
+						]) ?><?php echo form_hidden('low_sell_item_id', $selected_low_sell_item_id) ?>
 					</div>
 				</div>
 			</div>
@@ -437,19 +463,19 @@
 		?>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_is_deleted'), 'is_deleted', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.is_deleted'), 'is_deleted', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-1'>
-				<?php echo form_checkbox(array(
-						'name'=>'is_deleted',
-						'id'=>'is_deleted',
-						'value'=>1,
-						'checked'=>($item_info->deleted) ? 1 : 0)
-						);?>
+				<?php echo form_checkbox ([
+					'name' => 'is_deleted',
+					'id' => 'is_deleted',
+					'value'=>1,
+					'checked' => ($item_info->deleted) ? 1 : 0
+				]) ?>
 			</div>
 		</div>
 
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -475,7 +501,7 @@ $(document).ready(function()
 	};
 
 	$('#tax_category').autocomplete({
-		source: "<?php echo site_url('taxes/suggest_tax_categories'); ?>",
+		source: "<?php echo site_url('taxes/suggest_tax_categories') ?>",
 		minChars: 0,
 		delay: 15,
 		cacheLength: 1,
@@ -491,7 +517,7 @@ $(document).ready(function()
 	};
 
 	$('#low_sell_item_name').autocomplete({
-		source: "<?php echo site_url('items/suggest_low_sell'); ?>",
+		source: "<?php echo site_url('items/suggest_low_sell') ?>",
 		minChars: 0,
 		delay: 15,
 		cacheLength: 1,
@@ -501,7 +527,7 @@ $(document).ready(function()
 	});
 
 	$('#category').autocomplete({
-		source: "<?php echo site_url('items/suggest_category');?>",
+		source: "<?php echo site_url('items/suggest_category') ?>",
 		delay: 10,
 		appendTo: '.modal-content'
 	});
@@ -509,14 +535,14 @@ $(document).ready(function()
 	$('a.fileinput-exists').click(function() {
 		$.ajax({
 			type: 'GET',
-			url: '<?php echo site_url("$controller_name/remove_logo/$item_info->item_id"); ?>',
+			url: '<?php echo esc(site_url("$controller_name/remove_logo/$item_info->item_id"), 'url') ?>',
 			dataType: 'json'
 		})
 	});
 
 	$.validator.addMethod('valid_chars', function(value, element) {
 		return value.match(/(\||_)/g) == null;
-	}, "<?php echo $this->lang->line('attributes_attribute_value_invalid_chars'); ?>");
+	}, "<?php echo lang('Attributes.attribute_value_invalid_chars') ?>");
 
 	var init_validation = function() {
 		$('#item_form').validate($.extend({
@@ -527,7 +553,7 @@ $(document).ready(function()
 						if(stay_open)
 						{
 							// set action of item_form to url without item id, so a new one can be created
-							$('#item_form').attr('action', "<?php echo site_url('items/save/')?>");
+							$('#item_form').attr('action', "<?php echo site_url('items/save/') ?>");
 							// use a whitelist of fields to minimize unintended side effects
 							$(':text, :password, :file, #description, #item_form').not('.quantity, #reorder_level, #tax_name_1, #receiving_quantity, ' +
 								'#tax_percent_name_1, #category, #reference_number, #name, #cost_price, #unit_price, #taxed_cost_price, #taxed_unit_price, #definition_name, [name^="attribute_links"]').val('');
@@ -538,7 +564,7 @@ $(document).ready(function()
 						{
 							dialog_support.hide();
 						}
-						table_support.handle_submit('<?php echo site_url('items'); ?>', response, stay_open);
+						table_support.handle_submit('<?php echo site_url('items') ?>', response, stay_open);
 						init_validation();
 					},
 					dataType: 'json'
@@ -556,10 +582,10 @@ $(document).ready(function()
 					required: false,
 					remote:
 					{
-						url: "<?php echo site_url($controller_name . '/check_item_number')?>",
+						url: "<?php echo esc(site_url("$controller_name/check_item_number"), 'url') ?>",
 						type: 'POST',
 						data: {
-							'item_id' : "<?php echo $item_info->item_id; ?>",
+							'item_id' : "<?php echo $item_info->item_id ?>",
 							'item_number' : function()
 							{
 								return $('#item_number').val();
@@ -570,12 +596,12 @@ $(document).ready(function()
 				cost_price:
 				{
 					required: true,
-					remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+					remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 				},
 				unit_price:
 				{
 					required: true,
-					remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+					remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 				},
 				<?php
 				foreach($stock_locations as $key=>$location_detail)
@@ -584,7 +610,7 @@ $(document).ready(function()
 				<?php echo 'quantity_' . $key ?>:
 					{
 						required: true,
-						remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+						remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 					},
 				<?php
 				}
@@ -592,61 +618,61 @@ $(document).ready(function()
 				receiving_quantity:
 				{
 					required: true,
-					remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+					remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 				},
 				reorder_level:
 				{
 					required: true,
-					remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+					remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 				},
 				tax_percent:
 				{
 					required: true,
-					remote: "<?php echo site_url($controller_name . '/check_numeric')?>"
+					remote: "<?php echo esc(site_url("$controller_name/check_numeric"), 'url') ?>"
 				}
 			},
 
 			messages:
 			{
-				name: "<?php echo $this->lang->line('items_name_required'); ?>",
-				item_number: "<?php echo $this->lang->line('items_item_number_duplicate'); ?>",
-				category: "<?php echo $this->lang->line('items_category_required'); ?>",
+				name: "<?php echo lang('Items.name_required') ?>",
+				item_number: "<?php echo lang('Items.item_number_duplicate') ?>",
+				category: "<?php echo lang('Items.category_required') ?>",
 				cost_price:
 				{
-					required: "<?php echo $this->lang->line('items_cost_price_required'); ?>",
-					number: "<?php echo $this->lang->line('items_cost_price_number'); ?>"
+					required: "<?php echo lang('Items.cost_price_required') ?>",
+					number: "<?php echo lang('Items.cost_price_number') ?>"
 				},
 				unit_price:
 				{
-					required: "<?php echo $this->lang->line('items_unit_price_required'); ?>",
-					number: "<?php echo $this->lang->line('items_unit_price_number'); ?>"
+					required: "<?php echo lang('Items.unit_price_required') ?>",
+					number: "<?php echo lang('Items.unit_price_number') ?>"
 				},
 				<?php
-				foreach($stock_locations as $key=>$location_detail)
+				foreach($stock_locations as $key => $location_detail)
 				{
 				?>
-				<?php echo 'quantity_' . $key ?>:
+				<?php echo esc("quantity_$key", 'js') ?>:
 					{
-						required: "<?php echo $this->lang->line('items_quantity_required'); ?>",
-						number: "<?php echo $this->lang->line('items_quantity_number'); ?>"
+						required: "<?php echo lang('Items.quantity_required') ?>",
+						number: "<?php echo lang('Items.quantity_number') ?>"
 					},
 				<?php
 				}
 				?>
 				receiving_quantity:
 				{
-					required: "<?php echo $this->lang->line('items_quantity_required'); ?>",
-					number: "<?php echo $this->lang->line('items_quantity_number'); ?>"
+					required: "<?php echo lang('Items.quantity_required') ?>",
+					number: "<?php echo lang('Items.quantity_number') ?>"
 				},
 				reorder_level:
 				{
-					required: "<?php echo $this->lang->line('items_reorder_level_required'); ?>",
-					number: "<?php echo $this->lang->line('items_reorder_level_number'); ?>"
+					required: "<?php echo lang('Items.reorder_level_required') ?>",
+					number: "<?php echo lang('Items.reorder_level_number') ?>"
 				},
 				tax_percent:
 				{
-					required: "<?php echo $this->lang->line('items_tax_percent_required'); ?>",
-					number: "<?php echo $this->lang->line('items_tax_percent_number'); ?>"
+					required: "<?php echo lang('Items.tax_percent_required') ?>",
+					number: "<?php echo lang('Items.tax_percent_number') ?>"
 				}
 			}
 		}, form_support.error));
diff --git a/app/Views/items/form_bulk.php b/app/Views/items/form_bulk.php
index eceb13ca8..e89c853b0 100644
--- a/app/Views/items/form_bulk.php
+++ b/app/Views/items/form_bulk.php
@@ -1,169 +1,177 @@
-<div id="required_fields_message"><?php echo $this->lang->line('items_edit_fields_you_want_to_update'); ?></div>
+<?php
+/**
+ * @var array $suppliers
+ * @var array $allow_alt_description_choices
+ * @var array $serialization_choices
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Items.edit_fields_you_want_to_update') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('items/bulk_update/', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('items/bulk_update/', ['id' => 'item_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="bulk_item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.name'), 'name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'name',
-						'id'=>'name',
-						'class'=>'form-control input-sm')
-						);?>
+				<?php echo form_input ([
+					'name' => 'name',
+					'id' => 'name',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
-					<?php echo form_input(array(
-							'name'=>'category',
-							'id'=>'category',
-							'class'=>'form-control input-sm')
-							);?>
+					<?php echo form_input ([
+						'name' => 'category',
+						'id' => 'category',
+						'class' => 'form-control input-sm'
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.supplier'), 'supplier', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('supplier_id', $suppliers, '', array('class'=>'form-control'));?>
+				<?php echo form_dropdown('supplier_id', esc($suppliers, 'attr'), '', ['class' => 'form-control']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_cost_price'), 'cost_price', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.cost_price'), 'cost_price', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'cost_price',
-							'id'=>'cost_price',
-							'class'=>'form-control input-sm')
-							);?>
+					<?php echo form_input ([
+						'name' => 'cost_price',
+						'id' => 'cost_price',
+						'class' => 'form-control input-sm'
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group">
-			<?php echo form_label($this->lang->line('items_unit_price'), 'unit_price', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.unit_price'), 'unit_price', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
 				<div class="input-group input-group-sm">
 					<?php if (!currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
-					<?php echo form_input(array(
-							'name'=>'unit_price',
-							'id'=>'unit_price',
-							'class'=>'form-control input-sm')
-							);?>
+					<?php echo form_input ([
+						'name' => 'unit_price',
+						'id' => 'unit_price',
+						'class' => 'form-control input-sm'
+					]) ?>
 					<?php if (currency_side()): ?>
-						<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+						<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_tax_1'), 'tax_percent_1', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.tax_1'), 'tax_percent_1', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'tax_names[]',
-						'id'=>'tax_name_1',
-						'class'=>'form-control input-sm',
-						'value'=>$this->config->item('default_tax_1_name'))
-						);?>
+				<?php echo form_input ([
+					'name' => 'tax_names[]',
+					'id' => 'tax_name_1',
+					'class' => 'form-control input-sm',
+					'value' => esc(config('OSPOS')->default_tax_1_name, 'attr')
+				]) ?>
 			</div>
 			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
-					<?php echo form_input(array(
-							'name'=>'tax_percents[]',
-							'id'=>'tax_percent_name_1',
-							'class'=>'form-control input-sm',
-							'value'=>to_tax_decimals($this->config->item('default_tax_1_rate')))
-							);?>
+					<?php echo form_input ([
+						'name' => 'tax_percents[]',
+						'id' => 'tax_percent_name_1',
+						'class' => 'form-control input-sm',
+						'value'=>to_tax_decimals(config('OSPOS')->default_tax_1_rate)
+					]) ?>
 					<span class="input-group input-group-addon"><b>%</b></span>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_tax_2'), 'tax_percent_2', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.tax_2'), 'tax_percent_2', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'tax_names[]',
-						'id'=>'tax_name_2',
-						'class'=>'form-control input-sm',
-						'value'=>$this->config->item('default_tax_2_name'))
-						);?>
+				<?php echo form_input ([
+					'name' => 'tax_names[]',
+					'id' => 'tax_name_2',
+					'class' => 'form-control input-sm',
+					'value' => esc(config('OSPOS')->default_tax_2_name, 'attr')
+				]) ?>
 			</div>
 			<div class="col-xs-4">
 				<div class="input-group input-group-sm">
-					<?php echo form_input(array(
-							'name'=>'tax_percents[]',
-							'id'=>'tax_percent_name_2',
-							'class'=>'form-control input-sm',
-							'value'=>to_tax_decimals($this->config->item('default_tax_2_rate')))
-							);?>
+					<?php echo form_input ([
+						'name' => 'tax_percents[]',
+						'id' => 'tax_percent_name_2',
+						'class' => 'form-control input-sm',
+						'value' => to_tax_decimals(config('OSPOS')->default_tax_2_rate)
+					]) ?>
 					<span class="input-group input-group-addon"><b>%</b></span>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_reorder_level'), 'reorder_level', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.reorder_level'), 'reorder_level', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'reorder_level',
-						'id'=>'reorder_level',
-						'class'=>'form-control input-sm')
-						);?>
+				<?php echo form_input ([
+					'name' => 'reorder_level',
+					'id' => 'reorder_level',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_description'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.description'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array(
-						'name'=>'description',
-						'id'=>'description',
-						'class'=>'form-control input-sm')
-						);?>
+				<?php echo form_textarea ([
+					'name' => 'description',
+					'id' => 'description',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.allow_alt_description'), 'allow_alt_description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices, '', array('class'=>'form-control'));?>
+				<?php echo form_dropdown('allow_alt_description', esc($allow_alt_description_choices, 'attr'), '', ['class' => 'form-control']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_is_serialized'), 'is_serialized', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.is_serialized'), 'is_serialized', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('is_serialized', $serialization_choices, '', array('class'=>'form-control'));?>
+				<?php echo form_dropdown('is_serialized', esc($serialization_choices, 'attr'), '', ['class' => 'form-control']) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
 $(document).ready(function()
 {
 	$('#category').autocomplete({
-		source: "<?php echo site_url('items/suggest_category');?>",
+		source: "<?php echo site_url('items/suggest_category') ?>",
 		appendTo: '.modal-content',
 		delay: 10
 	});
@@ -173,7 +181,7 @@ $(document).ready(function()
 	$('#tax_percent_name_1, #tax_name_1').blur(function() {
 		var disabled = !($('#tax_percent_name_1').val() + $('#tax_name_1').val());
 		$('#tax_percent_name_2, #tax_name_2').prop('disabled', disabled);
-		confirm_message =  disabled ? '' : "<?php echo $this->lang->line('items_confirm_bulk_edit_wipe_taxes') ?>";
+		confirm_message =  disabled ? '' : "<?php echo lang('Items.confirm_bulk_edit_wipe_taxes') ?>";
 	});
 
 	$('#item_form').validate($.extend({
@@ -187,7 +195,7 @@ $(document).ready(function()
 					success: function(response)
 					{
 						dialog_support.hide();
-						table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+						table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 					},
 					dataType: 'json'
 				});
@@ -220,19 +228,19 @@ $(document).ready(function()
 		{
 			unit_price:
 			{
-				number: "<?php echo $this->lang->line('items_unit_price_number'); ?>"
+				number: "<?php echo lang('Items.unit_price_number') ?>"
 			},
 			tax_percent:
 			{
-				number: "<?php echo $this->lang->line('items_tax_percent_number'); ?>"
+				number: "<?php echo lang('Items.tax_percent_number') ?>"
 			},
 			quantity:
 			{
-				number: "<?php echo $this->lang->line('items_quantity_number'); ?>"
+				number: "<?php echo lang('Items.quantity_number') ?>"
 			},
 			reorder_level:
 			{
-				number: "<?php echo $this->lang->line('items_reorder_level_number'); ?>"
+				number: "<?php echo lang('Items.reorder_level_number') ?>"
 			}
 		}
 	}, form_support.error));
diff --git a/app/Views/items/form_count_details.php b/app/Views/items/form_count_details.php
index 741f55584..3031f83e0 100644
--- a/app/Views/items/form_count_details.php
+++ b/app/Views/items/form_count_details.php
@@ -1,98 +1,109 @@
-<?php echo form_open('items', array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+<?php
+/**
+ * @var object $item_info
+ * @var array $stock_locations
+ * @var array $item_quantities
+ */
+
+use app\Models\Employee;
+
+?>
+<?php echo form_open('items', ['id' => 'item_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="count_item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_item_number'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.item_number'), 'name', ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
-					<?php echo form_input(array(
-							'name'=>'item_number',
-							'id'=>'item_number',
-							'class'=>'form-control input-sm',
-							'disabled'=>'',
-							'value'=>$item_info->item_number)
-							);?>
+					<?php echo form_input ([
+						'name' => 'item_number',
+						'id' => 'item_number',
+						'class' => 'form-control input-sm',
+						'disabled' => '',
+						'value' => esc($item_info->item_number, 'attr')
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.name'), 'name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'name',
-						'id'=>'name',
-						'class'=>'form-control input-sm',
-						'disabled'=>'',
-						'value'=>$item_info->name)
-						); ?>
+				<?php echo form_input ([
+					'name' => 'name',
+					'id' => 'name',
+					'class' => 'form-control input-sm',
+					'disabled' => '',
+					'value' => esc($item_info->name, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
-					<?php echo form_input(array(
-							'name'=>'category',
-							'id'=>'category',
-							'class'=>'form-control input-sm',
-							'disabled'=>'',
-							'value'=>$item_info->category)
-							);?>
+					<?php echo form_input ([
+						'name' => 'category',
+						'id' => 'category',
+						'class' => 'form-control input-sm',
+						'disabled' => '',
+						'value' => esc($item_info->category, 'attr')
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_stock_location'), 'stock_location', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.stock_location'), 'stock_location', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('stock_location', $stock_locations, current($stock_locations), array('onchange'=>'display_stock(this.value);', 'class'=>'form-control'));	?>
+				<?php echo form_dropdown('stock_location', esc($stock_locations, 'attr'), current($stock_locations), ['onchange' => 'display_stock(this.value);', 'class' => 'form-control']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_current_quantity'), 'quantity', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.current_quantity'), 'quantity', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'quantity',
-						'id'=>'quantity',
-						'class'=>'form-control input-sm',
-						'disabled'=>'',
-						'value'=>to_quantity_decimals(current($item_quantities)))
-						); ?>
+				<?php echo form_input ([
+					'name' => 'quantity',
+					'id' => 'quantity',
+					'class' => 'form-control input-sm',
+					'disabled' => '',
+					'value' => to_quantity_decimals(current($item_quantities))
+				]) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <table id="items_count_details" class="table table-striped table-hover">
 	<thead>
 		<tr style="background-color: #999 !important;">
-			<th colspan="4"><?php echo $this->lang->line('items_inventory_data_tracking'); ?></th>
+			<th colspan="4"><?php echo lang('Items.inventory_data_tracking') ?></th>
 		</tr>
 		<tr>
-			<th width="30%"><?php echo $this->lang->line('items_inventory_date'); ?></th>
-			<th width="20%"><?php echo $this->lang->line('items_inventory_employee'); ?></th>
-			<th width="20%"><?php echo $this->lang->line('items_inventory_in_out_quantity'); ?></th>
-			<th width="30%"><?php echo $this->lang->line('items_inventory_remarks'); ?></th>
+			<th style="width: 30%;"><?php echo lang('Items.inventory_date') ?></th>
+			<th style="width: 20%;"><?php echo lang('Items.inventory_employee') ?></th>
+			<th style="width: 20%;"><?php echo lang('Items.inventory_in_out_quantity') ?></th>
+			<th style="width: 30%;"><?php echo lang('Items.inventory_remarks') ?></th>
 		</tr>
 	</thead>
 	<tbody id="inventory_result">
 		<?php
-		/*
-		 * the tbody content of the table will be filled in by the javascript (see bottom of page)
-		*/
+			/**
+			 * the tbody content of the table will be filled in by the javascript (see bottom of page)
+			 */
+			$inventory_array = $this->Inventory->get_inventory_data_for_item($item_info->item_id)->getResultArray();
+			$employee_name = [];
 
-		$inventory_array = $this->Inventory->get_inventory_data_for_item($item_info->item_id)->result_array();
-		$employee_name = array();
+			$employee = model(Employee::class);
 
-		foreach($inventory_array as $row)
-		{
-			$employee = $this->Employee->get_info($row['trans_user']);
-			array_push($employee_name, $employee->first_name . ' ' . $employee->last_name);
-		}
+			foreach($inventory_array as $row)
+			{
+				$employee_data = $employee->get_info($row['trans_user']);
+				$employee_name[] = $employee_data->first_name . ' ' . $employee_data->last_name;
+			}
 		?>
 	</tbody>
 </table>
@@ -100,16 +111,16 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
-    display_stock(<?php echo json_encode(key($stock_locations)); ?>);
+    display_stock(<?php echo json_encode(key(esc($stock_locations, 'raw'))) ?>);
 });
 
 function display_stock(location_id)
 {
-    var item_quantities = <?php echo json_encode($item_quantities); ?>;
-    document.getElementById("quantity").value = parseFloat(item_quantities[location_id]).toFixed(<?php echo quantity_decimals(); ?>);
+    var item_quantities = <?php echo json_encode(esc($item_quantities, 'raw')) ?>;
+    document.getElementById("quantity").value = parseFloat(item_quantities[location_id]).toFixed(<?php echo quantity_decimals() ?>);
 
-    var inventory_data = <?php echo json_encode($inventory_array); ?>;
-    var employee_data = <?php echo json_encode($employee_name); ?>;
+    var inventory_data = <?php echo json_encode(esc($inventory_array), 'raw') ?>;
+    var employee_data = <?php echo json_encode(esc($employee_name, 'raw')) ?>;
 
     var table = document.getElementById("inventory_result");
 
@@ -137,7 +148,7 @@ function display_stock(location_id)
             tr.appendChild(td);
 
             td = document.createElement('td');
-            td.appendChild(document.createTextNode(parseFloat(data['trans_inventory']).toFixed(<?php echo quantity_decimals(); ?>)));
+            td.appendChild(document.createTextNode(parseFloat(data['trans_inventory']).toFixed(<?php echo quantity_decimals() ?>)));
 			td.setAttribute("style", "text-align:center");
             tr.appendChild(td);
 
diff --git a/app/Views/items/form_csv_import.php b/app/Views/items/form_csv_import.php
index c0be42fb4..e6bb78044 100644
--- a/app/Views/items/form_csv_import.php
+++ b/app/Views/items/form_csv_import.php
@@ -1,10 +1,10 @@
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open_multipart('items/import_csv_file/', array('id'=>'csv_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open_multipart('items/import_csv_file/', ['id' => 'csv_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
 			<div class="col-xs-12">
-				<a href="<?php echo site_url('items/generate_csv_file'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
+				<a href="<?php echo site_url('items/generate_csv_file') ?>"><?php echo lang('Common.download_import_template') ?></a>
 			</div>
 		</div>
 
@@ -12,13 +12,13 @@
 			<div class='col-xs-12'>
 				<div class="fileinput fileinput-new input-group" data-provides="fileinput">
 					<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
-					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line('common_import_select_file'); ?></span><span class="fileinput-exists"><?php echo $this->lang->line('common_import_change_file'); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
-					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line('common_import_remove_file'); ?></a>
+					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo lang('Common.import_select_file') ?></span><span class="fileinput-exists"><?php echo lang('Common.import_change_file') ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
+					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo lang('Common.import_remove_file') ?></a>
 				</div>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -30,7 +30,7 @@ $(document).ready(function()
 				success:function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit('<?php echo site_url('items'); ?>', response);
+					table_support.handle_submit('<?php echo site_url('items') ?>', response);
 				},
 				dataType: 'json'
 			});
@@ -45,7 +45,7 @@ $(document).ready(function()
 
 		messages: 
 		{
-   			file_path: "<?php echo $this->lang->line('common_import_full_path'); ?>"
+   			file_path: "<?php echo lang('Common.import_full_path') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/items/form_inventory.php b/app/Views/items/form_inventory.php
index 417ae19fa..130459968 100644
--- a/app/Views/items/form_inventory.php
+++ b/app/Views/items/form_inventory.php
@@ -1,97 +1,105 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $item_info
+ * @var array $stock_locations
+ * @var array $item_quantities
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('items/save_inventory/'.$item_info->item_id, array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("items/save_inventory/$item_info->item_id", ['id' => 'item_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="inv_item_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_item_number'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.item_number'), 'name', ['class' => 'control-label col-xs-3']) ?>
 			<div class="col-xs-8">
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
-					<?php echo form_input(array(
-							'name'=>'item_number',
-							'id'=>'item_number',
-							'class'=>'form-control input-sm',
-							'disabled'=>'',
-							'value'=>$item_info->item_number)
-							);?>
+					<?php echo form_input ([
+						'name' => 'item_number',
+						'id' => 'item_number',
+						'class' => 'form-control input-sm',
+						'disabled' => '',
+						'value' => esc($item_info->item_number, 'attr')
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_name'), 'name', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.name'), 'name', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'name',
-						'id'=>'name',
-						'class'=>'form-control input-sm',
-						'disabled'=>'',
-						'value'=>$item_info->name)
-						); ?>
+				<?php echo form_input ([
+					'name' => 'name',
+					'id' => 'name',
+					'class' => 'form-control input-sm',
+					'disabled' => '',
+					'value' => esc($item_info->name, 'attr')
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_category'), 'category', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
-					<?php echo form_input(array(
-							'name'=>'category',
-							'id'=>'category',
-							'class'=>'form-control input-sm',
-							'disabled'=>'',
-							'value'=>$item_info->category)
-							);?>
+					<?php echo form_input ([
+							'name' => 'category',
+							'id' => 'category',
+							'class' => 'form-control input-sm',
+							'disabled' => '',
+							'value' => esc($item_info->category, 'attr')
+					]) ?>
 				</div>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_stock_location'), 'stock_location', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.stock_location'), 'stock_location', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('stock_location', $stock_locations, current($stock_locations), array('onchange'=>'fill_quantity(this.value)', 'class'=>'form-control'));	?>
+				<?php echo form_dropdown('stock_location', esc($stock_locations, 'attr'), current($stock_locations), ['onchange' => 'fill_quantity(this.value)', 'class' => 'form-control']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_current_quantity'), 'quantity', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.current_quantity'), 'quantity', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'quantity',
-						'id'=>'quantity',
-						'class'=>'form-control input-sm',
-						'disabled'=>'',
-						'value'=>to_quantity_decimals(current($item_quantities)))
-						); ?>
+				<?php echo form_input ([
+					'name' => 'quantity',
+					'id' => 'quantity',
+					'class' => 'form-control input-sm',
+					'disabled' => '',
+					'value' => to_quantity_decimals(current($item_quantities))
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_add_minus'), 'quantity', array('class'=>'required control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.add_minus'), 'quantity', ['class' => 'required control-label col-xs-3']) ?>
 			<div class='col-xs-4'>
-				<?php echo form_input(array(
-						'name'=>'newquantity',
-						'id'=>'newquantity',
-						'class'=>'form-control input-sm')
-						); ?>
+				<?php echo form_input ([
+					'name' => 'newquantity',
+					'id' => 'newquantity',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('items_inventory_comments'), 'description', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Items.inventory_comments'), 'description', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array(
-						'name'=>'trans_comment',
-						'id'=>'trans_comment',
-						'class'=>'form-control input-sm')
-						);?>
+				<?php echo form_textarea ([
+					'name' => 'trans_comment',
+					'id' => 'trans_comment',
+					'class' => 'form-control input-sm'
+				]) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -103,7 +111,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -124,8 +132,8 @@ $(document).ready(function()
 		{
 			newquantity:
 			{
-				required: "<?php echo $this->lang->line('items_quantity_required'); ?>",
-				number: "<?php echo $this->lang->line('items_quantity_number'); ?>"
+				required: "<?php echo lang('Items.quantity_required') ?>",
+				number: "<?php echo lang('Items.quantity_number') ?>"
 			}
 		}
 	}, form_support.error));
@@ -133,7 +141,7 @@ $(document).ready(function()
 
 function fill_quantity(val) 
 {   
-	var item_quantities = <?php echo json_encode($item_quantities); ?>;
-	document.getElementById('quantity').value = parseFloat(item_quantities[val]).toFixed(<?php echo quantity_decimals(); ?>);
+	var item_quantities = <?php echo json_encode(esc($item_quantities, 'raw')) ?>;
+	document.getElementById('quantity').value = parseFloat(item_quantities[val]).toFixed(<?php echo quantity_decimals() ?>);
 }
 </script>
diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php
index 9fa69ac0c..a3c267267 100644
--- a/app/Views/items/manage.php
+++ b/app/Views/items/manage.php
@@ -1,4 +1,16 @@
-<?php $this->load->view('partial/header'); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ * @var array $filters
+ * @var array $stock_locations
+ * @var int $stock_location
+ */
+
+use app\Models\Employee;
+
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -18,11 +30,11 @@ $(document).ready(function()
     });
 
 	// load the preset daterange picker
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
     // set the beginning of time as starting date
-    $('#daterangepicker').data('daterangepicker').setStartDate("<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>");
+    $('#daterangepicker').data('daterangepicker').setStartDate("<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,01,01,2010)) ?>");
 	// update the hidden inputs with the selected dates before submitting the search data
-    var start_date = "<?php echo date('Y-m-d', mktime(0,0,0,01,01,2010));?>";
+    var start_date = "<?php echo date('Y-m-d', mktime(0,0,0,01,01,2010)) ?>";
 	$("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
         table_support.refresh();
     });
@@ -31,13 +43,16 @@ $(document).ready(function()
        table_support.refresh();
     });
 
-    <?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+    <?php
+		echo view('partial/bootstrap_tables_locale');
+		$employee = model(Employee::class);
+	?>
 
     table_support.init({
-        employee_id: <?php echo $this->Employee->get_logged_in_employee_info()->person_id; ?>,
-        resource: '<?php echo site_url($controller_name);?>',
-        headers: <?php echo $table_headers; ?>,
-        pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+        employee_id: <?php echo $employee->get_logged_in_employee_info()->person_id ?>,
+        resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+        headers: <?php echo esc($table_headers, 'js') ?>,
+        pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
         uniqueId: 'items.item_id',
         queryParams: function() {
             return $.extend(arguments[0], {
@@ -58,35 +73,56 @@ $(document).ready(function()
 </script>
 
 <div id="title_bar" class="btn-toolbar print_hide">
-    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("$controller_name/csv_import"); ?>'
-            title='<?php echo $this->lang->line('items_import_items_csv'); ?>'>
-        <span class="glyphicon glyphicon-import">&nbsp;</span><?php echo $this->lang->line('common_import_csv'); ?>
+    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/csv_import"), 'url') ?>'
+            title='<?php echo lang('Items.import_items_csv') ?>'>
+        <span class="glyphicon glyphicon-import">&nbsp;</span><?php echo lang('Common.import_csv') ?>
     </button>
 
-    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new='<?php echo $this->lang->line('common_new') ?>' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("$controller_name/view"); ?>'
-            title='<?php echo $this->lang->line($controller_name . '_new'); ?>'>
-        <span class="glyphicon glyphicon-tag">&nbsp;</span><?php echo $this->lang->line($controller_name. '_new'); ?>
+    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new='<?php echo lang('Common.new') ?>' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+            title='<?php echo lang("$controller_name.new") ?>'>
+        <span class="glyphicon glyphicon-tag">&nbsp;</span><?php echo lang("$controller_name.new") ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?php echo $this->lang->line('common_delete'); ?>
+            <span class="glyphicon glyphicon-trash">&nbsp;</span><?php echo lang('Common.delete') ?>
         </button>
-        <button id="bulk_edit" class="btn btn-default btn-sm modal-dlg print_hide", data-btn-submit='<?php echo $this->lang->line('common_submit') ?>', data-href='<?php echo site_url("$controller_name/bulk_edit"); ?>'
-				title='<?php echo $this->lang->line('items_edit_multiple_items'); ?>'>
-            <span class="glyphicon glyphicon-edit">&nbsp;</span><?php echo $this->lang->line("items_bulk_edit"); ?>
+        <button id="bulk_edit" class="btn btn-default btn-sm modal-dlg print_hide" data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/bulk_edit"), 'url') ?>'
+				title='<?php echo lang('Items.edit_multiple_items') ?>'>
+            <span class="glyphicon glyphicon-edit">&nbsp;</span><?php echo lang('Items.bulk_edit') ?>
         </button>
-        <button id="generate_barcodes" class="btn btn-default btn-sm print_hide" data-href='<?php echo site_url("$controller_name/generate_barcodes"); ?>' title='<?php echo $this->lang->line('items_generate_barcodes');?>'>
-            <span class="glyphicon glyphicon-barcode">&nbsp;</span><?php echo $this->lang->line('items_generate_barcodes'); ?>
+        <button id="generate_barcodes" class="btn btn-default btn-sm print_hide" data-href='<?php echo esc(site_url("$controller_name/generate_barcodes"), 'url') ?>' title='<?php echo lang('Items.generate_barcodes') ?>'>
+            <span class="glyphicon glyphicon-barcode">&nbsp;</span><?php echo lang('Items.generate_barcodes') ?>
         </button>
-        <?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
-        <?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+        <?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
+        <?php echo form_multiselect(
+			'filters[]',
+			esc($filters, 'attr'),
+			[''],
+			[
+				'id' => 'filters',
+				'class' => 'selectpicker show-menu-arrow',
+				'data-none-selected-text' => lang('Common.none_selected_text'),
+				'data-selected-text-format' => 'count > 1',
+				'data-style' => 'btn-default btn-sm',
+				'data-width' => 'fit'
+			]) ?>
         <?php
         if (count($stock_locations) > 1)
         {
-            echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit'));
+            echo form_dropdown(
+			'stock_location',
+				esc($stock_locations, 'attr'),
+				$stock_location,
+				[
+					'id' => 'stock_location',
+					'class' => 'selectpicker show-menu-arrow',
+					'data-style' => 'btn-default btn-sm',
+					'data-width' => 'fit'
+				]
+			);
         }
         ?>
     </div>
@@ -96,4 +132,4 @@ $(document).ready(function()
     <table id="table"></table>
 </div>
 
-<?php $this->load->view('partial/footer'); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/login.php b/app/Views/login.php
index 69783da59..46431918e 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -1,14 +1,20 @@
+<?php
+/**
+ * @var object $validation
+ */
+?>
+
 <!doctype html>
-<html lang="<?php echo current_language_code(); ?>">
+<html lang="<?php echo current_language_code() ?>">
 
 <head>
   <meta charset="utf-8">
-	<base href="<?php echo base_url(); ?>">
-	<title><?php echo $this->config->item('company') . '&nbsp;|&nbsp;' . $this->lang->line('common_software_short')  . '&nbsp;|&nbsp;' .  $this->lang->line('login_login'); ?></title>
+	<base href="<?php echo base_url() ?>">
+	<title><?php echo config('OSPOS')->company . '&nbsp;|&nbsp;' . lang('Common.software_short')  . '&nbsp;|&nbsp;' .  lang('Login.login') ?></title>
 	<meta content="width=device-width, initial-scale=1" name="viewport">
   <meta content="noindex, nofollow" name="robots">
-	<link href="images/favicon.ico" rel="shortcut icon" type="image/x-icon">
-  <link href="<?php echo 'dist/bootswatch-5/' . (empty($this->config->item('theme')) || 'paper' == $this->config->item('theme') || 'readable' == $this->config->item('theme') ? 'flatly' : $this->config->item('theme')) . '/bootstrap.min.css'; ?>" rel="stylesheet" type="text/css">
+	<link href="<?php echo base_url() ?>favicon.ico" rel="shortcut icon" type="image/x-icon">
+  <link href="<?php echo 'dist/bootswatch-5/' . (empty(config('OSPOS')->theme) || 'paper' == config('OSPOS')->theme || 'readable' == config('OSPOS')->theme ? 'flatly' : config('OSPOS')->theme) . '/bootstrap.min.css' ?>" rel="stylesheet" type="text/css">
   <!-- start css template tags -->
   <link rel="stylesheet" type="text/css" href="css/login.min.css"/>
   <!-- end css template tags -->
@@ -19,66 +25,66 @@
   <main class="d-flex justify-content-around align-items-center flex-grow-1">
     <div class="container-login container-fluid d-flex flex-column flex-md-row bg-body shadow rounded m-3 p-4 p-md-0">
       <div class="box-logo d-flex flex-column justify-content-center align-items-center border-end px-4 pb-3 p-md-4">
-      <?php if ($this->Appconfig->get('company_logo')): ?>
-        <img class="logo w-100" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="<?php echo $this->lang->line('common_logo') . '&nbsp;' . $this->config->item('company'); ?>">
+      <?php if (config('OSPOS')->company_logo): ?>
+        <img class="logo w-100" src="<?php echo base_url('uploads/' . config('OSPOS')->company_logo) ?>" alt="<?php echo lang('Common.logo') . '&nbsp;' . config('OSPOS')->company ?>">
       <?php else: ?>
         <svg class="logo text-primary" role="img" viewBox="0 0 308.57998 308.57997" xmlns="http://www.w3.org/2000/svg">
-          <title><?php echo $this->lang->line('common_software_title') . '&nbsp;' . $this->lang->line('common_logo'); ?></title>
+          <title><?php echo lang('Common.software_title') . '&nbsp;' . lang('Common.logo') ?></title>
           <circle cx="154.28999" cy="154.28999" r="154.28999" fill="currentColor"/>
           <path fill="#fff" d="M154.88998 145.66999c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63-10.59-11.92-25.86-19.59-43.02-19.59-31.86 0-57.77 25.91-57.77 57.77 0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zm-57.75 38.33c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69 30.69 13.77 30.69 30.69-13.77 30.69-30.69 30.69zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54v-61.47h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
         </svg>
       <?php endif; ?>
       </div>
       <section class="box-login d-flex flex-column justify-content-center align-items-center p-md-4">
-				<?php echo form_open('login'); ?>
-        <h3 class="text-center m-0"><?php echo $this->lang->line('login_welcome', $this->lang->line('common_software_short')); ?></h3>
-        <?php if (validation_errors()): ?>
+				<?php echo form_open('login') ?>
+        <h3 class="text-center m-0"><?php echo lang('Login.welcome', ['install_name' => lang('Common.software_short')]) ?></h3>
+        <?php if ($validation->hasError()): ?>
         <div class="alert alert-danger mt-3">
-          <?php echo validation_errors(); ?>
+          <?php echo $validation->listErrors() ?>
         </div>
         <?php endif; ?>
 				<?php if (!$this->migration->is_latest()): ?>
         <div class="alert alert-info mt-3">
-					<?php echo $this->lang->line('login_migration_needed', $this->config->item('application_version')); ?>
+					<?php echo lang('Login.migration_needed', ['version' => config('OSPOS')->application_version]) ?>
 				</div>
 				<?php endif; ?>
-        <?php if (empty($this->config->item('login_form')) || 'floating_labels'==($this->config->item('login_form'))): ?>
+        <?php if (empty(config('OSPOS')->login_form) || 'floating_labels'==(config('OSPOS')->login_form)): ?>
         <div class="form-floating mt-3">
-          <input class="form-control" id="input-username" name="username" type="text" placeholder="<?php echo $this->lang->line('login_username'); ?>">
-          <label for="input-username"><?php echo $this->lang->line('login_username'); ?></label>
+          <input class="form-control" id="input-username" name="username" type="text" placeholder="<?php echo lang('Login.username') ?>">
+          <label for="input-username"><?php echo lang('Login.username') ?></label>
         </div>
         <div class="form-floating mb-3">
-          <input class="form-control" id="input-password" name="password" type="password" placeholder="<?php echo $this->lang->line('login_password'); ?>">
-          <label for="input-password"><?php echo $this->lang->line('login_password'); ?></label>
+          <input class="form-control" id="input-password" name="password" type="password" placeholder="<?php echo lang('Login.password') ?>">
+          <label for="input-password"><?php echo lang('Login.password') ?></label>
         </div>
-      <?php elseif ('input_groups'==($this->config->item('login_form'))): ?>
+      <?php elseif ('input_groups'==(config('OSPOS')->login_form)): ?>
         <div class="input-group mt-3">
           <span class="input-group-text" id="input-username">
             <svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-              <title><?php echo $this->lang->line('common_icon') . '&nbsp;' . $this->lang->line('login_username'); ?></title>
+              <title><?php echo lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
               <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
             </svg>
           </span>
-          <input class="form-control" name="username" type="text" placeholder="<?php echo $this->lang->line('login_username'); ?>" aria-label="<?php echo $this->lang->line('login_username'); ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo "value='admin'"; ?>>
+          <input class="form-control" name="username" type="text" placeholder="<?php echo lang('Login.username') ?>" aria-label="<?php echo lang('Login.username') ?>" aria-describedby="input-username">
         </div>
         <div class="input-group mb-3">
           <span class="input-group-text" id="input-password">
             <svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-              <title><?php echo $this->lang->line('common_icon') . '&nbsp;' . $this->lang->line('login_password'); ?></title>
+              <title><?php echo lang('Common.icon') . '&nbsp;' . lang('Login.password') ?></title>
               <path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2zM2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
             </svg>
           </span>
-          <input class="form-control" name="password" type="password" placeholder="<?php echo $this->lang->line('login_password'); ?>" aria-label="<?php echo $this->lang->line('login_password'); ?>" <?php if (ENVIRONMENT == "testing") echo "value='pointofsale'"; ?>" aria-describedby="input-password">
+          <input class="form-control" name="password" type="password" placeholder="<?php echo lang('Login.password') ?>" aria-label="<?php echo lang('Login.password') ?>" aria-describedby="input-password">
         </div>
         <?php endif; ?>
-				<?php if($this->config->item('gcaptcha_enable')) {
+				<?php if(config('OSPOS')->gcaptcha_enable) {
 					echo '<script src="https://www.google.com/recaptcha/api.js"></script>';
-					echo '<div class="g-recaptcha mb-3" align="center" data-sitekey="' . $this->config->item('gcaptcha_site_key') . '"></div>'; }
+					echo '<div class="g-recaptcha mb-3" style="text-align: center;" data-sitekey="' . config('OSPOS')->gcaptcha_site_key . '"></div>'; }
         ?>
         <div class="d-grid">
-          <button class="btn btn-lg btn-primary" name="login-button" type="submit" ><?php echo $this->lang->line('login_go'); ?></button>
+          <button class="btn btn-lg btn-primary" name="login-button" type="submit" ><?php echo lang('Login.go') ?></button>
         </div>
-				<?php echo form_close(); ?>
+				<?php echo form_close() ?>
       </section>
     </div>
   </main>
@@ -86,11 +92,11 @@
     <div class="footer container-fluid bg-body rounded shadow p-3 mb-md-4 mx-md-3">
       <span class="text-muted">
         <svg height="1em" role="img" viewBox="0 0 229.85 143.05001" xmlns="http://www.w3.org/2000/svg">
-          <title><?php echo $this->lang->line('common_software_short') . '&nbsp;' . $this->lang->line('common_logo_mark'); ?></title>
+          <title><?php echo lang('Common.software_short') . '&nbsp;' . lang('Common.logo_mark') ?></title>
           <path fill="currentColor" d="M115.51 50.18c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63C90.2 7.71 74.93.04 57.77.04 25.91.04 0 25.95 0 57.81c0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zM57.76 88.51c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69S88.45 40.9 88.45 57.82 74.68 88.51 57.76 88.51zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54V27.07h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
         </svg>
       </span>
-      <span><?php echo $this->lang->line('common_software_title'); ?></span>
+      <span><?php echo lang('Common.software_title') ?></span>
     </div>
   </footer>
 </body>
diff --git a/app/Views/messages/form_sms.php b/app/Views/messages/form_sms.php
index 653d0c400..3cacee2cd 100644
--- a/app/Views/messages/form_sms.php
+++ b/app/Views/messages/form_sms.php
@@ -1,38 +1,44 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var object $person_info
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 	
-<?php echo form_open("messages/send_form/".$person_info->person_id, array('id'=>'send_sms_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open(esc("messages/send_form/$person_info->person_id", 'attr'), ['id' => 'send_sms_form', 'class' => 'form-horizontal']) ?>
 	<fieldset>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('messages_first_name'), 'first_name_label', array('for'=>'first_name', 'class'=>'control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Messages.first_name'), 'first_name_label', ['for' => 'first_name', 'class' => 'control-label col-xs-2']) ?>
 			<div class="col-xs-10">
-				<?php echo form_input(array('class'=>'form-control input-sm', 'type'=>'text', 'name'=>'first_name', 'value'=>$person_info->first_name, 'readonly'=>'true'));?>
+				<?php echo form_input (['class' => 'form-control input-sm', 'type' => 'text', 'name' => 'first_name', 'value' => esc($person_info->first_name, 'attr'), 'readonly' => 'true']) ?>
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('messages_last_name'), 'last_name_label', array('for'=>'last_name', 'class'=>'control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Messages.last_name'), 'last_name_label', ['for' => 'last_name', 'class' => 'control-label col-xs-2']) ?>
 			<div class="col-xs-10">
-				<?php echo form_input(array('class'=>'form-control input-sm', 'type'=>'text', 'name'=>'last_name', 'value'=>$person_info->last_name, 'readonly'=>'true'));?>
+				<?php echo form_input (['class' => 'form-control input-sm', 'type' => 'text', 'name' => 'last_name', 'value' => esc($person_info->last_name, 'attr'), 'readonly' => 'true']) ?>
 			</div>
 		</div> 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('messages_phone'), 'phone_label', array('for'=>'phone', 'class'=>'control-label col-xs-2 required')); ?>
+			<?php echo form_label(lang('Messages.phone'), 'phone_label', ['for' => 'phone', 'class' => 'control-label col-xs-2 required']) ?>
 			<div class="col-xs-10">
 				<div class="input-group">
 					<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
-					<?php echo form_input(array('class'=>'form-control input-sm required', 'type'=>'text', 'name'=>'phone', 'value'=>$person_info->phone_number));?>
+					<?php echo form_input (['class' => 'form-control input-sm required', 'type' => 'text', 'name' => 'phone', 'value' => esc($person_info->phone_number, 'attr')]) ?>
 				</div>
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('messages_message'), 'message_label', array('for'=>'message', 'class'=>'control-label col-xs-2 required')); ?>
+			<?php echo form_label(lang('Messages.message'), 'message_label', ['for' => 'message', 'class' => 'control-label col-xs-2 required']) ?>
 			<div class="col-xs-10">
-				<?php echo form_textarea(array('class'=>'form-control input-sm required', 'name'=>'message', 'id'=>'message', 'value'=>$this->config->item('msg_msg')));?>
+				<?php echo form_textarea (['class' => 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc(config('OSPOS')->msg_msg, 'attr')]) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 //validation and submit handling
@@ -44,7 +50,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -70,12 +76,12 @@ $(document).ready(function()
 		{
 			phone:
 			{
-				required: "<?php echo $this->lang->line('messages_phone_number_required'); ?>",
-				number: "<?php echo $this->lang->line('messages_phone'); ?>"
+				required: "<?php echo lang('Messages.phone_number_required') ?>",
+				number: "<?php echo lang('Messages.phone') ?>"
 			},
 			message:
 			{
-				required: "<?php echo $this->lang->line('messages_message_required'); ?>"
+				required: "<?php echo lang('Messages.message_required') ?>"
 			}
 		}
 	}, form_support.error));
diff --git a/app/Views/messages/index.html b/app/Views/messages/index.html
index b702fbc39..bcb7cae34 100644
--- a/app/Views/messages/index.html
+++ b/app/Views/messages/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/app/Views/messages/sms.php b/app/Views/messages/sms.php
old mode 100755
new mode 100644
index a90057997..202886998
--- a/app/Views/messages/sms.php
+++ b/app/Views/messages/sms.php
@@ -1,38 +1,38 @@
-<?php $this->load->view("partial/header"); ?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 	      
 <div class="jumbotron" style="max-width: 60%; margin:auto">
-	<?php echo form_open("messages/send/", array('id'=>'send_sms_form', 'enctype'=>'multipart/form-data', 'method'=>'post', 'class'=>'form-horizontal')); ?>
+	<?php echo form_open("messages/send/", ['id' => 'send_sms_form', 'enctype' => 'multipart/form-data', 'method' => 'post', 'class' => 'form-horizontal']) ?>
 		<fieldset>
-			<legend style="text-align: center;"><?php echo $this->lang->line('messages_sms_send'); ?></legend>
+			<legend style="text-align: center;"><?php echo lang('Messages.sms_send') ?></legend>
 			<div class="form-group form-group-sm">
-				<label for="phone" class="col-xs-3 control-label"><?php echo $this->lang->line('messages_phone'); ?></label>
+				<label for="phone" class="col-xs-3 control-label"><?php echo lang('Messages.phone') ?></label>
 				<div class="col-xs-9">
-					<input class="form-control input-sm", type="text", name="phone", placeholder="<?php echo $this->lang->line('messages_phone_placeholder'); ?>"></input>
-					<span class="help-block" style="text-align:center;"><?php echo $this->lang->line('messages_multiple_phones'); ?></span>
+					<input class="form-control input-sm" type="text" name="phone" placeholder="<?php echo lang('Messages.phone_placeholder') ?>" />
+					<span class="help-block" style="text-align:center;"><?php echo lang('Messages.multiple_phones') ?></span>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<label for="message" class="col-xs-3 control-label"><?php echo $this->lang->line('messages_message'); ?></label>
+				<label for="message" class="col-xs-3 control-label"><?php echo lang('Messages.message') ?></label>
 				<div class="col-xs-9">
-					<textarea class="form-control input-sm" rows="3" id="message" name="message" placeholder="<?php echo $this->lang->line('messages_message_placeholder'); ?>"></textarea>
+					<textarea class="form-control input-sm" rows="3" id="message" name="message" placeholder="<?php echo lang('Messages.message_placeholder') ?>"></textarea>
 				</div>
 			</div>
 
-			<?php echo form_submit(array(
-				'name'=>'submit_form',
-				'id'=>'submit_form',
-				'value'=>$this->lang->line('common_submit'),
-				'class'=>'btn btn-primary btn-sm pull-right'));?>
+			<?php echo form_submit ([
+				'name' => 'submit_form',
+				'id' => 'submit_form',
+				'value' => lang('Common.submit'),
+				'class' => 'btn btn-primary btn-sm pull-right']) ?>
 		</fieldset>
-	<?php echo form_close(); ?>
+	<?php echo form_close() ?>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
 
 <script type="text/javascript">
 //validation and submit handling
diff --git a/app/Views/no_access.php b/app/Views/no_access.php
index 35d546e4d..7053413e4 100644
--- a/app/Views/no_access.php
+++ b/app/Views/no_access.php
@@ -1,3 +1,5 @@
 <?php
-echo $this->lang->line('error_no_permission_module').' '.$module_name . (!empty($permission_id) ? ' (' . $permission_id . ')' : ''); 
-?> 
\ No newline at end of file
+/**
+ * @var string $module_name
+ */
+echo lang('Error.no_permission_module') . " $module_name" . (!empty($permission_id) ? " ($permission_id)" : '');
\ No newline at end of file
diff --git a/app/Views/partial/bootstrap_tables_locale.php b/app/Views/partial/bootstrap_tables_locale.php
index 3aef29dd1..5ee5ebb54 100644
--- a/app/Views/partial/bootstrap_tables_locale.php
+++ b/app/Views/partial/bootstrap_tables_locale.php
@@ -1,50 +1,57 @@
+<?php
+/**
+ * @var string $controller_name
+ */
+?>
 (function ($) {
 	'use strict';
 
-	$.fn.bootstrapTable.locales['<?php echo current_language_code(); ?>'] = {
+	$.fn.bootstrapTable.locales['<?php echo current_language_code() ?>'] = {
 		formatLoadingMessage: function () {
-			return "<?php echo $this->lang->line('tables_loading');?>";
+			return "<?php echo lang('Bootstrap_tables.loading') ?>";
 		},
 		formatRecordsPerPage: function (pageNumber) {
-			return "<?php echo $this->lang->line('tables_rows_per_page'); ?>".replace('{0}', pageNumber);
+			return "<?php echo lang('Bootstrap_tables.rows_per_page') ?>".replace('{0}', pageNumber);
 		},
 		formatShowingRows: function (pageFrom, pageTo, totalRows) {
-			return "<?php echo $this->lang->line('tables_page_from_to'); ?>".replace('{0}', pageFrom).replace('{1}', pageTo).replace('{2}', totalRows);
+			return "<?php echo lang('Bootstrap_tables.page_from_to') ?>".replace('{0}', pageFrom).replace('{1}', pageTo).replace('{2}', totalRows);
 		},
 		formatSearch: function () {
-			return "<?php echo $this->lang->line('common_search'); ?>";
+			return "<?php echo lang('Common.search') ?>";
 		},
 		formatNoMatches: function () {
-			return "<?php echo $this->lang->line(preg_match('(customers|suppliers|employees)', $controller_name) ?
-				'common_no_persons_to_display' : $controller_name . '_no_' . $controller_name .'_to_display'); ?>";
+			return "<?php echo lang(preg_match('(customers|suppliers|employees)', $controller_name)
+				? 'common_no_persons_to_display'
+				: "$controller_name.no_$controller_name" . '_to_display')
+			?>";
 		},
 		formatPaginationSwitch: function () {
-			return "<?php echo $this->lang->line('tables_hide_show_pagination'); ?>";
+			return "<?php echo lang('Bootstrap_tables.hide_show_pagination') ?>";
 		},
 		formatRefresh: function () {
-			return "<?php echo $this->lang->line('tables_refresh'); ?>";
+			return "<?php echo lang('Bootstrap_tables.refresh') ?>";
 		},
 		formatToggle: function () {
-			return "<?php echo $this->lang->line('tables_toggle'); ?>";
+			return "<?php echo lang('Bootstrap_tables.toggle') ?>";
 		},
 		formatColumns: function () {
-			return "<?php echo $this->lang->line('tables_columns'); ?>";
+			return "<?php echo lang('Bootstrap_tables.columns') ?>";
 		},
 		formatAllRows: function () {
-			return "<?php echo $this->lang->line('tables_all'); ?>";
+			return "<?php echo lang('Bootstrap_tables.all') ?>";
 		},
 		formatConfirmAction: function(action) {
 			if (action == "delete")
 			{
-				return "<?php echo $this->lang->line((isset($editable) ? $editable : $controller_name). "_confirm_delete")?>";
+				return "<?php echo lang(($editable ?? $controller_name). '.confirm_delete') ?>";
 			}
 			else
 			{
-				return "<?php echo $this->lang->line((isset($editable) ? $editable : $controller_name). "_confirm_restore")?>";
+				return "<?php echo lang(($editable ?? $controller_name). '.confirm_restore') ?>";
 			}
         }
 	};
 
-	$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales["<?php echo current_language_code();?>"]);
+	$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales["<?php echo current_language_code() ?>"]);
 
 })(jQuery);
\ No newline at end of file
diff --git a/app/Views/partial/customer_rewards.php b/app/Views/partial/customer_rewards.php
index e4ea44abe..1a78e633d 100644
--- a/app/Views/partial/customer_rewards.php
+++ b/app/Views/partial/customer_rewards.php
@@ -1,41 +1,46 @@
 <?php
-$i = 0;
+/**
+ * @var array $customer_rewards
+ */
+?>
+<?php
+	$i = 0;
 
-foreach($customer_rewards as $customer_rewards => $reward_category)
-{
-	$customer_reward_id = $reward_category['package_id'];
-	$customer_reward_name = $reward_category['package_name'];
-	$customer_points_percent = $reward_category['points_percent'];
-	++$i;
+	foreach($customer_rewards as $reward_key => $reward_category)
+	{
+		$customer_reward_id = $reward_category['package_id'];
+		$customer_reward_name = $reward_category['package_name'];
+		$customer_points_percent = $reward_category['points_percent'];
+		++$i;
 ?>
-	<div class="form-group form-group-sm" style="<?php echo $reward_category['deleted'] ? 'display:none;' : 'display:block;' ?>">
-		<?php echo form_label($this->lang->line('config_customer_reward') . ' ' . $i, 'customer_reward_' . $i, array('class'=>'required control-label col-xs-2')); ?>
-		<div class='col-xs-2'>
-			<?php $form_data = array(
-					'name'=>'customer_reward_' . $customer_reward_id,
-					'id'=>'customer_reward_' . $customer_reward_id,
-					'class'=>'customer_reward valid_chars form-control input-sm required',
-					'value'=>$customer_reward_name
-				);
-				$reward_category['deleted'] && $form_data['disabled'] = 'disabled';
-				echo form_input($form_data);
-			?>
+		<div class="form-group form-group-sm" style="<?php echo $reward_category['deleted'] ? 'display:none;' : 'display:block;' ?>">
+			<?php echo form_label(lang('Config.customer_reward') . " $i", "customer_reward_$i", ['class' => 'required control-label col-xs-2']) ?>
+			<div class='col-xs-2'>
+				<?php $form_data = [
+						'name' => 'customer_reward_' . $customer_reward_id,
+						'id' => 'customer_reward_' . $customer_reward_id,
+						'class' => 'customer_reward valid_chars form-control input-sm required',
+						'value' => $customer_reward_name
+					];
+					$reward_category['deleted'] && $form_data['disabled'] = 'disabled';
+					echo form_input($form_data);
+				?>
+			</div>
+			<div class='col-xs-2'>
+				<?php $form_data = [
+						'name' => 'reward_points_' . $customer_reward_id,
+						'id' => 'reward_points_' . $customer_reward_id,
+						'class' => 'customer_reward valid_chars form-control input-sm required',
+						'value' => $customer_points_percent
+					];
+					$reward_category['deleted'] && $form_data['disabled'] = 'disabled';
+					echo form_input($form_data);
+				?>
+			</div>
+			<span class="add_customer_reward glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+			<span>&nbsp;&nbsp;</span>
+			<span class="remove_customer_reward glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
 		</div>
-		<div class='col-xs-2'>
-			<?php $form_data = array(
-					'name'=>'reward_points_' . $customer_reward_id,
-					'id'=>'reward_points_' . $customer_reward_id,
-					'class'=>'customer_reward valid_chars form-control input-sm required',
-					'value'=>$customer_points_percent
-				);
-				$reward_category['deleted'] && $form_data['disabled'] = 'disabled';
-				echo form_input($form_data);
-			?>
-		</div>
-		<span class="add_customer_reward glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
-		<span>&nbsp;&nbsp;</span>
-		<span class="remove_customer_reward glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
-	</div>
 <?php
-}
+	}
 ?>
diff --git a/app/Views/partial/datepicker_locale.php b/app/Views/partial/datepicker_locale.php
index 0d9c1dd6a..00f9e8d19 100644
--- a/app/Views/partial/datepicker_locale.php
+++ b/app/Views/partial/datepicker_locale.php
@@ -2,11 +2,11 @@
 
 var pickerconfig = function(config) {
     return $.extend({
-        format: "<?php echo dateformat_bootstrap($this->config->item('dateformat')) . ' ' . dateformat_bootstrap($this->config->item('timeformat'));?>",
+        format: "<?php echo dateformat_bootstrap(config('OSPOS')->dateformat) . ' ' . dateformat_bootstrap(config('OSPOS')->timeformat) ?>",
         <?php
-        $t = $this->config->item('timeformat');
+        $t = config('OSPOS')->timeformat;
         $m = $t[strlen($t)-1];
-        if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false )
+        if( strpos(config('OSPOS')->timeformat, 'a') !== false || strpos(config('OSPOS')->timeformat, 'A') !== false )
         {
             ?>
             showMeridian: true,
@@ -24,76 +24,76 @@ var pickerconfig = function(config) {
         todayBtn: true,
         todayHighlight: true,
         bootcssVer: 3,
-        language: "<?php echo current_language_code(); ?>"
-    }, <?php echo isset($config) ? $config : '{}' ?>);
+        language: "<?php echo current_language_code() ?>"
+    }, <?php echo $config ?? '{}' ?>);
 };
 
-$.fn.datetimepicker.dates['<?php echo $this->config->item("language"); ?>'] = {
+$.fn.datetimepicker.dates['<?php echo config('OSPOS')->language ?>'] = {
     days: [
-		"<?php echo $this->lang->line("cal_sunday"); ?>",
-        "<?php echo $this->lang->line("cal_monday"); ?>",
-        "<?php echo $this->lang->line("cal_tuesday"); ?>",
-        "<?php echo $this->lang->line("cal_wednesday"); ?>",
-        "<?php echo $this->lang->line("cal_thursday"); ?>",
-        "<?php echo $this->lang->line("cal_friday"); ?>",
-        "<?php echo $this->lang->line("cal_saturday"); ?>",
-        "<?php echo $this->lang->line("cal_sunday"); ?>"
+		"<?php echo lang('Cal.sunday') ?>",
+        "<?php echo lang('Cal.monday') ?>",
+        "<?php echo lang('Cal.tuesday') ?>",
+        "<?php echo lang('Cal.wednesday') ?>",
+        "<?php echo lang('Cal.thursday') ?>",
+        "<?php echo lang('Cal.friday') ?>",
+        "<?php echo lang('Cal.saturday') ?>",
+        "<?php echo lang('Cal.sunday') ?>"
 		],
         daysShort: [
-		"<?php echo $this->lang->line("cal_sun"); ?>",
-        "<?php echo $this->lang->line("cal_mon"); ?>",
-        "<?php echo $this->lang->line("cal_tue"); ?>",
-        "<?php echo $this->lang->line("cal_wed"); ?>",
-        "<?php echo $this->lang->line("cal_thu"); ?>",
-        "<?php echo $this->lang->line("cal_fri"); ?>",
-        "<?php echo $this->lang->line("cal_sat"); ?>"
+		"<?php echo lang('Cal.sun') ?>",
+        "<?php echo lang('Cal.mon') ?>",
+        "<?php echo lang('Cal.tue') ?>",
+        "<?php echo lang('Cal.wed') ?>",
+        "<?php echo lang('Cal.thu') ?>",
+        "<?php echo lang('Cal.fri') ?>",
+        "<?php echo lang('Cal.sat') ?>"
 		],
         daysMin: [
-		"<?php echo $this->lang->line("cal_su"); ?>",
-        "<?php echo $this->lang->line("cal_mo"); ?>",
-        "<?php echo $this->lang->line("cal_tu"); ?>",
-        "<?php echo $this->lang->line("cal_we"); ?>",
-        "<?php echo $this->lang->line("cal_th"); ?>",
-        "<?php echo $this->lang->line("cal_fr"); ?>",
-        "<?php echo $this->lang->line("cal_sa"); ?>"
+		"<?php echo lang('Cal.su') ?>",
+        "<?php echo lang('Cal.mo') ?>",
+        "<?php echo lang('Cal.tu') ?>",
+        "<?php echo lang('Cal.we') ?>",
+        "<?php echo lang('Cal.th') ?>",
+        "<?php echo lang('Cal.fr') ?>",
+        "<?php echo lang('Cal.sa') ?>"
 		],
         months: [
-		"<?php echo $this->lang->line("cal_january"); ?>",
-        "<?php echo $this->lang->line("cal_february"); ?>",
-        "<?php echo $this->lang->line("cal_march"); ?>",
-        "<?php echo $this->lang->line("cal_april"); ?>",
-        "<?php echo $this->lang->line("cal_may"); ?>",
-        "<?php echo $this->lang->line("cal_june"); ?>",
-        "<?php echo $this->lang->line("cal_july"); ?>",
-        "<?php echo $this->lang->line("cal_august"); ?>",
-        "<?php echo $this->lang->line("cal_september"); ?>",
-        "<?php echo $this->lang->line("cal_october"); ?>",
-        "<?php echo $this->lang->line("cal_november"); ?>",
-        "<?php echo $this->lang->line("cal_december"); ?>"
+		"<?php echo lang('Cal.january') ?>",
+        "<?php echo lang('Cal.february') ?>",
+        "<?php echo lang('Cal.march') ?>",
+        "<?php echo lang('Cal.april') ?>",
+        "<?php echo lang('Cal.may') ?>",
+        "<?php echo lang('Cal.june') ?>",
+        "<?php echo lang('Cal.july') ?>",
+        "<?php echo lang('Cal.august') ?>",
+        "<?php echo lang('Cal.september') ?>",
+        "<?php echo lang('Cal.october') ?>",
+        "<?php echo lang('Cal.november') ?>",
+        "<?php echo lang('Cal.december') ?>"
 		],
         monthsShort: [
-		"<?php echo $this->lang->line("cal_jan"); ?>",
-        "<?php echo $this->lang->line("cal_feb"); ?>",
-        "<?php echo $this->lang->line("cal_mar"); ?>",
-        "<?php echo $this->lang->line("cal_apr"); ?>",
-        "<?php echo $this->lang->line("cal_may"); ?>",
-        "<?php echo $this->lang->line("cal_jun"); ?>",
-        "<?php echo $this->lang->line("cal_jul"); ?>",
-        "<?php echo $this->lang->line("cal_aug"); ?>",
-        "<?php echo $this->lang->line("cal_sep"); ?>",
-        "<?php echo $this->lang->line("cal_oct"); ?>",
-        "<?php echo $this->lang->line("cal_nov"); ?>",
-        "<?php echo $this->lang->line("cal_dec"); ?>"
+		"<?php echo lang('Cal.jan') ?>",
+        "<?php echo lang('Cal.feb') ?>",
+        "<?php echo lang('Cal.mar') ?>",
+        "<?php echo lang('Cal.apr') ?>",
+        "<?php echo lang('Cal.may') ?>",
+        "<?php echo lang('Cal.jun') ?>",
+        "<?php echo lang('Cal.jul') ?>",
+        "<?php echo lang('Cal.aug') ?>",
+        "<?php echo lang('Cal.sep') ?>",
+        "<?php echo lang('Cal.oct') ?>",
+        "<?php echo lang('Cal.nov') ?>",
+        "<?php echo lang('Cal.dec') ?>"
 		],
-    today: "<?php echo $this->lang->line("datepicker_today"); ?>",
+    today: "<?php echo lang('Datepicker.today') ?>",
     <?php
-        if( strpos($this->config->item('timeformat'), 'a') !== false )
+        if( strpos(config('OSPOS')->timeformat, 'a') !== false )
         {
     ?>
     meridiem: ["am", "pm"],
     <?php
         }
-        elseif( strpos($this->config->item('timeformat'), 'A') !== false )
+        elseif( strpos(config('OSPOS')->timeformat, 'A') !== false )
         {
     ?>
     meridiem: ["AM", "PM"],
@@ -106,7 +106,7 @@ $.fn.datetimepicker.dates['<?php echo $this->config->item("language"); ?>'] = {
     <?php
         }
     ?>
-    weekStart: <?php echo $this->lang->line("datepicker_weekstart"); ?>
+    weekStart: <?php echo lang('Datepicker.weekstart') ?>
 };
 
 $(".datetime").datetimepicker(pickerconfig());
diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php
index a9d66603a..49d7979b7 100644
--- a/app/Views/partial/daterangepicker.php
+++ b/app/Views/partial/daterangepicker.php
@@ -1,5 +1,5 @@
 <?php $this->lang->load("calendar"); $this->lang->load("date"); 
-	if(empty($this->config->item('date_or_time_format')))
+	if(empty(config('OSPOS')->date_or_time_format))
 	{
 ?>
 		$('#daterangepicker').css("width","180");
@@ -8,102 +8,102 @@
 
 		$('#daterangepicker').daterangepicker({
 			"ranges": {
-				"<?php echo $this->lang->line("datepicker_today"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.today') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
+				"<?php echo lang('Datepicker.today_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.yesterday') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.last_7') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.last_30') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.this_month') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
+				"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_same_month_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y")-1)-1);?>"
+				"<?php echo lang('Datepicker.same_month_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")-1,1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.last_month') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>"
+				"<?php echo lang('Datepicker.this_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,1,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,1,1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,1,1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_financial_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>"
+				"<?php echo lang('Datepicker.this_financial_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,config('OSPOS')->financial_year,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_financial_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.last_financial_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,config('OSPOS')->financial_year,1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,config('OSPOS')->financial_year,1,date("Y"))-1) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,2010));?>",
-					"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+				"<?php echo lang('Datepicker.all_time') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,1,1,2010)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 				],
 			},
 			"locale": {
-				"format": '<?php echo dateformat_momentjs($this->config->item("dateformat"))?>',
+				"format": '<?php echo dateformat_momentjs(config('OSPOS')->dateformat) ?>',
 				"separator": " - ",
-				"applyLabel": "<?php echo $this->lang->line("datepicker_apply"); ?>",
-				"cancelLabel": "<?php echo $this->lang->line("datepicker_cancel"); ?>",
-				"fromLabel": "<?php echo $this->lang->line("datepicker_from"); ?>",
-				"toLabel": "<?php echo $this->lang->line("datepicker_to"); ?>",
-				"customRangeLabel": "<?php echo $this->lang->line("datepicker_custom"); ?>",
+				"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
+				"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
+				"fromLabel": "<?php echo lang('Datepicker.from') ?>",
+				"toLabel": "<?php echo lang('Datepicker.to') ?>",
+				"customRangeLabel": "<?php echo lang('Datepicker.custom') ?>",
 				"daysOfWeek": [
-					"<?php echo $this->lang->line("cal_su"); ?>",
-					"<?php echo $this->lang->line("cal_mo"); ?>",
-					"<?php echo $this->lang->line("cal_tu"); ?>",
-					"<?php echo $this->lang->line("cal_we"); ?>",
-					"<?php echo $this->lang->line("cal_th"); ?>",
-					"<?php echo $this->lang->line("cal_fr"); ?>",
-					"<?php echo $this->lang->line("cal_sa"); ?>",
-					"<?php echo $this->lang->line("cal_su"); ?>"
+					"<?php echo lang('Cal.su') ?>",
+					"<?php echo lang('Cal.mo') ?>",
+					"<?php echo lang('Cal.tu') ?>",
+					"<?php echo lang('Cal.we') ?>",
+					"<?php echo lang('Cal.th') ?>",
+					"<?php echo lang('Cal.fr') ?>",
+					"<?php echo lang('Cal.sa') ?>",
+					"<?php echo lang('Cal.su') ?>"
 				],
 				"monthNames": [
-					"<?php echo $this->lang->line("cal_january"); ?>",
-					"<?php echo $this->lang->line("cal_february"); ?>",
-					"<?php echo $this->lang->line("cal_march"); ?>",
-					"<?php echo $this->lang->line("cal_april"); ?>",
-					"<?php echo $this->lang->line("cal_may"); ?>",
-					"<?php echo $this->lang->line("cal_june"); ?>",
-					"<?php echo $this->lang->line("cal_july"); ?>",
-					"<?php echo $this->lang->line("cal_august"); ?>",
-					"<?php echo $this->lang->line("cal_september"); ?>",
-					"<?php echo $this->lang->line("cal_october"); ?>",
-					"<?php echo $this->lang->line("cal_november"); ?>",
-					"<?php echo $this->lang->line("cal_december"); ?>"
+					"<?php echo lang('Cal.january') ?>",
+					"<?php echo lang('Cal.february') ?>",
+					"<?php echo lang('Cal.march') ?>",
+					"<?php echo lang('Cal.april') ?>",
+					"<?php echo lang('Cal.may') ?>",
+					"<?php echo lang('Cal.june') ?>",
+					"<?php echo lang('Cal.july') ?>",
+					"<?php echo lang('Cal.august') ?>",
+					"<?php echo lang('Cal.september') ?>",
+					"<?php echo lang('Cal.october') ?>",
+					"<?php echo lang('Cal.november') ?>",
+					"<?php echo lang('Cal.december') ?>"
 				],
-				"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
+				"firstDay": <?php echo lang('Datepicker.weekstart') ?>
 			},
 			"alwaysShowCalendars": true,
-			"startDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
-			"endDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>",
-			"minDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
-			"maxDate": "<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
+			"startDate": "<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
+			"endDate": "<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
+			"minDate": "<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,01,01,2010)) ?>",
+			"maxDate": "<?php echo date(config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
 		}, function(start, end, label) {
 			start_date = start.format('YYYY-MM-DD');
 			end_date = end.format('YYYY-MM-DD');
@@ -114,108 +114,108 @@
 	{
 ?>
 		$('#daterangepicker').css("width","305");
-		var start_date = "<?php echo date('Y-m-d H:i:s', mktime(0,0,0,date("m"),date("d"),date("Y")))?>";
-		var end_date = "<?php echo date('Y-m-d H:i:s', mktime(23,59,59,date("m"),date("d"),date("Y")))?>";
+		var start_date = "<?php echo date('Y-m-d H:i:s', mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>";
+		var end_date = "<?php echo date('Y-m-d H:i:s', mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>";
 		$('#daterangepicker').daterangepicker({
 			"ranges": {
-				"<?php echo $this->lang->line("datepicker_today"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+				"<?php echo lang('Datepicker.today') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->dateformat, mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1));?>"
+				"<?php echo lang('Datepicker.today_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d")-1,date("Y")));?>"
+				"<?php echo lang('Datepicker.yesterday') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+				"<?php echo lang('Datepicker.last_7') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+				"<?php echo lang('Datepicker.last_30') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+				"<?php echo lang('Datepicker.this_month') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1));?>"
+				"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_same_month_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")-1));?>"
+				"<?php echo lang('Datepicker.same_month_last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m")-1,1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),0,date("Y")));?>"
+				"<?php echo lang('Datepicker.last_month') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),0,date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")));?>"
+				"<?php echo lang('Datepicker.this_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,1,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,12,31,date("Y")-1));?>"
+				"<?php echo lang('Datepicker.last_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,1,1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,12,31,date("Y")-1)) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_this_financial_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")));?>"
+				"<?php echo lang('Datepicker.this_financial_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,config('OSPOS')->financial_year,1,date("Y"))) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_last_financial_year"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")-1));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,$this->config->item('financial_year'),0,date("Y")));?>"
+				"<?php echo lang('Datepicker.last_financial_year') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,config('OSPOS')->financial_year,1,date("Y")-1)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,config('OSPOS')->financial_year,0,date("Y"))) ?>"
 				],
-				"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,2010));?>",
-					"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+				"<?php echo lang('Datepicker.all_time') ?>": [
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,1,1,2010)) ?>",
+					"<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 				],
 			},
 			"locale": {
-				"format": '<?php echo dateformat_momentjs($this->config->item("dateformat")." ".$this->config->item('timeformat'))?>',
+				"format": '<?php echo dateformat_momentjs(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat) ?>',
 				"separator": " - ",
-				"applyLabel": "<?php echo $this->lang->line("datepicker_apply"); ?>",
-				"cancelLabel": "<?php echo $this->lang->line("datepicker_cancel"); ?>",
-				"fromLabel": "<?php echo $this->lang->line("datepicker_from"); ?>",
-				"toLabel": "<?php echo $this->lang->line("datepicker_to"); ?>",
-				"customRangeLabel": "<?php echo $this->lang->line("datepicker_custom"); ?>",
+				"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
+				"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
+				"fromLabel": "<?php echo lang('Datepicker.from') ?>",
+				"toLabel": "<?php echo lang('Datepicker.to') ?>",
+				"customRangeLabel": "<?php echo lang('Datepicker.custom') ?>",
 				"daysOfWeek": [
-					"<?php echo $this->lang->line("cal_su"); ?>",
-					"<?php echo $this->lang->line("cal_mo"); ?>",
-					"<?php echo $this->lang->line("cal_tu"); ?>",
-					"<?php echo $this->lang->line("cal_we"); ?>",
-					"<?php echo $this->lang->line("cal_th"); ?>",
-					"<?php echo $this->lang->line("cal_fr"); ?>",
-					"<?php echo $this->lang->line("cal_sa"); ?>",
-					"<?php echo $this->lang->line("cal_su"); ?>"
+					"<?php echo lang('Cal.su') ?>",
+					"<?php echo lang('Cal.mo') ?>",
+					"<?php echo lang('Cal.tu') ?>",
+					"<?php echo lang('Cal.we') ?>",
+					"<?php echo lang('Cal.th') ?>",
+					"<?php echo lang('Cal.fr') ?>",
+					"<?php echo lang('Cal.sa') ?>",
+					"<?php echo lang('Cal.su') ?>"
 				],
 				"monthNames": [
-					"<?php echo $this->lang->line("cal_january"); ?>",
-					"<?php echo $this->lang->line("cal_february"); ?>",
-					"<?php echo $this->lang->line("cal_march"); ?>",
-					"<?php echo $this->lang->line("cal_april"); ?>",
-					"<?php echo $this->lang->line("cal_may"); ?>",
-					"<?php echo $this->lang->line("cal_june"); ?>",
-					"<?php echo $this->lang->line("cal_july"); ?>",
-					"<?php echo $this->lang->line("cal_august"); ?>",
-					"<?php echo $this->lang->line("cal_september"); ?>",
-					"<?php echo $this->lang->line("cal_october"); ?>",
-					"<?php echo $this->lang->line("cal_november"); ?>",
-					"<?php echo $this->lang->line("cal_december"); ?>"
+					"<?php echo lang('Cal.january') ?>",
+					"<?php echo lang('Cal.february') ?>",
+					"<?php echo lang('Cal.march') ?>",
+					"<?php echo lang('Cal.april') ?>",
+					"<?php echo lang('Cal.may') ?>",
+					"<?php echo lang('Cal.june') ?>",
+					"<?php echo lang('Cal.july') ?>",
+					"<?php echo lang('Cal.august') ?>",
+					"<?php echo lang('Cal.september') ?>",
+					"<?php echo lang('Cal.october') ?>",
+					"<?php echo lang('Cal.november') ?>",
+					"<?php echo lang('Cal.december') ?>"
 				],
-				"firstDay": <?php echo $this->lang->line("datepicker_weekstart"); ?>
+				"firstDay": <?php echo lang('Datepicker.weekstart') ?>
 			},
 		    "timePicker": true,
 		    "timePickerSeconds": true,
 			"alwaysShowCalendars": true,
-			"startDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
-			"endDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>",
-			"minDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
-			"maxDate": "<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
+			"startDate": "<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
+			"endDate": "<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>",
+			"minDate": "<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(0,0,0,01,01,2010)) ?>",
+			"maxDate": "<?php echo date(config('OSPOS')->dateformat." ".config('OSPOS')->timeformat,mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
 		}, function(start, end, label) {
 			start_date = start.format('YYYY-MM-DD HH:mm:ss');
 			end_date = end.format('YYYY-MM-DD HH:mm:ss');
diff --git a/app/Views/partial/dinner_tables.php b/app/Views/partial/dinner_tables.php
index 4aa68df09..eac3f0cfb 100644
--- a/app/Views/partial/dinner_tables.php
+++ b/app/Views/partial/dinner_tables.php
@@ -1,21 +1,28 @@
 <?php
+/**
+ * @var array $dinner_tables
+ */
+?>
+<?php
 $i = 0;
 
-foreach($dinner_tables as $dinner_tables => $table)
+foreach($dinner_tables as $table_key => $table)
 {
 	$dinner_table_id = $table['dinner_table_id'];
 	$dinner_table_name = $table['name'];
 	++$i;
 ?>
 	<div class="form-group form-group-sm" style="<?php echo $table['deleted'] ? 'display:none;' : 'display:block;' ?>">
-		<?php echo form_label($this->lang->line('config_dinner_table') . ' ' . $i, 'dinner_table_' . $i, array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Config.dinner_table') . " $i", "dinner_table_$i", ['class' => 'required control-label col-xs-2']) ?>
+
+
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-					'name'=>'dinner_table_' . $dinner_table_id,
-					'id'=>'dinner_table_' . $dinner_table_id,
-					'class'=>'dinner_table valid_chars form-control input-sm required',
-					'value'=>$dinner_table_name
-				);
+			<?php $form_data = [
+					'name' => esc("dinner_table_$dinner_table_id", 'attr'),
+					'id' => esc("dinner_table_$dinner_table_id", 'attr'),
+					'class' => 'dinner_table valid_chars form-control input-sm required',
+					'value' => esc($dinner_table_name, 'attr')
+				];
 				$table['deleted'] && $form_data['disabled'] = 'disabled';
 				echo form_input($form_data);
 			?>
diff --git a/app/Views/partial/footer.php b/app/Views/partial/footer.php
new file mode 100644
index 000000000..c9b24daff
--- /dev/null
+++ b/app/Views/partial/footer.php
@@ -0,0 +1,12 @@
+			</div>
+		</div>
+
+		<div id="footer">
+			<div class="jumbotron push-spaces">
+				<strong><?php echo lang('Common.copyrights', ['current_year' => date('Y')]) ?> ·
+				<a href="https://opensourcepos.org" target="_blank"><?php echo lang('Common.website') ?></a>  ·
+				<?php echo esc(config('OSPOS')->application_version) ?> - <?php echo esc(substr(config('OSPOS')->commit_sha1, 0, 6)) ?></strong>.
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php
new file mode 100644
index 000000000..d09bb57ef
--- /dev/null
+++ b/app/Views/partial/header.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * @var object $user_info
+ * @var array $allowed_modules
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo $this->request->getLocale() ?>">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<base href="<?php echo base_url() ?>" />
+	<title><?php echo esc(config('OSPOS')->company) . ' | ' . lang('Common.powered_by') . ' OSPOS ' . esc(config('OSPOS')->application_version) ?></title>
+	<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url() ?>favicon.ico">
+	<link rel="stylesheet" type="text/css" href="<?php echo 'dist/bootswatch/' . (empty(config('OSPOS')->theme) ? 'flatly' : esc(config('OSPOS')->theme)) . '/bootstrap.min.css' ?>"/>
+
+	<?php if ($this->request->cookie('debug') == 'true' || $this->request->getGet('debug') == 'true') : ?>
+		<!-- bower:css -->
+		<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
+		<link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
+		<link rel="stylesheet" href="bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-table/dist/bootstrap-table.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
+		<link rel="stylesheet" href="bower_components/chartist/dist/chartist.min.css" />
+		<link rel="stylesheet" href="bower_components/chartist-plugin-tooltip/dist/chartist-plugin-tooltip.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.css" />
+		<link rel="stylesheet" href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" />
+		<!-- endbower -->
+		<!-- start css template tags -->
+		<link rel="stylesheet" type="text/css" href="css/bootstrap.autocomplete.css"/>
+		<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
+		<link rel="stylesheet" type="text/css" href="css/ospos_print.css"/>
+		<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
+		<link rel="stylesheet" type="text/css" href="css/popupbox.css"/>
+		<link rel="stylesheet" type="text/css" href="css/receipt.css"/>
+		<link rel="stylesheet" type="text/css" href="css/register.css"/>
+		<link rel="stylesheet" type="text/css" href="css/reports.css"/>
+		<!-- end css template tags -->
+		<!-- bower:js -->
+		<script type="application/javascript" src="bower_components/jquery/dist/jquery.js"></script>
+		<script type="application/javascript" src="bower_components/jquery-form/src/jquery.form.js"></script>
+		<script type="application/javascript" src="bower_components/jquery-validate/dist/jquery.validate.js"></script>
+		<script type="application/javascript" src="bower_components/jquery-ui/jquery-ui.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script>
+		<script type="application/javascript" src="bower_components/jasny-bootstrap/dist/js/jasny-bootstrap.js"></script>
+		<script type="application/javascript" src="bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-table/dist/bootstrap-table.min.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-table/dist/extensions/export/bootstrap-table-export.min.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js"></script>
+		<script type="application/javascript" src="bower_components/moment/moment.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
+		<script type="application/javascript" src="bower_components/es6-promise/es6-promise.js"></script>
+		<script type="application/javascript" src="bower_components/file-saver/dist/FileSaver.min.js"></script>
+		<script type="application/javascript" src="bower_components/html2canvas/build/html2canvas.js"></script>
+		<script type="application/javascript" src="bower_components/jspdf/dist/jspdf.debug.js"></script>
+		<script type="application/javascript" src="bower_components/jspdf-autotable/dist/jspdf.plugin.autotable.js"></script>
+		<script type="application/javascript" src="bower_components/tableExport.jquery.plugin/tableExport.js"></script>
+		<script type="application/javascript" src="bower_components/chartist/dist/chartist.min.js"></script>
+		<script type="application/javascript" src="bower_components/chartist-plugin-pointlabels/dist/chartist-plugin-pointlabels.min.js"></script>
+		<script type="application/javascript" src="bower_components/chartist-plugin-tooltip/dist/chartist-plugin-tooltip.min.js"></script>
+		<script type="application/javascript" src="bower_components/chartist-plugin-barlabels/dist/chartist-plugin-barlabels.min.js"></script>
+		<script type="application/javascript" src="bower_components/remarkable-bootstrap-notify/bootstrap-notify.js"></script>
+		<script type="application/javascript" src="bower_components/js-cookie/src/js.cookie.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.js"></script>
+		<script type="application/javascript" src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
+		<!-- endbower -->
+		<!-- start js template tags -->
+		<script type="text/javascript" src="dist/bootstrap/js/bootstrap.min.js"></script>
+		<script type="text/javascript" src="js/clipboard.min.js"></script>
+		<script type="text/javascript" src="js/imgpreview.full.jquery.js"></script>
+		<script type="text/javascript" src="js/manage_tables.js"></script>
+		<script type="text/javascript" src="js/nominatim.autocomplete.js"></script>
+		<!-- end js template tags -->
+	<?php else : ?>
+		<!--[if lte IE 8]>
+		<link rel="stylesheet" media="print" href="dist/print.css" type="text/css" />
+		<![endif]-->
+		<!-- start mincss template tags -->
+		<link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=88e63d8098"/>
+		<!-- end mincss template tags -->
+
+		<!-- Tweaks to the UI for a particular theme should drop here  -->
+	<?php if (config('OSPOS')->theme != 'flatly' && file_exists($_SERVER['DOCUMENT_ROOT'] . '/public/css/' . esc(config('OSPOS')->theme) . '.css')) { ?>
+		<link rel="stylesheet" type="text/css" href="<?php echo 'css/' . esc(config('OSPOS')->theme) . '.css' ?>"/>
+	<?php } ?>
+
+		<!-- start minjs template tags -->
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=64a537c419"></script>
+		<!-- end minjs template tags -->
+	<?php endif; ?>
+
+	<?php echo view('partial/header_js') ?>
+	<?php echo view('partial/lang_lines') ?>
+
+	<style type="text/css">
+		html {
+			overflow: auto;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="wrapper">
+		<div class="topbar">
+			<div class="container">
+				<div class="navbar-left">
+					<div id="liveclock"><?php echo date(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat) ?></div>
+				</div>
+
+				<div class="navbar-right" style="margin:0">
+					<?php echo anchor(esc("home/change_password/$user_info->person_id", 'url'), esc("$user_info->first_name $user_info->last_name", 'attr'), ['class' => 'modal-dlg', 'data-btn-submit' => lang('Common.submit'), 'title' => lang('Employees.change_password')]) ?>
+					<?php echo '  |  ' . ($this->request->getGet('debug') == 'true' ? $this->session->get('session_sha1') . '  |  ' : '') ?>
+					<?php echo anchor('home/logout', lang('Login.logout')) ?>
+				</div>
+
+				<div class="navbar-center" style="text-align:center">
+					<strong><?php echo esc(config('OSPOS')->company) ?></strong>
+				</div>
+			</div>
+		</div>
+
+		<div class="navbar navbar-default" role="navigation">
+			<div class="container">
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+
+					<a class="navbar-brand hidden-sm" href="<?php echo site_url() ?>">OSPOS</a>
+				</div>
+
+				<div class="navbar-collapse collapse">
+					<ul class="nav navbar-nav navbar-right">
+						<?php foreach($allowed_modules as $module): ?>
+							<li class="<?php echo $module->module_id == $this->uri->segment(1) ? 'active' : '' ?>">
+								<a href="<?php echo esc(site_url($module->module_id), 'url') ?>" title="<?php echo lang("Module.$module->module_id") ?>" class="menu-icon">
+
+									<img src="<?php echo esc(base_url() . "images/menubar/$module->module_id.png", 'url') ?>" style="border: none;" alt="Module Icon"/><br/>
+									<?php echo lang('Module.' . $module->module_id) ?>
+								</a>
+							</li>
+						<?php endforeach; ?>
+					</ul>
+				</div>
+			</div>
+		</div>
+
+		<div class="container">
+			<div class="row">
diff --git a/app/Views/partial/header_js.php b/app/Views/partial/header_js.php
index ab9ba547a..8af0a4a4d 100644
--- a/app/Views/partial/header_js.php
+++ b/app/Views/partial/header_js.php
@@ -4,30 +4,30 @@
 		setInterval('update_clock();', 1000);
 	}
 
-	// start the clock immediatly
+	// start the clock immediately
 	clock_tick();
 
 	var update_clock = function update_clock() {
-		document.getElementById('liveclock').innerHTML = moment().format("<?php echo dateformat_momentjs($this->config->item('dateformat').' '.$this->config->item('timeformat'))?>");
+		document.getElementById('liveclock').innerHTML = moment().format("<?php echo dateformat_momentjs(config('OSPOS')->dateformat . ' ' . config('OSPOS')->timeformat) ?>");
 	}
 
 	$.notifyDefaults({ placement: {
-		align: "<?php echo $this->config->item('notify_horizontal_position'); ?>",
-		from: "<?php echo $this->config->item('notify_vertical_position'); ?>"
+		align: "<?php echo esc(config('OSPOS')->notify_horizontal_position, 'js') ?>",
+		from: "<?php echo esc(config('OSPOS')->notify_vertical_position, 'js') ?>"
 	}});
 
-	var cookie_name = "<?php echo $this->config->item('cookie_prefix').$this->config->item('csrf_cookie_name'); ?>";
+	var cookie_name = "<?php echo esc(config('OSPOS')->cookie_prefix, 'js') . esc(config('OSPOS')->csrf_cookie_name, 'js') ?>";
 
 	var csrf_token = function() {
 		return Cookies.get(cookie_name);
 	};
 
 	var csrf_form_base = function() {
-		return { <?php echo $this->security->get_csrf_token_name(); ?> : function () { return csrf_token();  } };
+		return { <?php echo esc($this->security->get_csrf_token_name(), 'js') ?> : function () { return csrf_token() } }
 	};
 
 	var setup_csrf_token = function() {
-		$('input[name="<?php echo $this->security->get_csrf_token_name(); ?>"]').val(csrf_token());
+		$('input[name="<?php echo esc($this->security->get_csrf_token_name(), 'js') ?>"]').val(csrf_token());
 	};
 
 	var ajax = $.ajax;
@@ -47,23 +47,8 @@
 
 		return ajax.apply(this, arguments);
 	};
-    
+
 	$(document).ajaxComplete(setup_csrf_token);
-	$(document).ready(function(){
-		$("#logout").click(function(event) {
-			event.preventDefault();
-			$.ajax({
-				url: "<?php echo site_url('home/logout'); ?>", 
-				data: { 
-					"<?php echo $this->security->get_csrf_token_name(); ?>": csrf_token()
-				},
-				success: function() {
-					window.location.href = '<?php echo site_url(); ?>';
-				},
-				method: "POST"
-			});
-		});
-	});
 
 	var submit = $.fn.submit;
 
diff --git a/app/Views/partial/lang_lines.php b/app/Views/partial/lang_lines.php
index 0ddfe380b..a639b902b 100644
--- a/app/Views/partial/lang_lines.php
+++ b/app/Views/partial/lang_lines.php
@@ -2,8 +2,8 @@
 (function(lang, $) {
 
     var lines = {
-        'common_submit' : "<?php echo $this->lang->line('common_submit') ?>",
-        'common_close' : "<?php echo $this->lang->line('common_close') ?>"
+        'common_submit' : "<?php echo lang('Common.submit') ?>",
+        'common_close' : "<?php echo lang('Common.close') ?>"
     };
 
     $.extend(lang, {
diff --git a/app/Views/partial/print_receipt.php b/app/Views/partial/print_receipt.php
index 91c664cb4..db8129621 100644
--- a/app/Views/partial/print_receipt.php
+++ b/app/Views/partial/print_receipt.php
@@ -1,3 +1,9 @@
+<?php
+/**
+ * @var string $selected_printer
+ * @var bool $print_after_sale
+ */
+?>
 <script type="text/javascript">
 function printdoc()
 {
@@ -5,12 +11,12 @@ function printdoc()
 	if (window.jsPrintSetup)
 	{
 		// set top margins in millimeters
-		jsPrintSetup.setOption('marginTop', '<?php echo $this->config->item('print_top_margin'); ?>');
-		jsPrintSetup.setOption('marginLeft', '<?php echo $this->config->item('print_left_margin'); ?>');
-		jsPrintSetup.setOption('marginBottom', '<?php echo $this->config->item('print_bottom_margin'); ?>');
-		jsPrintSetup.setOption('marginRight', '<?php echo $this->config->item('print_right_margin'); ?>');
+		jsPrintSetup.setOption('marginTop', '<?php echo config('OSPOS')->print_top_margin ?>');
+		jsPrintSetup.setOption('marginLeft', '<?php echo config('OSPOS')->print_left_margin ?>');
+		jsPrintSetup.setOption('marginBottom', '<?php echo config('OSPOS')->print_bottom_margin ?>');
+		jsPrintSetup.setOption('marginRight', '<?php echo config('OSPOS')->print_right_margin ?>');
 
-		<?php if (!$this->config->item('print_header'))
+		<?php if (!config('OSPOS')->print_header)
 		{
 		?>
 			// set page header
@@ -19,7 +25,7 @@ function printdoc()
 			jsPrintSetup.setOption('headerStrRight', '');
 		<?php
 		}
-		if (!$this->config->item('print_footer'))
+		if (!config('OSPOS')->print_footer)
 		{
 		?>
 			// set empty page footer
@@ -33,7 +39,7 @@ function printdoc()
 		var printers = jsPrintSetup.getPrintersList().split(',');
 		// get right printer here..
 		for(var index in printers) {
-			var default_ticket_printer = window.localStorage && localStorage['<?php echo $selected_printer; ?>'];
+			var default_ticket_printer = window.localStorage && localStorage['<?php echo esc($selected_printer, 'js') ?>'];
 			var selected_printer = printers[index];
 			if (selected_printer == default_ticket_printer) {
 				// select epson label printer
@@ -41,7 +47,7 @@ function printdoc()
 				// clears user preferences always silent print value
 				// to enable using 'printSilent' option
 				jsPrintSetup.clearSilentPrint();
-				<?php if (!$this->config->item('print_silently'))
+				<?php if (!config('OSPOS')->print_silently)
 				{
 				?>
 					// Suppress print dialog (for this context only)
@@ -73,8 +79,8 @@ if($print_after_sale)
 
 		// after a delay, return to sales view
 		setTimeout(function () {
-				window.location.href = "<?php echo site_url('sales'); ?>";
-			}, <?php echo $this->config->item('print_delay_autoreturn') * 1000; ?>);
+				window.location.href = "<?php echo site_url('sales') ?>";
+			}, <?php echo config('OSPOS')->print_delay_autoreturn * 1000 ?>);
 	});
 
 <?php
diff --git a/app/Views/partial/stock_locations.php b/app/Views/partial/stock_locations.php
index 472660a89..b879e7741 100644
--- a/app/Views/partial/stock_locations.php
+++ b/app/Views/partial/stock_locations.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @var array $stock_locations
+ */
+?>
+<?php
 $i = 0;
 
 foreach($stock_locations as $location => $location_data)
@@ -8,14 +13,14 @@ foreach($stock_locations as $location => $location_data)
 	++$i;
 ?>
 	<div class="form-group form-group-sm" style="<?php echo $location_data['deleted'] ? 'display:none;' : 'display:block;' ?>">
-		<?php echo form_label($this->lang->line('config_stock_location') . ' ' . $i, 'stock_location_' . $i, array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Config.stock_location') . " $i", "stock_location_$i", ['class' => 'required control-label col-xs-2']) ?>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-					'name'=>"stock_location[$location_id]",
-					'id'=>"stock_location[$location_id]",
-					'class'=>'stock_location valid_chars form-control input-sm required',
-					'value'=>$location_name
-				);
+			<?php $form_data = [
+					'name' => "stock_location[$location_id]",
+					'id' => "stock_location[$location_id]",
+					'class' => 'stock_location valid_chars form-control input-sm required',
+					'value' => esc($location_name, 'attr')
+				];
 				$location_data['deleted'] && $form_data['disabled'] = 'disabled';
 				echo form_input($form_data);
 			?>
diff --git a/app/Views/partial/tax_categories.php b/app/Views/partial/tax_categories.php
index a1ee13352..4c3a0339a 100644
--- a/app/Views/partial/tax_categories.php
+++ b/app/Views/partial/tax_categories.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @var array $tax_categories
+ */
+?>
+<?php
 $i = 0;
 
 foreach($tax_categories as $key => $category)
@@ -9,32 +14,32 @@ foreach($tax_categories as $key => $category)
 	++$i;
 	?>
 	<div class="form-group form-group-sm" style="display:block;">
-		<?php echo form_label($this->lang->line('taxes_tax_category') . ' ' . $i, 'tax_category_' . $i, array('class' => 'control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Taxes.tax_category') . " $i", "tax_category_$i", ['class' => 'control-label col-xs-2']) ?>
 		<div class='col-xs-3'>
-			<?php $form_data = array(
+			<?php $form_data = [
 				'name' => 'tax_category[]',
-				'id' => 'tax_category_' . $i,
+				'id' => "tax_category_$i",
 				'class' => 'valid_chars form-control input-sm',
-				'placeholder' => $this->lang->line('taxes_tax_category_name'),
-				'value' => $tax_category
-			);
+				'placeholder' => lang('Taxes.tax_category_name'),
+				'value' => esc($tax_category, 'attr')
+			];
 			echo form_input($form_data);
 			?>
 		</div>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
+			<?php $form_data = [
 				'name' => 'tax_group_sequence[]',
 				'class' => 'valid_chars form-control input-sm',
-				'placeholder' => $this->lang->line('taxes_sequence'),
-				'value' => $tax_group_sequence
-			);
+				'placeholder' => lang('Taxes.sequence'),
+				'value' => esc($tax_group_sequence, 'attr')
+			];
 			echo form_input($form_data);
 			?>
 		</div>
 		<span class="add_tax_category glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
 		<span>&nbsp;&nbsp;</span>
 		<span class="remove_tax_category glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
-		<?php echo form_hidden('tax_category_id[]', $tax_category_id); ?>
+		<?php echo form_hidden('tax_category_id[]', $tax_category_id) ?>
 	</div>
 <?php
 }
diff --git a/app/Views/partial/tax_codes.php b/app/Views/partial/tax_codes.php
index fa37117a5..a7203a35b 100644
--- a/app/Views/partial/tax_codes.php
+++ b/app/Views/partial/tax_codes.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @var array $tax_codes
+ */
+?>
+<?php
 $i = 0;
 
 foreach($tax_codes as $tax_code => $tax_code_data)
@@ -11,53 +16,53 @@ foreach($tax_codes as $tax_code => $tax_code_data)
 	++$i;
 ?>
 	<div class="form-group form-group-sm" style="<?php echo $tax_code_data['deleted'] ? 'display:none;' : 'display:block;' ?>">
-		<?php echo form_label($this->lang->line('taxes_tax_code') . ' ' . $i, 'tax_code_' . $i, array('class'=>'control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Taxes.tax_code') . " $i", "tax_code_$i", ['class' => 'control-label col-xs-2']) ?>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-					'name'=>'tax_code[]',
-					'id'=>'tax_code_' . $i,
-					'class'=>'valid_chars text-uppercase form-control input-sm',
-					'placeholder'=>$this->lang->line('taxes_code'),
-					'value'=>$tax_code
-				);
-				echo form_input($form_data);
+			<?php $form_data = [
+					'name' => 'tax_code[]',
+					'id' => "tax_code_$i",
+					'class' => 'valid_chars text-uppercase form-control input-sm',
+					'placeholder' => lang('Taxes.code'),
+					'value' => esc($tax_code, 'attr')
+				];
+				echo form_input($form_data)
 			?>
 		</div>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-				'name'=>'tax_code_name[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_name'),
-				'value'=>$tax_code_name
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'tax_code_name[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder'=>lang('Taxes.name'),
+				'value' => esc($tax_code_name, 'attr')
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-				'name'=>'city[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_city'),
-				'value'=>$city
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'city[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder'=>lang('Taxes.city'),
+				'value' => esc($city, 'attr')
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-				'name'=>'state[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_state'),
-				'value'=>$state
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'state[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder'=>lang('Taxes.state'),
+				'value' => esc($state, 'attr')
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 
 		<span class="add_tax_code glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
 		<span>&nbsp;&nbsp;</span>
 		<span class="remove_tax_code glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
-		<?php echo form_hidden('tax_code_id[]', $tax_code_id); ?>
+		<?php echo form_hidden('tax_code_id[]', $tax_code_id) ?>
 	</div>
 <?php
 }
diff --git a/app/Views/partial/tax_jurisdictions.php b/app/Views/partial/tax_jurisdictions.php
index 92eb35b92..ba4ce3855 100644
--- a/app/Views/partial/tax_jurisdictions.php
+++ b/app/Views/partial/tax_jurisdictions.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * @var array $tax_jurisdictions
+ * @var array $tax_types
+ */
+?>
+<?php
 $i = 0;
 
 foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction)
@@ -13,70 +19,70 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction)
 	++$i;
 ?>
 	<div class="form-group form-group-sm" style="display:block;" >
-		<?php echo form_label($this->lang->line('taxes_tax_jurisdiction') . ' ' . $i, 'jurisdiction_name_' . $i, array('class'=>'control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Taxes.tax_jurisdiction') . " $i", "jurisdiction_name_$i", ['class' => 'control-label col-xs-2']) ?>
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-				'name'=>'jurisdiction_name[]',
-				'id'=>'jurisdiction_name_' . $i,
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_jurisdiction_name'),
-				'value'=>$jurisdiction_name
-				);
+			<?php $form_data = [
+				'name' => 'jurisdiction_name[]',
+				'id' => "jurisdiction_name_$i",
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder' => lang('Taxes.jurisdiction_name'),
+				'value' => esc($jurisdiction_name, 'attr')
+				];
 				echo form_input($form_data);
 			?>
 		</div>
 
 		<div class='col-xs-1'>
-			<?php $form_data = array(
-				'name'=>'tax_group[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_tax_group'),
-				'value'=>$tax_group
-			);
+			<?php $form_data = [
+				'name' => 'tax_group[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder' => lang('Taxes.tax_group'),
+				'value' => esc($tax_group, 'attr')
+			];
 			echo form_input($form_data);
 			?>
 		</div>
 
 		<div class='col-xs-2'>
-			<?php echo form_dropdown('tax_type[]' . $i, $tax_types, $tax_type, array('class'=>'form-control'));	?>
+			<?php echo form_dropdown('tax_type[]' . $i, $tax_types, $tax_type, ['class' => 'form-control'])	?>
 		</div>
 
 		<div class='col-xs-2'>
-			<?php $form_data = array(
-				'name'=>'reporting_authority[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_reporting_authority'),
-				'value'=>$reporting_authority
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'reporting_authority[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder' => lang('Taxes.reporting_authority'),
+				'value' => esc($reporting_authority, 'attr')
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 
 		<div class='col-xs-1'>
-			<?php $form_data = array(
-				'name'=>'tax_group_sequence[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder' => $this->lang->line('taxes_sequence'),
-				'value'=>$tax_group_sequence
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'tax_group_sequence[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder' => lang('Taxes.sequence'),
+				'value' => $tax_group_sequence
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 
 		<div class='col-xs-1'>
-			<?php $form_data = array(
-				'name'=>'cascade_sequence[]',
-				'class'=>'valid_chars form-control input-sm',
-				'placeholder'=>$this->lang->line('taxes_cascade_sequence'),
-				'value'=>$cascade_sequence
-			);
-			echo form_input($form_data);
+			<?php $form_data = [
+				'name' => 'cascade_sequence[]',
+				'class' => 'valid_chars form-control input-sm',
+				'placeholder' => lang('Taxes.cascade_sequence'),
+				'value' => $cascade_sequence
+			];
+			echo form_input($form_data)
 			?>
 		</div>
 		<span class="add_tax_jurisdiction glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
 		<span>&nbsp;&nbsp;</span>
 		<span class="remove_tax_jurisdiction glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
-		<?php echo form_hidden('jurisdiction_id[]', $jurisdiction_id); ?>
+		<?php echo form_hidden('jurisdiction_id[]', $jurisdiction_id) ?>
 	</div>
 <?php
 }
diff --git a/app/Views/people/form_basic_info.php b/app/Views/people/form_basic_info.php
index 70ec2a0a0..ad5b486af 100644
--- a/app/Views/people/form_basic_info.php
+++ b/app/Views/people/form_basic_info.php
@@ -1,163 +1,168 @@
-<div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_first_name'), 'first_name', array('class'=>'required control-label col-xs-3')); ?>
+<?php
+/**
+ * @var object $person_info
+ */
+?>
+<div class="form-group form-group-sm">
+	<?php echo form_label(lang('Common.first_name'), 'first_name', ['class' => 'required control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'first_name',
-				'id'=>'first_name',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->first_name)
-				);?>
+		<?php echo form_input ([
+			'name' => 'first_name',
+			'id' => 'first_name',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->first_name, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_last_name'), 'last_name', array('class'=>'required control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.last_name'), 'last_name', ['class' => 'required control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'last_name',
-				'id'=>'last_name',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->last_name)
-				);?>
+		<?php echo form_input ([
+			'name' => 'last_name',
+			'id' => 'last_name',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->last_name, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_gender'), 'gender', !empty($basic_version) ? array('class'=>'required control-label col-xs-3') : array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.gender'), 'gender', !empty($basic_version) ? ['class' => 'required control-label col-xs-3'] : ['class' => 'control-label col-xs-3']) ?>
 	<div class="col-xs-4">
 		<label class="radio-inline">
-			<?php echo form_radio(array(
-					'name'=>'gender',
-					'type'=>'radio',
-					'id'=>'gender',
-					'value'=>1,
-					'checked'=>$person_info->gender === '1')
-					); ?> <?php echo $this->lang->line('common_gender_male'); ?>
+			<?php echo form_radio ([
+				'name' => 'gender',
+				'type' => 'radio',
+				'id' => 'gender',
+				'value'=>1,
+				'checked' => $person_info->gender === '1'
+			]) ?> <?php echo lang('Common.gender_male') ?>
 		</label>
 		<label class="radio-inline">
-			<?php echo form_radio(array(
-					'name'=>'gender',
-					'type'=>'radio',
-					'id'=>'gender',
-					'value'=>0,
-					'checked'=>$person_info->gender === '0')
-					); ?> <?php echo $this->lang->line('common_gender_female'); ?>
+			<?php echo form_radio ([
+				'name' => 'gender',
+				'type' => 'radio',
+				'id' => 'gender',
+				'value' => 0,
+				'checked' => $person_info->gender === '0'
+			]) ?> <?php echo lang('Common.gender_female') ?>
 		</label>
 
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_email'), 'email', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.email'), 'email', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
 		<div class="input-group">
 			<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-envelope"></span></span>
-			<?php echo form_input(array(
-					'name'=>'email',
-					'id'=>'email',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->email)
-					);?>
+			<?php echo form_input ([
+				'name' => 'email',
+				'id' => 'email',
+				'class' => 'form-control input-sm',
+				'value' => esc($person_info->email, 'attr')
+			]) ?>
 		</div>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_phone_number'), 'phone_number', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.phone_number'), 'phone_number', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
 		<div class="input-group">
 			<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
-			<?php echo form_input(array(
-					'name'=>'phone_number',
-					'id'=>'phone_number',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->phone_number)
-					);?>
+			<?php echo form_input ([
+				'name' => 'phone_number',
+				'id' => 'phone_number',
+				'class' => 'form-control input-sm',
+				'value' => esc($person_info->phone_number, 'attr')
+			]) ?>
 		</div>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_address_1'), 'address_1', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.address_1'), 'address_1', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'address_1',
-				'id'=>'address_1',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->address_1)
-				);?>
+		<?php echo form_input ([
+			'name' => 'address_1',
+			'id' => 'address_1',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->address_1, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_address_2'), 'address_2', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.address_2'), 'address_2', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'address_2',
-				'id'=>'address_2',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->address_2)
-				);?>
+		<?php echo form_input ([
+			'name' => 'address_2',
+			'id' => 'address_2',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->address_2, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_city'), 'city', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.city'), 'city', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'city',
-				'id'=>'city',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->city)
-				);?>
+		<?php echo form_input ([
+			'name' => 'city',
+			'id' => 'city',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->city, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_state'), 'state', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.state'), 'state', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'state',
-				'id'=>'state',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->state)
-				);?>
+		<?php echo form_input ([
+			'name' => 'state',
+			'id' => 'state',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->state, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_zip'), 'zip', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.zip'), 'zip', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'zip',
-				'id'=>'postcode',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->zip)
-				);?>
+		<?php echo form_input ([
+			'name' => 'zip',
+			'id' => 'postcode',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->zip, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_country'), 'country', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.country'), 'country', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_input(array(
-				'name'=>'country',
-				'id'=>'country',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->country)
-				);?>
+		<?php echo form_input ([
+			'name' => 'country',
+			'id' => 'country',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->country, 'attr')
+		]) ?>
 	</div>
 </div>
 
 <div class="form-group form-group-sm">	
-	<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label col-xs-3')); ?>
+	<?php echo form_label(lang('Common.comments'), 'comments', ['class' => 'control-label col-xs-3']) ?>
 	<div class='col-xs-8'>
-		<?php echo form_textarea(array(
-				'name'=>'comments',
-				'id'=>'comments',
-				'class'=>'form-control input-sm',
-				'value'=>$person_info->comments)
-				);?>
+		<?php echo form_textarea ([
+			'name' => 'comments',
+			'id' => 'comments',
+			'class' => 'form-control input-sm',
+			'value' => esc($person_info->comments, 'attr')
+		]) ?>
 	</div>
 </div>
 
@@ -190,8 +195,8 @@ $(document).ready(function()
 				dependencies :  ["state", "country"]
 			}
 		},
-		language : '<?php echo current_language_code();?>',
-		country_codes: '<?php echo $this->config->item('country_codes'); ?>'
+		language : '<?php echo current_language_code() ?>',
+		country_codes: '<?php echo esc(config('OSPOS')->country_codes, 'js') ?>'
 	});
 });
 </script>
\ No newline at end of file
diff --git a/app/Views/people/manage.php b/app/Views/people/manage.php
index 2deaf379b..94bb4a25f 100644
--- a/app/Views/people/manage.php
+++ b/app/Views/people/manage.php
@@ -1,14 +1,20 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($table_headers, 'js') ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'people.person_id',
 		enableActions: function()
 		{
@@ -30,29 +36,29 @@ $(document).ready(function()
 
 <div id="title_bar" class="btn-toolbar">
 	<?php
-	if ($controller_name == 'customers')
+	if ($controller_name == 'customers')	//TODO: === ?
 	{
 	?>
-		<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/csv_import"); ?>'
-				title='<?php echo $this->lang->line('customers_import_items_csv'); ?>'>
-			<span class="glyphicon glyphicon-import">&nbsp</span><?php echo $this->lang->line('common_import_csv'); ?>
+		<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/csv_import"), 'url') ?>'
+				title='<?php echo lang('Customers.import_items_csv') ?>'>
+			<span class="glyphicon glyphicon-import">&nbsp</span><?php echo lang('Common.import_csv') ?>
 		</button>
 	<?php
 	}
 	?>
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name . '_new'); ?>'>
-		<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang("$controller_name.new") ?>'>
+		<span class="glyphicon glyphicon-user">&nbsp</span><?php echo lang("$controller_name.new") ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left btn-toolbar">
 		<button id="delete" class="btn btn-default btn-sm">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 		<button id="email" class="btn btn-default btn-sm">
-			<span class="glyphicon glyphicon-envelope">&nbsp</span><?php echo $this->lang->line("common_email");?>
+			<span class="glyphicon glyphicon-envelope">&nbsp</span><?php echo lang('Common.email') ?>
 		</button>
 	</div>
 </div>
@@ -61,4 +67,4 @@ $(document).ready(function()
 	<table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/receivings/form.php b/app/Views/receivings/form.php
old mode 100755
new mode 100644
index 37b68dc33..19e4b02cb
--- a/app/Views/receivings/form.php
+++ b/app/Views/receivings/form.php
@@ -1,62 +1,71 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var array $receiving_info
+ * @var string $selected_supplier_name
+ * @var int $selected_supplier_id
+ * @var array $employees
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'receivings_edit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], ['id' => 'receivings_edit_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="receiving_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_receipt_number'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
-			<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], 'RECV ' . $receiving_info['receiving_id'], array('target'=>'_blank', 'class'=>'control-label col-xs-8', "style"=>"text-align:left"));?>
+			<?php echo form_label(lang('Receivings.receipt_number'), 'supplier', ['class' => 'control-label col-xs-3']) ?>
+			<?php echo anchor('receivings/receipt/' . $receiving_info['receiving_id'], 'RECV ' . $receiving_info['receiving_id'], ['target' => '_blank', 'class' => 'control-label col-xs-8', "style" => "text-align:left"]) ?>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_date'), 'date', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Receivings.date'), 'date', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'	=> 'date',
-						'value'	=> to_datetime(strtotime($receiving_info['receiving_time'])),
-						'id'	=> 'datetime',
-						'class'	=> 'datetime form-control input-sm',
-        					'readonly' => 'readonly'));
-				?>
+				<?php echo form_input ([
+					'name'	=> 'date',
+					'value'	=> to_datetime(strtotime($receiving_info['receiving_time'])),
+					'id'	=> 'datetime',
+					'class'	=> 'datetime form-control input-sm',
+					'readonly' => 'readonly'
+				]) ?>
 			</div>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Receivings.supplier'), 'supplier', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array('name' => 'supplier_name', 'value' => $selected_supplier_name, 'id' => 'supplier_name', 'class'=>'form-control input-sm'));?>
-				<?php echo form_hidden('supplier_id', $selected_supplier_id);?>
+				<?php echo form_input (['name' => 'supplier_name', 'value' => esc($selected_supplier_name, 'attr'), 'id' => 'supplier_name', 'class' => 'form-control input-sm']) ?>
+				<?php echo form_hidden('supplier_id', $selected_supplier_id) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_reference'), 'reference', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Receivings.reference'), 'reference', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array('name' => 'reference', 'value' => $receiving_info['reference'], 'id' => 'reference', 'class'=>'form-control input-sm'));?>
+				<?php echo form_input (['name' => 'reference', 'value' => esc($receiving_info['reference'], 'attr'), 'id' => 'reference', 'class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Receivings.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"');?>
+				<?php echo form_dropdown('employee_id', esc($employees, 'attr'), $receiving_info['employee_id'], 'id="employee_id" class="form-control"') ?>
 			</div>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('receivings_comments'), 'comment', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Receivings.comments'), 'comment', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
+				<?php echo form_textarea (['name' => 'comment','value' => esc($receiving_info['comment'], 'attr'), 'id' => 'comment', 'class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 		
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/datepicker_locale'); ?>
+	<?php echo view('partial/datepicker_locale') ?>
 
     $('#datetime').datetimepicker(pickerconfig);
 
@@ -67,7 +76,7 @@ $(document).ready(function()
 	};
 
 	$('#supplier_name').autocomplete({
-		source: "<?php echo site_url('suppliers/suggest'); ?>",
+		source: "<?php echo site_url('suppliers/suggest') ?>",
 		minChars: 0,
 		delay: 15, 
 		cacheLength: 1,
@@ -79,7 +88,7 @@ $(document).ready(function()
 	$('button#delete').click(function()
 	{
 		dialog_support.hide();
-		table_support.do_delete("<?php echo site_url($controller_name); ?>", <?php echo $receiving_info['receiving_id']; ?>);
+		table_support.do_delete("<?php echo esc(site_url($controller_name), 'url') ?>", <?php echo $receiving_info['receiving_id'] ?>);
 	});
 
 	$('#receivings_edit_form').validate($.extend({
@@ -88,7 +97,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
diff --git a/app/Views/receivings/receipt.php b/app/Views/receivings/receipt.php
index f4debf276..b1009cffb 100644
--- a/app/Views/receivings/receipt.php
+++ b/app/Views/receivings/receipt.php
@@ -1,45 +1,59 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var bool $print_after_sale
+ * @var string $transaction_time
+ * @var int $receiving_id
+ * @var string $employee
+ * @var array $cart
+ * @var bool $show_stock_locations
+ * @var float $total
+ * @var string $mode
+ * @var string $payment_type
+ * @var float $amount_tendered
+ * @var float $amount_change
+ * @var string $barcode
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 	if (isset($error_message))
 	{
-		echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+		echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error_message) . '</div>';
 		exit;
 	}
 
-	$this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 'selected_printer'=>'receipt_printer')); 
-
-?>
+	echo view('partial/print_receipt', ['print_after_sale', $print_after_sale, 'selected_printer' => 'receipt_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
-	<?php echo anchor("receivings", '<span class="glyphicon glyphicon-save">&nbsp</span>' . $this->lang->line('receivings_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
+	<?php echo anchor("receivings", '<span class="glyphicon glyphicon-save">&nbsp</span>' . lang('Receivings.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
 </div>
 
 <div id="receipt_wrapper">
 	<div id="receipt_header">
 		<?php
-		if ($this->config->item('company_logo') != '') 
+		if (config('OSPOS')->company_logo != '')
 		{ 
 		?>
-			<div id="company_name"><img id="image" src="<?php echo base_url('uploads/' . $this->config->item('company_logo')); ?>" alt="company_logo" /></div>
+			<div id="company_name"><img id="image" src="<?php echo esc(base_url('uploads/' . config('OSPOS')->company_logo), 'url') ?>" alt="company_logo" /></div>
 		<?php
 		}
 		?>
 
 		<?php
-		if ($this->config->item('receipt_show_company_name')) 
+		if (config('OSPOS')->receipt_show_company_name)
 		{ 
 		?>
-			<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+			<div id="company_name"><?php echo esc(config('OSPOS')->company) ?></div>
 		<?php
 		}
 		?>
 
-		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
-		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
-		<div id="sale_receipt"><?php echo $this->lang->line('receivings_receipt'); ?></div>
-		<div id="sale_time"><?php echo $transaction_time ?></div>
+		<div id="company_address"><?php echo esc(nl2br(config('OSPOS')->address)) ?></div>
+		<div id="company_phone"><?php echo esc(config('OSPOS')->phone) ?></div>
+		<div id="sale_receipt"><?php echo lang('Receivings.receipt') ?></div>
+		<div id="sale_time"><?php echo esc($transaction_time) ?></div>
 	</div>
 
 	<div id="receipt_general_info">
@@ -47,43 +61,42 @@
 		if(isset($supplier))
 		{
 		?>
-			<div id="customer"><?php echo $this->lang->line('suppliers_supplier').": ".$supplier; ?></div>
+			<div id="customer"><?php echo lang('Suppliers.supplier') . esc(": $supplier") ?></div>
 		<?php
 		}
 		?>
-		<div id="sale_id"><?php echo $this->lang->line('receivings_id').": ".$receiving_id; ?></div>
+		<div id="sale_id"><?php echo lang('Receivings.id') . ": $receiving_id" ?></div>
 		<?php 
 		if (!empty($reference))
 		{
 		?>
-			<div id="reference"><?php echo $this->lang->line('receivings_reference').": ".$reference; ?></div>	
+			<div id="reference"><?php echo lang('Receivings.reference') . esc(": $reference") ?></div>
 		<?php 
 		}
 		?>
-		<div id="employee"><?php echo $this->lang->line('employees_employee').": ".$employee; ?></div>
+		<div id="employee"><?php echo lang('Employees.employee') . esc(": $employee") ?></div>
 	</div>
 
 	<table id="receipt_items">
 		<tr>
-			<th style="width:40%;"><?php echo $this->lang->line('items_item'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('common_price'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th style="width:15%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
+			<th style="width:40%;"><?php echo lang('Items.item') ?></th>
+			<th style="width:20%;"><?php echo lang('Common.price') ?></th>
+			<th style="width:20%;"><?php echo lang('Sales.quantity') ?></th>
+			<th style="width:15%;text-align:right;"><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach(array_reverse($cart, TRUE) as $line=>$item)
+		foreach(array_reverse($cart, TRUE) as $line => $item)
 		{
 		?>
 			<tr>
-				<td><?php echo $item['name'] . ' ' . $item['attribute_values']; ?></td>
-				<td><?php echo to_currency($item['price']); ?></td>
-				<td><?php echo to_quantity_decimals($item['quantity']) . " " . ($show_stock_locations ? " [" . $item['stock_name'] . "]" : ""); 
-				?>&nbsp;&nbsp;&nbsp;x <?php echo $item['receiving_quantity'] != 0 ? to_quantity_decimals($item['receiving_quantity']) : 1; ?></td>
-				<td><div class="total-value"><?php echo to_currency($item['total']); ?></div></td>
+				<td><?php echo esc($item['name'] . ' ' . $item['attribute_values']) ?></td>
+				<td><?php echo to_currency($item['price']) ?></td>
+				<td><?php echo to_quantity_decimals($item['quantity']) . ' ' . ($show_stock_locations ? ' [' . esc($item['stock_name']) . ']' : '') ?>&nbsp;&nbsp;&nbsp;x <?php echo $item['receiving_quantity'] != 0 ? to_quantity_decimals($item['receiving_quantity']) : 1 ?></td>
+				<td><div class="total-value"><?php echo to_currency($item['total']) ?></div></td>
 			</tr>
 			<tr>
-				<td ><?php echo $item['serialnumber']; ?></td>
+				<td ><?php echo esc($item['serialnumber']) ?></td>
 			</tr>
 			<?php
 			if ($item['discount'] > 0 )
@@ -94,13 +107,13 @@
 					if($item['discount_type'] == FIXED)
 					{
 					?>
-						<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . " " . $this->lang->line("sales_discount") ?></td>
+						<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . ' ' . lang('Sales.discount') ?></td>
 					<?php
 					}
 					elseif($item['discount_type'] == PERCENT)
 					{
 					?>
-						<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . " " . $this->lang->line("sales_discount_included") ?></td>
+						<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . ' ' . lang('Sales.discount_included') ?></td>
 					<?php
 					}	
 					?>
@@ -112,29 +125,29 @@
 		}
 		?>	
 		<tr>
-			<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_total'); ?></td>
-			<td style='border-top:2px solid #000000;'><div class="total-value"><?php echo to_currency($total); ?></div></td>
+			<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.total') ?></td>
+			<td style='border-top:2px solid #000000;'><div class="total-value"><?php echo to_currency($total) ?></div></td>
 		</tr>
 		<?php 
-		if($mode!='requisition')
+		if($mode != 'requisition')
 		{
 		?>
 			<tr>
-				<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_payment'); ?></td>
-				<td><div class="total-value"><?php echo $payment_type; ?></div></td>
+				<td colspan="3" style='text-align:right;'><?php echo lang('Sales.payment') ?></td>
+				<td><div class="total-value"><?php echo esc($payment_type) ?></div></td>
 			</tr>
 
 			<?php if(isset($amount_change))
 			{
 			?>
 				<tr>
-					<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
-					<td><div class="total-value"><?php echo to_currency($amount_tendered); ?></div></td>
+					<td colspan="3" style='text-align:right;'><?php echo lang('Sales.amount_tendered') ?></td>
+					<td><div class="total-value"><?php echo to_currency($amount_tendered) ?></div></td>
 				</tr>
 
 				<tr>
-					<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_change_due'); ?></td>
-					<td><div class="total-value"><?php echo $amount_change; ?></div></td>
+					<td colspan="3" style='text-align:right;'><?php echo lang('Sales.change_due') ?></td>
+					<td><div class="total-value"><?php echo $amount_change ?></div></td>
 				</tr>
 			<?php
 			}
@@ -145,12 +158,12 @@
 	</table>
 
 	<div id="sale_return_policy">
-		<?php echo nl2br($this->config->item('return_policy')); ?>
+		<?php echo esc(nl2br(config('OSPOS')->return_policy)) ?>
 	</div>
 
 	<div id='barcode'>
-		<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-		<?php echo $receiving_id; ?>
+		<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+		<?php echo $receiving_id ?>
 	</div>
 </div>
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php
index ce41f0fb7..0cb4218eb 100644
--- a/app/Views/receivings/receiving.php
+++ b/app/Views/receivings/receiving.php
@@ -1,19 +1,37 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var array $modes
+ * @var string $mode
+ * @var bool $show_stock_locations
+ * @var array $stock_locations
+ * @var int $stock_source
+ * @var string $stock_destination
+ * @var array $cart
+ * @var bool $items_module_allowed
+ * @var float $total
+ * @var string $comment
+ * @var bool $print_after_sale
+ * @var string $reference
+ * @var array $payment_options
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if (isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 
 if (!empty($warning))
 {
-	echo "<div class='alert alert-dismissible alert-warning'>".$warning."</div>";
+	echo esc("<div class='alert alert-dismissible alert-warning'>$warning</div>");
 }
 
 if (isset($success))
 {
-	echo "<div class='alert alert-dismissible alert-success'>".$success."</div>";
+	echo esc("<div class='alert alert-dismissible alert-success'>$success</div>");
 }
 ?>
 
@@ -21,14 +39,14 @@ if (isset($success))
 
 <!-- Top register controls -->
 
-	<?php echo form_open($controller_name."/change_mode", array('id'=>'mode_form', 'class'=>'form-horizontal panel panel-default')); ?>
+	<?php echo form_open(esc("$controller_name/change_mode", 'attr'), ['id' => 'mode_form', 'class' => 'form-horizontal panel panel-default']) ?>
 		<div class="panel-body form-group">
 			<ul>
 				<li class="pull-left first_li">
-					<label class="control-label"><?php echo $this->lang->line('receivings_mode'); ?></label>
+					<label class="control-label"><?php echo lang('Receivings.mode') ?></label>
 				</li>
 				<li class="pull-left">
-					<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+					<?php echo form_dropdown('mode', esc($modes, 'attr'), esc($mode, 'attr'), ['onchange'=>"$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 				</li>
 
 				<?php 
@@ -36,10 +54,10 @@ if (isset($success))
 				{
 				?>
 					<li class="pull-left">
-						<label class="control-label"><?php echo $this->lang->line('receivings_stock_source'); ?></label>
+						<label class="control-label"><?php echo lang('Receivings.stock_source') ?></label>
 					</li>
 					<li class="pull-left">
-						<?php echo form_dropdown('stock_source', $stock_locations, $stock_source, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+						<?php echo form_dropdown('stock_source', esc($stock_locations, 'attr'), $stock_source, ['onchange'=>"$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 					</li>
 					
 					<?php
@@ -47,10 +65,10 @@ if (isset($success))
 					{
 					?>
 						<li class="pull-left">
-							<label class="control-label"><?php echo $this->lang->line('receivings_stock_destination'); ?></label>
+							<label class="control-label"><?php echo lang('Receivings.stock_destination') ?></label>
 						</li>
 						<li class="pull-left">
-							<?php echo form_dropdown('stock_destination', $stock_locations, $stock_destination, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+							<?php echo form_dropdown('stock_destination', esc($stock_locations, 'attr'), esc($stock_destination, 'attr'), ['onchange'=>"$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 						</li>
 				<?php
 					}
@@ -58,59 +76,59 @@ if (isset($success))
 				?>
 			</ul>
 		</div>
-	<?php echo form_close(); ?>
+	<?php echo form_close() ?>
 
-	<?php echo form_open($controller_name."/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
+	<?php echo form_open($controller_name."/add", ['id' => 'add_item_form', 'class' => 'form-horizontal panel panel-default']) ?>
 		<div class="panel-body form-group">
 			<ul>
 				<li class="pull-left first_li">
-					<label for="item", class='control-label'>
+					<label for="item" class='control-label'>
 						<?php
 						if($mode=='receive' or $mode=='requisition')
 						{
 						?>
-							<?php echo $this->lang->line('receivings_find_or_scan_item'); ?>
+							<?php echo lang('Receivings.find_or_scan_item') ?>
 						<?php
 						}
 						else
 						{
 						?>
-							<?php echo $this->lang->line('receivings_find_or_scan_item_or_receipt'); ?>
+							<?php echo lang('Receivings.find_or_scan_item_or_receipt') ?>
 						<?php
 						}
 						?>			
 					</label>
 				</li>
 				<li class="pull-left">
-					<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'size'=>'50', 'tabindex'=>'1')); ?>
+					<?php echo form_input (['name' => 'item', 'id' => 'item', 'class' => 'form-control input-sm', 'size' => '50', 'tabindex' => '1']) ?>
 				</li>
 				<li class="pull-right">
 					<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg'
-						data-btn-submit='<?php echo $this->lang->line('common_submit') ?>'
-						data-btn-new='<?php echo $this->lang->line('common_new') ?>'
-						data-href='<?php echo site_url("items/view"); ?>'
-						title='<?php echo $this->lang->line('sales_new_item'); ?>'>
-						<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line('sales_new_item'); ?>
+						data-btn-submit='<?php echo lang('Common.submit') ?>'
+						data-btn-new='<?php echo lang('Common.new') ?>'
+						data-href='<?php echo site_url("items/view") ?>'
+						title='<?php echo lang('Sales.new_item') ?>'>
+						<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo lang('Sales.new_item') ?>
 					</button>
 				</li>
 			</ul>
 		</div>
-	<?php echo form_close(); ?>
+	<?php echo form_close() ?>
 	
 <!-- Receiving Items List -->
 
 	<table class="sales_table_100" id="register">
 		<thead>
 			<tr>
-				<th style="width:5%;"><?php echo $this->lang->line('common_delete'); ?></th>
-				<th style="width:15%;"><?php echo $this->lang->line('sales_item_number'); ?></th>
-				<th style="width:23%;"><?php echo $this->lang->line('receivings_item_name'); ?></th>
-				<th style="width:10%;"><?php echo $this->lang->line('receivings_cost'); ?></th>
-				<th style="width:8%;"><?php echo $this->lang->line('receivings_quantity'); ?></th>
-				<th style="width:10%;"><?php echo $this->lang->line('receivings_ship_pack'); ?></th>
-				<th style="width:14%;"><?php echo $this->lang->line('receivings_discount'); ?></th>
-				<th style="width:10%;"><?php echo $this->lang->line('receivings_total'); ?></th>
-				<th style="width:5%;"><?php echo $this->lang->line('receivings_update'); ?></th>
+				<th style="width:5%;"><?php echo lang('Common.delete') ?></th>
+				<th style="width:15%;"><?php echo lang('Sales.item_number') ?></th>
+				<th style="width:23%;"><?php echo lang('Receivings.item_name') ?></th>
+				<th style="width:10%;"><?php echo lang('Receivings.cost') ?></th>
+				<th style="width:8%;"><?php echo lang('Receivings.quantity') ?></th>
+				<th style="width:10%;"><?php echo lang('Receivings.ship_pack') ?></th>
+				<th style="width:14%;"><?php echo lang('Receivings.discount') ?></th>
+				<th style="width:10%;"><?php echo lang('Receivings.total') ?></th>
+				<th style="width:5%;"><?php echo lang('Receivings.update') ?></th>
 			</tr>
 		</thead>
 
@@ -121,55 +139,76 @@ if (isset($success))
 			?>
 				<tr>
 					<td colspan='9'>
-						<div class='alert alert-dismissible alert-info'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
+						<div class='alert alert-dismissible alert-info'><?php echo lang('Sales.no_items_in_cart') ?></div>
 					</td>
 				</tr>
 			<?php
 			}
 			else
 			{
-				foreach(array_reverse($cart, TRUE) as $line=>$item)
+				foreach(array_reverse($cart, TRUE) as $line => $item)
 				{
 			?>
-					<?php echo form_open($controller_name."/edit_item/$line", array('class'=>'form-horizontal', 'id'=>'cart_'.$line)); ?>
+					<?php echo form_open(esc("$controller_name/edit_item/$line", 'attr'), ['class' => 'form-horizontal', 'id' => "cart_$line"]) ?>
 						<tr>
-							<td><span data-item-id="<?php echo $line;?>" class="delete_item_button"><span class="glyphicon glyphicon-trash"></span></span></td>
-							<td><?php echo $item['item_number']; ?></td>
+							<td><?php echo anchor(esc("$controller_name/delete_item/$line", 'url'), '<span class="glyphicon glyphicon-trash"></span>') ?></td>
+							<td><?php echo esc($item['item_number']) ?></td>
 							<td style="align:center;">
-								<?php echo $item['name'] . ' '. implode(' ', array($item['attribute_values'], $item['attribute_dtvalues'])); ?><br /> <?php echo '[' . to_quantity_decimals($item['in_stock']) . ' in ' . $item['stock_name'] . ']'; ?>
-								<?php echo form_hidden('location', $item['item_location']); ?>
+								<?php echo esc($item['name'] . ' '. implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']])) ?><br /> <?php echo '[' . to_quantity_decimals($item['in_stock']) . ' in ' . $item['stock_name'] . ']' ?>
+								<?php echo form_hidden('location', $item['item_location']) ?>
 							</td>
 
 							<?php 
-							if ($items_module_allowed && $mode !='requisition')
+							if ($items_module_allowed && $mode != 'requisition')
 							{
 							?>
-								<td><?php echo form_input(array('name'=>'price', 'class'=>'form-control input-sm', 'value'=>to_currency_no_money($item['price']),'onClick'=>'this.select();'));?></td>
+								<td><?php echo form_input ([
+									'name' => 'price',
+									'class' => 'form-control input-sm',
+									'value' => to_currency_no_money($item['price']),
+									'onClick' => 'this.select();'
+								]) ?></td>
 							<?php
 							}
 							else
 							{
 							?>
 								<td>
-									<?php echo $item['price']; ?>
-									<?php echo form_hidden('price', to_currency_no_money($item['price'])); ?>
+									<?php echo $item['price'] ?>
+									<?php echo form_hidden('price', to_currency_no_money($item['price'])) ?>
 								</td>
 							<?php
 							}
 							?>
 							
-							<td><?php echo form_input(array('name'=>'quantity', 'class'=>'form-control input-sm', 'value'=>to_quantity_decimals($item['quantity']),'onClick'=>'this.select();')); ?></td>
-							<td><?php echo form_dropdown('receiving_quantity', $item['receiving_quantity_choices'], $item['receiving_quantity'], array('class'=>'form-control input-sm'));?></td>
+							<td><?php echo form_input (['name' => 'quantity', 'class' => 'form-control input-sm', 'value' => to_quantity_decimals($item['quantity']),'onClick' => 'this.select();']) ?></td>
+							<td><?php echo form_dropdown(
+									'receiving_quantity',
+									esc($item['receiving_quantity_choices'], 'attr'),
+									$item['receiving_quantity'],
+									['class' => 'form-control input-sm']
+								) ?></td>
 
 							<?php       
-							if ($items_module_allowed && $mode!='requisition')
+							if ($items_module_allowed && $mode != 'requisition')
 							{
 							?>
 								<td>
 								<div class="input-group">
-									<?php echo form_input(array('name'=>'discount', 'class'=>'form-control input-sm', 'value'=>$item['discount_type'] ? to_currency_no_money($item['discount']) : to_decimals($item['discount']), 'onClick'=>'this.select();')); ?>
+									<?php echo form_input (['name' => 'discount', 'class' => 'form-control input-sm', 'value' => $item['discount_type'] ? to_currency_no_money($item['discount']) : to_decimals($item['discount']), 'onClick' => 'this.select();']) ?>
 									<span class="input-group-btn">
-										<?php echo form_checkbox(array('id'=>'discount_toggle', 'name'=>'discount_toggle', 'value'=>1, 'data-toggle'=>"toggle",'data-size'=>'small', 'data-onstyle'=>'success', 'data-on'=>'<b>'.$this->config->item('currency_symbol').'</b>', 'data-off'=>'<b>%</b>', 'data-line'=>$line, 'checked'=>$item['discount_type'])); ?>
+										<?php echo form_checkbox ([
+											'id' => 'discount_toggle',
+											'name' => 'discount_toggle',
+											'value' => 1,
+											'data-toggle' => "toggle",
+											'data-size' => 'small',
+											'data-onstyle' => 'success',
+											'data-on' => '<b>' . esc(config('OSPOS')->currency_symbol, 'attr') .'</b>',
+											'data-off' => '<b>%</b>',
+											'data-line' => esc($line, 'attr'),
+											'checked' => $item['discount_type']
+										]) ?>
 									</span>
 								</div> 
 							</td>
@@ -178,40 +217,44 @@ if (isset($success))
 							else
 							{
 							?>
-								<td><?php echo $item['discount'];?></td>
-								<?php echo form_hidden('discount',$item['discount']); ?>
+								<td><?php echo $item['discount'] ?></td>
+								<?php echo form_hidden('discount', $item['discount']) ?>
 							<?php
 							}
 							?>
 							<td>
-							<?php echo to_currency(($item['discount_type'] == PERCENT) ? $item['price']*$item['quantity']*$item['receiving_quantity'] - $item['price'] * $item['quantity'] * $item['receiving_quantity'] * $item['discount'] / 100 : $item['price']*$item['quantity']*$item['receiving_quantity'] - $item['discount']); ?></td> 
-							<td><a href="javascript:$('#<?php echo 'cart_'.$line ?>').submit();" title=<?php echo $this->lang->line('receivings_update')?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
+							<?php echo to_currency(($item['discount_type'] == PERCENT) ? $item['price']*$item['quantity']*$item['receiving_quantity'] - $item['price'] * $item['quantity'] * $item['receiving_quantity'] * $item['discount'] / 100 : $item['price']*$item['quantity']*$item['receiving_quantity'] - $item['discount']) ?></td>
+							<td><a href="javascript:$('#<?php echo esc("cart_$line", 'js') ?>').submit();" title=<?php echo lang('Receivings.update') ?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
 						</tr>
 						<tr>
 							<?php 
-							if($item['allow_alt_description']==1)
+							if($item['allow_alt_description'] == 1)	//TODO: ===?
 							{
 							?>
-								<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv').':';?></td>
+								<td style="color: #2F4F4F;"><?php echo lang('Sales.description_abbrv').':' ?></td>
 							<?php 
 							} 
 							?>
 							<td colspan='2' style="text-align: left;">
 								<?php
-								if($item['allow_alt_description']==1)
+								if($item['allow_alt_description'] == 1)	//TODO: ===?
 								{
-									echo form_input(array('name'=>'description', 'class'=>'form-control input-sm', 'value'=>$item['description']));
+									echo form_input ([
+										'name' => 'description',
+										'class' => 'form-control input-sm',
+										'value' => esc($item['description'], 'attr')
+									]);
 								}
 								else
 								{
-									if ($item['description']!='')
+									if ($item['description'] != '')	//TODO: !==?
 									{
 										echo $item['description'];
-										echo form_hidden('description',$item['description']);
+										echo form_hidden('description', esc($item['description'], 'attr'));
 									}
 									else
 									{
-										echo "<i>".$this->lang->line('sales_no_description')."</i>";
+										echo '<i>'.lang('Sales.no_description').'</i>';
 										echo form_hidden('description','');
 									}
 								}
@@ -219,7 +262,7 @@ if (isset($success))
 							</td>
 							<td colspan='7'></td>
 						</tr>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 			<?php
 				}
 			}
@@ -238,16 +281,16 @@ if (isset($success))
 		?>
 			<table class="sales_table_100">
 				<tr>
-					<th style='width: 55%;'><?php echo $this->lang->line("receivings_supplier"); ?></th>
-					<th style="width: 45%; text-align: right;"><?php echo $supplier; ?></th>
+					<th style='width: 55%;'><?php echo lang('Receivings.supplier') ?></th>
+					<th style="width: 45%; text-align: right;"><?php echo esc($supplier) ?></th>
 				</tr>
 				<?php
 				if(!empty($supplier_email))
 				{
 				?>
 					<tr>
-						<th style='width: 55%;'><?php echo $this->lang->line("receivings_supplier_email"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo $supplier_email; ?></th>
+						<th style='width: 55%;'><?php echo lang('Receivings.supplier_email') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo esc($supplier_email) ?></th>
 					</tr>
 				<?php
 				}
@@ -257,8 +300,8 @@ if (isset($success))
 				{
 				?>
 					<tr>
-						<th style='width: 55%;'><?php echo $this->lang->line("receivings_supplier_address"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo $supplier_address; ?></th>
+						<th style='width: 55%;'><?php echo lang('Receivings.supplier_address') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo esc($supplier_address) ?></th>
 					</tr>
 				<?php
 				}
@@ -268,35 +311,44 @@ if (isset($success))
 				{
 				?>
 					<tr>
-						<th style='width: 55%;'><?php echo $this->lang->line("receivings_supplier_location"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo $supplier_location; ?></th>
+						<th style='width: 55%;'><?php echo lang('Receivings.supplier_location') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo esc($supplier_location) ?></th>
 					</tr>
 				<?php
 				}
 				?>
 			</table>
 			
-			<button class="btn btn-danger btn-sm" id="remove_supplier_button" title="<?php echo $this->lang->line('common_remove').' '.$this->lang->line('suppliers_supplier')?>">
-				<span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('common_remove').' '.$this->lang->line('suppliers_supplier') ?>
-			</button>
-
+			<?php echo anchor(
+					"$controller_name/remove_supplier",
+					'<span class="glyphicon glyphicon-remove">&nbsp</span>' . lang('Common.remove').' '.lang('Suppliers.supplier'),
+						[
+							'class' => 'btn btn-danger btn-sm',
+							'id' => 'remove_supplier_button',
+							'title'=>lang('Common.remove').' '.lang('Suppliers.supplier')
+						]) ?>
 		<?php
 		}
 		else
 		{
 		?>
-			<?php echo form_open($controller_name."/select_supplier", array('id'=>'select_supplier_form', 'class'=>'form-horizontal')); ?>
+			<?php echo form_open(esc("$controller_name/select_supplier", 'attr'), ['id' => 'select_supplier_form', 'class' => 'form-horizontal']) ?>
 				<div class="form-group" id="select_customer">
-					<label id="supplier_label" for="supplier" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('receivings_select_supplier'); ?></label>
-					<?php echo form_input(array('name'=>'supplier', 'id'=>'supplier', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('receivings_start_typing_supplier_name'))); ?>
+					<label id="supplier_label" for="supplier" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo lang('Receivings.select_supplier') ?></label>
+					<?php echo form_input ([
+						'name' => 'supplier',
+						'id' => 'supplier',
+						'class' => 'form-control input-sm',
+						'value' => lang('Receivings.start_typing_supplier_name')
+					]) ?>
 
-					<button id='new_supplier_button' class='btn btn-info btn-sm modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("suppliers/view"); ?>'
-							title='<?php echo $this->lang->line('receivings_new_supplier'); ?>'>
-						<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line('receivings_new_supplier'); ?>
+					<button id='new_supplier_button' class='btn btn-info btn-sm modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo site_url("suppliers/view") ?>'
+							title='<?php echo lang('Receivings.new_supplier') ?>'>
+						<span class="glyphicon glyphicon-user">&nbsp</span><?php echo lang('Receivings.new_supplier') ?>
 					</button>
 
 				</div>
-			<?php echo form_close(); ?>
+			<?php echo form_close() ?>
 		<?php
 		}
 		?>
@@ -307,8 +359,8 @@ if (isset($success))
 				if($mode != 'requisition')
 				{
 				?>
-					<th style="width: 55%;"><?php echo $this->lang->line('sales_total'); ?></th>
-					<th style="width: 45%; text-align: right;"><?php echo to_currency($total); ?></th>
+					<th style="width: 55%;"><?php echo lang('Sales.total') ?></th>
+					<th style="width: 45%; text-align: right;"><?php echo to_currency($total) ?></th>
 				<?php 
 				}
 				else
@@ -331,31 +383,49 @@ if (isset($success))
 				if($mode == 'requisition')
 				{
 				?>
-					<?php echo form_open($controller_name."/requisition_complete", array('id'=>'finish_receiving_form', 'class'=>'form-horizontal')); ?>
+					<?php echo form_open(esc("$controller_name/requisition_complete", 'attr'), ['id' => 'finish_receiving_form', 'class' => 'form-horizontal']) ?>
 						<div class="form-group form-group-sm">
-							<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?></label>
-							<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'4')); ?>
+							<label id="comment_label" for="comment"><?php echo lang('Common.comments') ?></label>
+							<?php echo form_textarea ([
+								'name' => 'comment',
+								'id' => 'comment',
+								'class' => 'form-control input-sm',
+								'value' => $comment,
+								'rows' => '4'
+							]) ?>
 
-							<div class="btn btn-sm btn-danger pull-left" id='cancel_receiving_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('receivings_cancel_receiving'); ?></div>
+							<div class="btn btn-sm btn-danger pull-left" id='cancel_receiving_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo lang('Receivings.cancel_receiving') ?></div>
 							
-							<div class="btn btn-sm btn-success pull-right" id='finish_receiving_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo $this->lang->line('receivings_complete_receiving'); ?></div>
+							<div class="btn btn-sm btn-success pull-right" id='finish_receiving_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo lang('Receivings.complete_receiving') ?></div>
 						</div>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 				<?php
 				}
 				else
 				{
 				?>
-					<?php echo form_open($controller_name."/complete", array('id'=>'finish_receiving_form', 'class'=>'form-horizontal')); ?>
+					<?php echo form_open($controller_name."/complete", ['id' => 'finish_receiving_form', 'class' => 'form-horizontal']) ?>
 						<div class="form-group form-group-sm">
-							<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?></label>
-							<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'4'));?>
+							<label id="comment_label" for="comment"><?php echo lang('Common.comments') ?></label>
+							<?php echo form_textarea ([
+								'name' => 'comment',
+								'id' => 'comment',
+								'class' => 'form-control input-sm',
+								'value' => esc($comment, 'attr'),
+								'rows' => '4'
+							]) ?>
 							<div id="payment_details" >
 								<table class="sales_table_100" >
 									<tr>
-										<td><?php echo $this->lang->line('receivings_print_after_sale'); ?></td>
+										<td><?php echo lang('Receivings.print_after_sale') ?></td>
 										<td>
-											<?php echo form_checkbox(array('name'=>'recv_print_after_sale', 'id'=>'recv_print_after_sale', 'class'=>'checkbox', 'value'=>1, 'checked'=>$print_after_sale)); ?>
+											<?php echo form_checkbox ([
+												'name' => 'recv_print_after_sale',
+												'id' => 'recv_print_after_sale',
+												'class' => 'checkbox',
+												'value' => 1,
+												'checked' => $print_after_sale
+											]) ?>
 										</td>
 									</tr>
 									<?php
@@ -363,34 +433,54 @@ if (isset($success))
 									{
 									?>
 										<tr>
-											<td><?php echo $this->lang->line('receivings_reference');?></td>
+											<td><?php echo lang('Receivings.reference') ?></td>
 											<td>
-												<?php echo form_input(array('name'=>'recv_reference', 'id'=>'recv_reference', 'class'=>'form-control input-sm', 'value'=>$reference, 'size'=>5));?>
+												<?php echo form_input ([
+													'name' => 'recv_reference',
+													'id' => 'recv_reference',
+													'class' => 'form-control input-sm',
+													'value' => esc($reference, 'attr'),
+													'size' => 5
+												]) ?>
 											</td>
 										</tr>
 									<?php
 									}
 									?>
 									<tr>
-										<td><?php echo $this->lang->line('sales_payment'); ?></td>
+										<td><?php echo lang('Sales.payment') ?></td>
 										<td>
-											<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'auto')); ?>
+											<?php echo form_dropdown(
+												'payment_type',
+												esc($payment_options, 'attr'),
+												[],
+												[
+													'id' => 'payment_types',
+													'class' => 'selectpicker show-menu-arrow',
+													'data-style' => 'btn-default btn-sm',
+													'data-width' => 'auto'
+											]) ?>
 										</td>
 									</tr>
 									<tr>
-										<td><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
+										<td><?php echo lang('Sales.amount_tendered') ?></td>
 										<td>
-											<?php echo form_input(array('name'=>'amount_tendered', 'value'=>'', 'class'=>'form-control input-sm', 'size'=>'5')); ?>
+											<?php echo form_input ([
+												'name' => 'amount_tendered',
+												'value' => '',
+												'class' => 'form-control input-sm',
+												'size' => '5'
+											]) ?>
 										</td>
 									</tr>
 								</table>
 							</div>
 
-							<div class='btn btn-sm btn-danger pull-left' id='cancel_receiving_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('receivings_cancel_receiving') ?></div>
+							<div class='btn btn-sm btn-danger pull-left' id='cancel_receiving_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo lang('Receivings.cancel_receiving') ?></div>
 							
-							<div class='btn btn-sm btn-success pull-right' id='finish_receiving_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo $this->lang->line('receivings_complete_receiving') ?></div>
+							<div class='btn btn-sm btn-success pull-right' id='finish_receiving_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo lang('Receivings.complete_receiving') ?></div>
 						</div>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 				<?php
 				}
 				?>
@@ -404,23 +494,9 @@ if (isset($success))
 <script type="text/javascript">
 $(document).ready(function()
 {
-	const redirect = function() {
-		window.location.href = "<?php echo site_url('receivings'); ?>";
-	};
-
-	$("#remove_supplier_button").click(function()
-	{
-		$.post("<?php echo site_url('receivings/remove_supplier'); ?>", redirect);
-	});
-
-	$(".delete_item_button").click(function() {
-		const item_id = $(this).data('item-id');
-		$.post("<?php echo site_url('receivings/delete_item/'); ?>" + item_id, redirect);
-	});
-
 	$("#item").autocomplete(
 	{
-		source: '<?php echo site_url($controller_name."/stock_item_search"); ?>',
+		source: '<?php echo esc(site_url("$controller_name/stock_item_search"), 'url') ?>',
 		minChars:0,
 		delay:10,
 		autoFocus: false,
@@ -442,22 +518,22 @@ $(document).ready(function()
 
 	$('#item').blur(function()
 	{
-		$(this).attr('value',"<?php echo $this->lang->line('sales_start_typing_item_name'); ?>");
+		$(this).attr('value',"<?php echo lang('Sales.start_typing_item_name') ?>");
 	});
 
 	$('#comment').keyup(function() 
 	{
-		$.post('<?php echo site_url($controller_name."/set_comment");?>', {comment: $('#comment').val()});
+		$.post('<?php echo esc(site_url("$controller_name/set_comment"), 'url') ?>', {comment: $('#comment').val()});
 	});
 
 	$('#recv_reference').keyup(function() 
 	{
-		$.post('<?php echo site_url($controller_name."/set_reference");?>', {recv_reference: $('#recv_reference').val()});
+		$.post('<?php echo esc(site_url("$controller_name/set_reference"), 'url') ?>', {recv_reference: $('#recv_reference').val()});
 	});
 
 	$("#recv_print_after_sale").change(function()
 	{
-		$.post('<?php echo site_url($controller_name."/set_print_after_sale");?>', {recv_print_after_sale: $(this).is(":checked")});
+		$.post('<?php echo esc(site_url("$controller_name/set_print_after_sale"), 'url') ?>', {recv_print_after_sale: $(this).is(":checked")});
 	});
 
 	$('#item,#supplier').click(function()
@@ -467,7 +543,7 @@ $(document).ready(function()
 
 	$("#supplier").autocomplete(
 	{
-		source: '<?php echo site_url("suppliers/suggest"); ?>',
+		source: '<?php echo site_url("suppliers/suggest") ?>',
 		minChars:0,
 		delay:10,
 		select: function (a, ui) {
@@ -480,7 +556,7 @@ $(document).ready(function()
 
 	$('#supplier').blur(function()
 	{
-		$(this).attr('value',"<?php echo $this->lang->line('receivings_start_typing_supplier_name'); ?>");
+		$(this).attr('value',"<?php echo lang('Receivings.start_typing_supplier_name') ?>");
 	});
 
 	$("#finish_receiving_button").click(function()
@@ -490,9 +566,9 @@ $(document).ready(function()
 
 	$("#cancel_receiving_button").click(function()
 	{
-		if (confirm('<?php echo $this->lang->line("receivings_confirm_cancel_receiving"); ?>'))
+		if (confirm('<?php echo lang('Receivings.confirm_cancel_receiving') ?>'))
 		{
-			$('#finish_receiving_form').attr('action', '<?php echo site_url($controller_name."/cancel_receiving"); ?>');
+			$('#finish_receiving_form').attr('action', '<?php echo esc(site_url("$controller_name/cancel_receiving"), 'url') ?>');
 			$('#finish_receiving_form').submit();
 		}
 	});
@@ -543,4 +619,4 @@ $(document).ready(function()
 
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/reports/date_input.php b/app/Views/reports/date_input.php
index e35242fe0..263f930ab 100644
--- a/app/Views/reports/date_input.php
+++ b/app/Views/reports/date_input.php
@@ -1,24 +1,29 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var array $sale_type_options
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
 
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
+<div id="page_title"><?php echo lang('Reports.report_input') ?></div>
 
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 ?>
 
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('#', ['id' => 'item_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
+		<?php echo form_label(lang('Reports.date_range'), 'report_date_range_label', ['class' => 'control-label col-xs-2 required']) ?>
 		<div class="col-xs-3">
-				<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
+				<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
 		</div>
 	</div>
 
@@ -31,21 +36,27 @@ if(isset($error))
 			if($mode == 'sale')
 			{
 			?>
-				<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Reports.sale_type'), 'reports_sale_type_label', ['class' => 'required control-label col-xs-2']) ?>
 				<div id='report_sale_type' class="col-xs-3">
-					<?php echo form_dropdown('sale_type', $sale_type_options, 'complete', array('id'=>'input_type', 'class'=>'form-control')); ?>
+					<?php echo form_dropdown('sale_type', esc($sale_type_options, 'attr'), 'complete', ['id' => 'input_type', 'class' => 'form-control']) ?>
 				</div>
 			<?php
 			}
 			elseif($mode == 'receiving')
 			{
 			?>
-				<?php echo form_label($this->lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required control-label col-xs-2')); ?>
+				<?php echo form_label(lang('Reports.receiving_type'), 'reports_receiving_type_label', ['class' => 'required control-label col-xs-2']) ?>
 				<div id='report_receiving_type' class="col-xs-3">
-					<?php echo form_dropdown('receiving_type', array('all' => $this->lang->line('reports_all'),
-						'receiving' => $this->lang->line('reports_receivings'),
-						'returns' => $this->lang->line('reports_returns'),
-						'requisitions' => $this->lang->line('reports_requisitions')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?>
+					<?php echo form_dropdown(
+							'receiving_type',
+							[
+								'all' => lang('Reports.all'),
+								'receiving' => lang('Reports.receivings'),
+								'returns' => lang('Reports.returns'),
+								'requisitions' => lang('Reports.requisitions')
+							],
+							'all',
+							['id' => 'input_type', 'class' => 'form-control']) ?>
 				</div>
 			<?php
 			}
@@ -60,9 +71,9 @@ if(isset($error))
 	{
 	?>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('reports_discount_type'), 'reports_discount_type_label', array('class'=>'required control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Reports.discount_type'), 'reports_discount_type_label', ['class' => 'required control-label col-xs-2']) ?>
 			<div id='report_discount_type' class="col-xs-3">
-				<?php echo form_dropdown('discount_type', $discount_type_options, $this->config->item('default_sales_discount_type'), array('id'=>'discount_type_id', 'class'=>'form-control')); ?>
+				<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc(config('OSPOS')->default_sales_discount_type, 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
 			</div>
 		</div>
 	<?php
@@ -74,9 +85,9 @@ if(isset($error))
 	{
 	?>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Reports.stock_location'), 'reports_stock_location_label', ['class' => 'required control-label col-xs-2']) ?>
 			<div id='report_stock_location' class="col-xs-3">
-				<?php echo form_dropdown('stock_location', $stock_locations, 'all', array('id'=>'location_id', 'class'=>'form-control')); ?>
+				<?php echo form_dropdown('stock_location', esc($stock_locations, 'attr'), 'all', ['id' => 'location_id', 'class' => 'form-control']) ?>
 			</div>
 		</div>
 	<?php
@@ -84,25 +95,24 @@ if(isset($error))
 	?>
 
 	<?php
-	echo form_button(array(
-		'name'=>'generate_report',
-		'id'=>'generate_report',
-		'content'=>$this->lang->line('common_submit'),
-		'class'=>'btn btn-primary btn-sm')
-	);
-	?>
-<?php echo form_close(); ?>
+		echo form_button ([
+			'name' => 'generate_report',
+			'id' => 'generate_report',
+			'content'=>lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm']
+	);	?>
+<?php echo form_close() ?>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#generate_report").click(function()
 	{		
 		window.location = [window.location, start_date, end_date, $("#input_type").val() || 0, $("#location_id").val() || 'all', $("#discount_type_id").val() || 0 ].join("/");
 	});
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/reports/graphical.php b/app/Views/reports/graphical.php
index 158bd2589..f5f263642 100644
--- a/app/Views/reports/graphical.php
+++ b/app/Views/reports/graphical.php
@@ -1,26 +1,34 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $title
+ * @var string $subtitle
+ * @var string $chart_type
+ * @var array $summary_data_1
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
-<div id="page_title"><?php echo $title ?></div>
+<div id="page_title"><?php echo esc($title) ?></div>
 
-<div id="page_subtitle"><?php echo $subtitle ?></div>
+<div id="page_subtitle"><?php echo esc($subtitle) ?></div>
 
 <div class="ct-chart ct-golden-section" id="chart1"></div>
 
-<?php $this->load->view($chart_type); ?>
+<?php echo view(esc($chart_type)) ?>
 
 <div id="chart_report_summary">
 	<?php
-	foreach($summary_data_1 as $name=>$value)
+	foreach($summary_data_1 as $name => $value)
 	{
 	?>
-		<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': ' . to_currency($value); ?></div>
+		<div class="summary_row"><?php echo lang("Reports.$name"). ': ' . to_currency($value) ?></div>
 	<?php
 	}
 	?>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
+<?php echo view('partial/footer') ?>
\ No newline at end of file
diff --git a/app/Views/reports/graphs/bar.php b/app/Views/reports/graphs/bar.php
index f96886db5..8f1db28a8 100644
--- a/app/Views/reports/graphs/bar.php
+++ b/app/Views/reports/graphs/bar.php
@@ -1,10 +1,19 @@
+<?php
+/**
+ * @var array $labels_1
+ * @var string $yaxis_title
+ * @var array $series_data_1
+ * @var bool $show_currency
+ * @var string $xaxis_title
+ */
+?>
 <script>
 	// Labels and data series
 	var data = {
-		labels: <?php echo json_encode($labels_1); ?>,
+		labels: <?php echo esc(json_encode($labels_1), 'js') ?>,
 		series: [{
-			name: '<?php echo $yaxis_title; ?>',
-			data: <?php echo json_encode($series_data_1); ?>
+			name: '<?php echo esc($yaxis_title, 'js') ?>',
+			data: <?php echo esc(json_encode($series_data_1), 'js') ?>
 		}]
 	};
 
@@ -38,18 +47,18 @@
 			// used for the labels on each axis.
 			labelInterpolationFnc: function(value) {
 				<?php
-				if( $show_currency )
+				if($show_currency)
 				{
 					if( currency_side() )
 					{
 				?>
-						return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+						return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 					<?php
 					}
 					else
 					{
 					?>
-						return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
+						return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
 				<?php
 					}
 				}
@@ -67,7 +76,7 @@
 		plugins: [
 			Chartist.plugins.ctAxisTitle({
 				axisX: {
-					axisTitle: '<?php echo $xaxis_title; ?>',
+					axisTitle: '<?php echo esc($xaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: -100,
@@ -76,7 +85,7 @@
 					textAnchor: 'middle'
 				},
 				axisY: {
-					axisTitle: '<?php echo $yaxis_title; ?>',
+					axisTitle: '<?php echo esc($yaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: 0,
diff --git a/app/Views/reports/graphs/hbar.php b/app/Views/reports/graphs/hbar.php
index cd25285ff..942acba4f 100644
--- a/app/Views/reports/graphs/hbar.php
+++ b/app/Views/reports/graphs/hbar.php
@@ -1,10 +1,19 @@
+<?php
+/**
+ * @var array $labels_1
+ * @var string $yaxis_title
+ * @var array $series_data_1
+ * @var bool $show_currency
+ * @var string $xaxis_title
+ */
+?>
 <script>
 	// Labels and data series
 	var data = {
-		labels: <?php echo json_encode($labels_1); ?>,
+		labels: <?php echo json_encode(esc($labels_1, 'js')) ?>,
 		series: [{
-			name: '<?php echo $yaxis_title; ?>',
-			data: <?php echo json_encode($series_data_1); ?>
+			name: '<?php echo esc($yaxis_title, 'js') ?>',
+			data: <?php echo json_encode(esc($series_data_1, 'js')) ?>
 		}]
 	};
 
@@ -35,18 +44,18 @@
 			// used for the labels on each axis.
 			labelInterpolationFnc: function(value) {
 				<?php
-				if( $show_currency )
+				if($show_currency)
 				{
-					if( currency_side() )
+					if(currency_side())
 					{
 				?>
-						return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+						return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 					<?php
 					}
 					else
 					{
 					?>
-						return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
+						return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
 				<?php
 					}
 				}
@@ -70,7 +79,7 @@
 		plugins: [
 			Chartist.plugins.ctAxisTitle({
 				axisX: {
-					axisTitle: '<?php echo $xaxis_title; ?>',
+					axisTitle: '<?php echo esc($xaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: -100,
@@ -79,7 +88,7 @@
 					textAnchor: 'middle'
 				},
 				axisY: {
-					axisTitle: '<?php echo $yaxis_title; ?>',
+					axisTitle: '<?php echo esc($yaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: 0,
diff --git a/app/Views/reports/graphs/line.php b/app/Views/reports/graphs/line.php
index 9d389f0a6..cde3a6609 100644
--- a/app/Views/reports/graphs/line.php
+++ b/app/Views/reports/graphs/line.php
@@ -1,10 +1,19 @@
+<?php
+/**
+ * @var array $labels_1
+ * @var string $yaxis_title
+ * @var array $series_data_1
+ * @var bool $show_currency
+ * @var string $xaxis_title
+ */
+?>
 <script>
 	// Labels and data series
 	var data = {
-		labels: <?php echo json_encode($labels_1); ?>,
+		labels: <?php echo json_encode(esc($labels_1, 'js')) ?>,
 		series: [{
-			name: '<?php echo $yaxis_title; ?>',
-			data: <?php echo json_encode($series_data_1); ?>
+			name: '<?php echo esc($yaxis_title, 'js') ?>',
+			data: <?php echo json_encode(esc($series_data_1, 'js')) ?>
 		}]
 	};
 
@@ -54,19 +63,19 @@
 			// used for the labels on each axis.
 			labelInterpolationFnc: function(value) {
 				<?php
-				if( $show_currency )
+				if($show_currency)
 				{
 					if( currency_side() )
 					{
 				?>
-						return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+						return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 					<?php
 					}
 					else
 					{
 					?>
-						return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
-				<?php
+						return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
+						<?php
 					}
 				}
 				else
@@ -83,7 +92,7 @@
 		plugins: [
 			Chartist.plugins.ctAxisTitle({
 				axisX: {
-					axisTitle: '<?php echo $xaxis_title; ?>',
+					axisTitle: '<?php echo esc($xaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: -100,
@@ -92,7 +101,7 @@
 					textAnchor: 'middle'
 				},
 				axisY: {
-					axisTitle: '<?php echo $yaxis_title; ?>',
+					axisTitle: '<?php echo esc($yaxis_title, 'js') ?>',
 					axisClass: 'ct-axis-title',
 					offset: {
 						x: 0,
@@ -112,13 +121,13 @@
 						if( currency_side() )
 						{
 					?>
-							return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+							return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 						<?php
 						}
 						else
 						{
 						?>
-							return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
+							return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
 					<?php
 						}
 					}
@@ -141,13 +150,13 @@
 						if( currency_side() )
 						{
 					?>
-							return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+							return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 						<?php
 						}
 						else
 						{
 						?>
-							return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
+							return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
 					<?php
 						}
 					}
diff --git a/app/Views/reports/graphs/pie.php b/app/Views/reports/graphs/pie.php
index f9892bb21..115054b90 100644
--- a/app/Views/reports/graphs/pie.php
+++ b/app/Views/reports/graphs/pie.php
@@ -1,8 +1,15 @@
+<?php
+/**
+ * @var array $labels_1
+ * @var array $series_data_1
+ * @var bool $show_currency
+ */
+?>
 <script>
 	// Labels and data series
 	var data = {
-		labels: <?php echo json_encode($labels_1); ?>,
-		series: <?php echo json_encode($series_data_1); ?>
+		labels: <?php echo json_encode(esc($labels_1, 'js')) ?>,
+		series: <?php echo json_encode(esc($series_data_1, 'js')) ?>
 	};
 	
 	// We are setting a few options for our chart and override the defaults
@@ -29,18 +36,18 @@
 			Chartist.plugins.tooltip({
 				transformTooltipTextFnc: function(value) {
 					<?php
-					if( $show_currency )
+					if($show_currency)
 					{
 						if( currency_side() )
 						{
 					?>
-							return value + '<?php echo $this->config->item('currency_symbol'); ?>';
+							return value + '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>';
 						<?php
 						}
 						else
 						{
 						?>
-							return '<?php echo $this->config->item('currency_symbol'); ?>' + value;				
+							return '<?php echo esc(config('OSPOS')->currency_symbol, 'js') ?>' + value;
 					<?php
 						}
 					}
diff --git a/app/Views/reports/inventory_summary_input.php b/app/Views/reports/inventory_summary_input.php
index 196777a1f..9533ee302 100644
--- a/app/Views/reports/inventory_summary_input.php
+++ b/app/Views/reports/inventory_summary_input.php
@@ -1,46 +1,51 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var array $stock_locations
+ * @var array $item_count
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
 
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
+<div id="page_title"><?php echo lang('Reports.report_input') ?></div>
 
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 ?>
 
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('#', ['id' => 'item_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Reports.stock_location'), 'reports_stock_location_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div id='report_stock_location' class="col-xs-3">
-			<?php echo form_dropdown('stock_location',$stock_locations,'all','id="location_id" class="form-control"'); ?>
+			<?php echo form_dropdown('stock_location', esc($stock_locations, 'attr'), 'all', 'id="location_id" class="form-control"') ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_item_count'), 'reports_item_count_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Reports.item_count'), 'reports_item_count_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div id='report_item_count' class="col-xs-3">
-			<?php echo form_dropdown('item_count',$item_count,'all','id="item_count" class="form-control"'); ?>
+			<?php echo form_dropdown('item_count', esc($item_count, 'attr'), 'all', 'id="item_count" class="form-control"') ?>
 		</div>
 	</div>
 
 	<?php
-	echo form_button(array(
-		'name'=>'generate_report',
-		'id'=>'generate_report',
-		'content'=>$this->lang->line('common_submit'),
-		'class'=>'btn btn-primary btn-sm')
-	);
-	?>
-<?php echo form_close(); ?>
+		echo form_button ([
+			'name' => 'generate_report',
+			'id' => 'generate_report',
+			'content' => lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm'
+	]) ?>
+<?php echo form_close() ?>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
diff --git a/app/Views/reports/listing.php b/app/Views/reports/listing.php
index f7d593951..e5d863d57 100644
--- a/app/Views/reports/listing.php
+++ b/app/Views/reports/listing.php
@@ -1,4 +1,12 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var array $grants
+ */
+
+use app\Models\Employee;
+
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
@@ -7,7 +15,7 @@
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 ?>
 
@@ -15,7 +23,7 @@ if(isset($error))
 	<div class="col-md-4">
 		<div class="panel panel-primary">
 			<div class="panel-heading">
-				<h3 class="panel-title"><span class="glyphicon glyphicon-stats">&nbsp</span><?php echo $this->lang->line('reports_graphical_reports'); ?></h3>
+				<h3 class="panel-title"><span class="glyphicon glyphicon-stats">&nbsp</span><?php echo lang('Reports.graphical_reports') ?></h3>
 			</div>
 			<div class="list-group">
 				<?php
@@ -34,7 +42,7 @@ if(isset($error))
 	<div class="col-md-4">
 		<div class="panel panel-primary">
 			<div class="panel-heading">
-				<h3 class="panel-title"><span class="glyphicon glyphicon-list">&nbsp</span><?php echo $this->lang->line('reports_summary_reports'); ?></h3>
+				<h3 class="panel-title"><span class="glyphicon glyphicon-list">&nbsp</span><?php echo lang('Reports.summary_reports') ?></h3>
 			</div>
 			<div class="list-group">
 				<?php 
@@ -53,11 +61,11 @@ if(isset($error))
 	<div class="col-md-4">
 		<div class="panel panel-primary">
 			<div class="panel-heading">
-				<h3 class="panel-title"><span class="glyphicon glyphicon-list-alt">&nbsp</span><?php echo $this->lang->line('reports_detailed_reports'); ?></h3>
+				<h3 class="panel-title"><span class="glyphicon glyphicon-list-alt">&nbsp</span><?php echo lang('Reports.detailed_reports') ?></h3>
 			</div>
 			<div class="list-group">
 				<?php 			
-				$person_id = $this->session->userdata('person_id');
+				$person_id = $this->session->get('person_id');
 				show_report_if_allowed('detailed', 'sales', $person_id);
 				show_report_if_allowed('detailed', 'receivings', $person_id);
 				show_report_if_allowed('specific', 'customer', $person_id, 'reports_customers');
@@ -69,12 +77,13 @@ if(isset($error))
 		</div>
 
 		<?php
-		if ($this->Employee->has_grant('reports_inventory', $this->session->userdata('person_id')))
+		$employee = model(Employee::class);
+		if ($employee->has_grant('reports_inventory', $this->session->get('person_id')))
 		{
 		?>
 			<div class="panel panel-primary">
 				<div class="panel-heading">
-					<h3 class="panel-title"><span class="glyphicon glyphicon-book">&nbsp</span><?php echo $this->lang->line('reports_inventory_reports'); ?></h3>
+					<h3 class="panel-title"><span class="glyphicon glyphicon-book">&nbsp</span><?php echo lang('Reports.inventory_reports') ?></h3>
 				</div>
 				<div class="list-group">
 				<?php 
@@ -89,4 +98,4 @@ if(isset($error))
 	</div>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/reports/specific_customer_input.php b/app/Views/reports/specific_customer_input.php
index 1503cece6..196322719 100644
--- a/app/Views/reports/specific_customer_input.php
+++ b/app/Views/reports/specific_customer_input.php
@@ -1,64 +1,71 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $specific_input_name
+ * @var array $specific_input_data
+ * @var array $sale_type_options
+ * @var array $payment_type
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
 
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
+<div id="page_title"><?php echo lang('Reports.report_input') ?></div>
 
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 ?>
 
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('#', ['id' => 'item_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
+		<?php echo form_label(lang('Reports.date_range'), 'report_date_range_label', ['class' => 'control-label col-xs-2 required']) ?>
 		<div class="col-xs-3">
-				<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
+				<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm" id="report_specific_input_data">
-		<?php echo form_label($specific_input_name, 'specific_input_name_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(esc($specific_input_name, 'attr'), 'specific_input_name_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div class="col-xs-3">
-			<?php echo form_dropdown('specific_input_data', $specific_input_data, '', 'id="specific_input_data" class="form-control selectpicker" data-live-search="true"'); ?>
+			<?php echo form_dropdown('specific_input_data', esc($specific_input_data, 'attr'), '', 'id="specific_input_data" class="form-control selectpicker" data-live-search="true"') ?>
 		</div>
 	</div>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Reports.sale_type'), 'reports_sale_type_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div id='report_sale_type' class="col-xs-3">
-			<?php echo form_dropdown('sale_type',$sale_type_options, 'complete', 'id="input_type" class="form-control"'); ?>
+			<?php echo form_dropdown('sale_type', esc($sale_type_options, 'attr'), 'complete', 'id="input_type" class="form-control"') ?>
 		</div>
 	</div>
 	
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_payment_type'), 'reports_payment_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Reports.payment_type'), 'reports_payment_type_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div class="col-xs-3">
-			<?php echo form_dropdown('payment_type', $payment_type, '', 'id="input_payment_type" class="form-control"'); ?>
+			<?php echo form_dropdown('payment_type', esc($payment_type, 'attr'), '', 'id="input_payment_type" class="form-control"') ?>
 		</div>
 	</div>
 
 	<?php 
-	echo form_button(array(
-			'name'=>'generate_report',
-			'id'=>'generate_report',
-			'content'=>$this->lang->line('common_submit'),
-			'class'=>'btn btn-primary btn-sm')
-	);
-	?>
-<?php echo form_close(); ?>
+		echo form_button ([
+			'name' => 'generate_report',
+			'id' => 'generate_report',
+			'content' => lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm'
+	]);	?>
+<?php echo form_close() ?>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#generate_report").click(function()
 	{
diff --git a/app/Views/reports/specific_input.php b/app/Views/reports/specific_input.php
index d9f1c1c77..037d11866 100644
--- a/app/Views/reports/specific_input.php
+++ b/app/Views/reports/specific_input.php
@@ -1,24 +1,31 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $specific_input_name
+ * @var array $specific_input_data
+ * @var array $sale_type_options
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
 
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
+<div id="page_title"><?php echo lang('Reports.report_input') ?></div>
 
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo '<div class=\'alert alert-dismissible alert-danger\'>' . esc($error) . '</div>';
 }
 ?>
 
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('#', ['id' => 'item_form', 'enctype' => 'multipart/form-data', 'class' => 'form-horizontal']) ?>
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
+		<?php echo form_label(lang('Reports.date_range'), 'report_date_range_label', ['class' => 'control-label col-xs-2 required']) ?>
 		<div class="col-xs-3">
-				<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
+				<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
 		</div>
 	</div>
 
@@ -27,9 +34,9 @@ if(isset($error))
 	{
 	?>
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('reports_discount_type'), 'reports_discount_type_label', array('class'=>'required control-label col-xs-2')); ?>
+			<?php echo form_label(lang('Reports.discount_type'), 'reports_discount_type_label', ['class' => 'required control-label col-xs-2']) ?>
 			<div id='report_discount_type' class="col-xs-3">
-				<?php echo form_dropdown('discount_type', $discount_type_options, $this->config->item('default_sales_discount_type'), array('id'=>'discount_type_id', 'class'=>'form-control')); ?>
+				<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc(config('OSPOS')->default_sales_discount_type, 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
 			</div>
 		</div>
 	<?php
@@ -37,9 +44,9 @@ if(isset($error))
 	?>
 
 	<div class="form-group form-group-sm" id="report_specific_input_data">
-		<?php echo form_label($specific_input_name, 'specific_input_name_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(esc($specific_input_name, 'attr'), 'specific_input_name_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div class="col-xs-3 discount_percent">
-			<?php echo form_dropdown('specific_input_data', $specific_input_data, '', 'id="specific_input_data" class="form-control"'); ?>
+			<?php echo form_dropdown('specific_input_data', esc($specific_input_data, 'attr'), '', 'id="specific_input_data" class="form-control"') ?>
 		</div>
 
 		<?php	
@@ -47,13 +54,13 @@ if(isset($error))
 		{
 		?>
 		<div class="col-xs-3 discount_fixed">
-			<?php echo form_input(array(
+			<?php echo form_input ([
 				'name' => 'discount_fixed',
 				'id' => 'discount_fixed',
 				'class' => 'form-control input-sm required',
 				'type' => 'number',
 				'min' => 0,
-				'value' => $this->config->item('default_sales_discount'))); ?>
+				'value' => config('OSPOS')->default_sales_discount]) ?>
 		</div>
 		<?php
 		}
@@ -61,23 +68,22 @@ if(isset($error))
 	</div>
 
 	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<?php echo form_label(lang('Reports.sale_type'), 'reports_sale_type_label', ['class' => 'required control-label col-xs-2']) ?>
 		<div id='report_sale_type' class="col-xs-3">
-			<?php echo form_dropdown('sale_type',$sale_type_options, 'complete', 'id="input_type" class="form-control"'); ?>
+			<?php echo form_dropdown('sale_type', esc($sale_type_options, 'attr'), 'complete', 'id="input_type" class="form-control"') ?>
 		</div>
 	</div>
 
 	<?php 
-	echo form_button(array(
-			'name'=>'generate_report',
-			'id'=>'generate_report',
-			'content'=>$this->lang->line('common_submit'),
-			'class'=>'btn btn-primary btn-sm')
-	);
-	?>
-<?php echo form_close(); ?>
+		echo form_button ([
+			'name' => 'generate_report',
+			'id' => 'generate_report',
+			'content'=>lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm'
+	]) ?>
+<?php echo form_close() ?>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -91,7 +97,7 @@ $(document).ready(function()
 	}
 	?>
 
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#generate_report").click(function()
 	{
diff --git a/app/Views/reports/tabular.php b/app/Views/reports/tabular.php
index 4763243c3..babe54c4f 100644
--- a/app/Views/reports/tabular.php
+++ b/app/Views/reports/tabular.php
@@ -1,12 +1,21 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $title
+ * @var string $subtitle
+ * @var array $summary_data
+ * @var array $headers
+ * @var array $data
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
 </script>
 
-<div id="page_title"><?php echo $title ?></div>
+<div id="page_title"><?php echo esc($title) ?></div>
 
-<div id="page_subtitle"><?php echo $subtitle ?></div>
+<div id="page_subtitle"><?php echo esc($subtitle) ?></div>
 
 <div id="table_holder">
 	<table id="table"></table>
@@ -19,13 +28,13 @@
 		if($name == "total_quantity")
 		{
 	?>
-			<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' .$value; ?></div>
+			<div class="summary_row"><?php echo lang("Reports.$name") . ": $value" ?></div>
 	<?php
 		}
 		else
 		{
 	?>
-			<div class="summary_row"><?php echo $this->lang->line('reports_'.$name) . ': ' . to_currency($value); ?></div>
+			<div class="summary_row"><?php echo lang("Reports.$name") . ': ' . to_currency($value) ?></div>
 	<?php
 		}
 	}
@@ -35,32 +44,31 @@
 <script type="text/javascript">
 	$(document).ready(function()
 	{
-		<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+		<?php echo view('partial/bootstrap_tables_locale') ?>
 
 		$('#table')
 			.addClass("table-striped")
 			.addClass("table-bordered")
 			.bootstrapTable({
-				columns: <?php echo transform_headers($headers, TRUE, FALSE); ?>,
+				columns: <?php echo transform_headers(esc($headers, 'js'), TRUE, FALSE) ?>,
 				stickyHeader: true,
 				stickyHeaderOffsetLeft: $('#table').offset().left + 'px',
 				stickyHeaderOffsetRight: $('#table').offset().right + 'px',
-				pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+				pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 				sortable: true,
 				showExport: true,
 				exportDataType: 'all',
 				exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'],
 				pagination: true,
 				showColumns: true,
-				data: <?php echo json_encode($data); ?>,
+				data: <?php echo json_encode(esc($data, 'js')) ?>,
 				iconSize: 'sm',
 				paginationVAlign: 'bottom',
-				escape: false,
-				search: true
+				escape: false
 		});
 
 
 	});
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/reports/tabular_details.php b/app/Views/reports/tabular_details.php
index 6b702da2a..ada4c24ed 100644
--- a/app/Views/reports/tabular_details.php
+++ b/app/Views/reports/tabular_details.php
@@ -1,8 +1,18 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $title
+ * @var string $subtitle
+ * @var array $overall_summary_data
+ * @var array $details_data
+ * @var array $headers
+ * @var array $summary_data
+ */
+?>
+<?php echo view('partial/header') ?>
 
-<div id="page_title"><?php echo $title ?></div>
+<div id="page_title"><?php echo esc($title) ?></div>
 
-<div id="page_subtitle"><?php echo $subtitle ?></div>
+<div id="page_subtitle"><?php echo esc($subtitle) ?></div>
 
 <div id="table_holder">
 	<table id="table"></table>
@@ -10,26 +20,26 @@
 
 <div id="report_summary">
 	<?php
-	foreach($overall_summary_data as $name=>$value)
-	{
-	?>
-		<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': '.to_currency($value); ?></div>
-	<?php
-	}
+		foreach($overall_summary_data as $name => $value)
+		{
+		?>
+			<div class="summary_row"><?php echo lang("Reports.$name") . ': ' . to_currency($value) ?></div>
+		<?php
+		}
 	?>
 </div>
 
 <script type="text/javascript">
 	$(document).ready(function()
 	{
-	 	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	 	<?php echo view('partial/bootstrap_tables_locale') ?>
 
-		var details_data = <?php echo json_encode($details_data); ?>;
+		var details_data = <?php echo json_encode(esc($details_data, 'js')) ?>;
 		<?php
-		if($this->config->item('customer_reward_enable') == TRUE && !empty($details_data_rewards))
+		if(config('OSPOS')->customer_reward_enable == TRUE && !empty($details_data_rewards))	//TODO: === ?
 		{
 		?>
-			var details_data_rewards = <?php echo json_encode($details_data_rewards); ?>;
+			var details_data_rewards = <?php echo json_encode(esc($details_data_rewards, 'js')) ?>;
 		<?php
 		}
 		?>
@@ -38,7 +48,7 @@
 			if(isset($editable))
 			{
 			?>
-				table_support.submit_handler('<?php echo site_url("reports/get_detailed_" . $editable . "_row")?>');
+				table_support.submit_handler('<?php echo esc(site_url("reports/get_detailed_$editable" . '_row'), 'url') ?>');
 				dialog_support.init("a.modal-dlg");
 			<?php
 			}
@@ -49,11 +59,11 @@
 			.addClass("table-striped")
 			.addClass("table-bordered")
 			.bootstrapTable({
-				columns: <?php echo transform_headers($headers['summary'], TRUE); ?>,
+				columns: <?php echo transform_headers(esc($headers['summary'], 'js'), TRUE) ?>,
 				stickyHeader: true,
 				stickyHeaderOffsetLeft: $('#table').offset().left + 'px',
 				stickyHeaderOffsetRight: $('#table').offset().right + 'px',
-				pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+				pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 				pagination: true,
 				sortable: true,
 				showColumns: true,
@@ -61,28 +71,27 @@
 				showExport: true,
 				exportDataType: 'all',
 				exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'],
-				data: <?php echo json_encode($summary_data); ?>,
+				data: <?php echo json_encode(esc($summary_data, 'js')) ?>,
 				iconSize: 'sm',
 				paginationVAlign: 'bottom',
 				detailView: true,
 				escape: false,
-				search: true,
 				onPageChange: init_dialog,
 				onPostBody: function() {
 					dialog_support.init("a.modal-dlg");
 				},
 				onExpandRow: function (index, row, $detail) {
 					$detail.html('<table></table>').find("table").bootstrapTable({
-						columns: <?php echo transform_headers_readonly($headers['details']); ?>,
+						columns: <?php echo transform_headers_readonly(esc($headers['details'], 'js')) ?>,
 						data: details_data[(!isNaN(row.id) && row.id) || $(row[0] || row.id).text().replace(/(POS|RECV)\s*/g, '')]
 					});
 
 					<?php
-					if($this->config->item('customer_reward_enable') == TRUE && !empty($details_data_rewards))
+					if(config('OSPOS')->customer_reward_enable == TRUE && !empty($details_data_rewards))
 					{
 					?>
 						$detail.append('<table></table>').find("table").bootstrapTable({
-							columns: <?php echo transform_headers_readonly($headers['details_rewards']); ?>,
+							columns: <?php echo transform_headers_readonly(esc($headers['details_rewards'], 'js')) ?>,
 							data: details_data_rewards[(!isNaN(row.id) && row.id) || $(row[0] || row.id).text().replace(/(POS|RECV)\s*/g, '')]
 						});
 					<?php
@@ -95,4 +104,4 @@
 	});
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/form.php b/app/Views/sales/form.php
old mode 100755
new mode 100644
index c38252b59..28726eafd
--- a/app/Views/sales/form.php
+++ b/app/Views/sales/form.php
@@ -1,33 +1,50 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<?php
+/**
+ * @var array $sale_info
+ * @var bool $balance_due
+ * @var array $new_payment_options
+ * @var string $payment_type_new
+ * @var float $payment_amount_new
+ * @var array $payments
+ * @var array $payment_amounts
+ * @var array $payment_options
+ * @var string $selected_customer_name
+ * @var int $selected_customer_id
+ * @var string $selected_employee_name
+ * @var int $selected_employee_id
+ * @var string $controller_name
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open('sales/save/' . $sale_info['sale_id'], ['id' => 'sales_edit_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="sale_basic_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('sales_receipt_number'), 'receipt_number', array('class'=>'control-label col-xs-3')); ?>
-			<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], 'POS ' . $sale_info['sale_id'], array('target'=>'_blank', 'class'=>'control-label col-xs-8', "style"=>"text-align:left"));?>
+			<?php echo form_label(lang('Sales.receipt_number'), 'receipt_number', ['class' => 'control-label col-xs-3']) ?>
+			<?php echo anchor(esc('sales/receipt/' . $sale_info['sale_id'], 'url'), 'POS ' . $sale_info['sale_id'], ['target' => '_blank', 'class' => 'control-label col-xs-8', "style"=>"text-align:left"]) ?>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('sales_date'), 'date', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Sales.date'), 'date', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array('name'=>'date','value'=>to_datetime(strtotime($sale_info['sale_time'])), 'class'=>'datetime form-control input-sm'));?>
+				<?php echo form_input (['name' => 'date','value' => to_datetime(strtotime($sale_info['sale_time'])), 'class' => 'datetime form-control input-sm']) ?>
 			</div>
 		</div>
 
 		<?php
-		if($this->config->item('invoice_enable') == TRUE)
+		if(config('OSPOS')->invoice_enable == TRUE)	//TODO: Replace this with just `if(config('OSPOS')->invoice_enable'))`
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_invoice_number'), 'invoice_number', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Sales.invoice_number'), 'invoice_number', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-8'>
 					<?php if(!empty($sale_info["invoice_number"]) && isset($sale_info['customer_id']) && !empty($sale_info['email'])): ?>
-						<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
-						<a id="send_invoice" href="javascript:void(0);"><?php echo $this->lang->line('sales_send_invoice');?></a>
+						<?php echo form_input (['name' => 'invoice_number', 'size'=>10, 'value' => esc($sale_info['invoice_number'], 'attr'), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?>
+						<a id="send_invoice" href="javascript:void(0);"><?php echo lang('Sales.send_invoice') ?></a>
 					<?php else: ?>
-						<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
+						<?php echo form_input (['name' => 'invoice_number', 'value' => esc($sale_info['invoice_number'], 'attr'), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?>
 					<?php endif; ?>
 				</div>
 			</div>
@@ -40,18 +57,18 @@
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_payment'), 'payment_new', array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Sales.payment'), 'payment_new', ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
-					<?php echo form_dropdown('payment_type_new', $new_payment_options, $payment_type_new, array('id'=>'payment_types_new', 'class'=>'form-control')); ?>
+					<?php echo form_dropdown('payment_type_new', esc($new_payment_options, 'attr'), esc($payment_type_new, 'attr'), ['id' => 'payment_types_new', 'class' => 'form-control']) ?>
 				</div>
 				<div class='col-xs-4'>
 					<div class="input-group input-group-sm">
 						<?php if(!currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 						<?php endif; ?>
-						<?php echo form_input(array('name'=>'payment_amount_new', 'value'=>$payment_amount_new, 'id'=>'payment_amount_new', 'class'=>'form-control input-sm'));?>
+						<?php echo form_input(['name' => 'payment_amount_new', 'value' => $payment_amount_new, 'id' => 'payment_amount_new', 'class' => 'form-control input-sm']) //TODO: potentially we need to add type to be float/decimal/numeric to reduce improper data entry ?>
 						<?php if(currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 						<?php endif; ?>
 					</div>
 				</div>
@@ -66,47 +83,47 @@
 		{
 		?>
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_payment'), 'payment_'.$i, array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Sales.payment'), "payment_$i", ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
 					<?php // no editing of Gift Card payments as it's a complex change ?>
-					<?php echo form_hidden('payment_id_'.$i, $row->payment_id); ?>
-					<?php if( !empty(strstr($row->payment_type, $this->lang->line('sales_giftcard'))) ): ?>
-						<?php echo form_input(array('name'=>'payment_type_'.$i, 'value'=>$row->payment_type, 'id'=>'payment_type_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+					<?php echo form_hidden("payment_id_$i", $row->payment_id) ?>
+					<?php if( !empty(strstr($row->payment_type, lang('Sales.giftcard'))) ): ?>
+						<?php echo form_input (['name' => "payment_type_$i", 'value' => esc($row->payment_type, 'attr'), 'id' => "payment_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?>
 					<?php else: ?>
-						<?php echo form_dropdown('payment_type_'.$i, $payment_options, $row->payment_type, array('id'=>'payment_types_'.$i, 'class'=>'form-control')); ?>
+						<?php echo form_dropdown("payment_type_$i", esc($payment_options, 'attr'), esc($row->payment_type, 'attr'), ['id' => "payment_types_$i", 'class' => 'form-control']) ?>
 					<?php endif; ?>
 				</div>
 				<div class='col-xs-4'>
 					<div class="input-group input-group-sm">
 						<?php if(!currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol, 'attr') ?></b></span>
 						<?php endif; ?>
-						<?php echo form_input(array('name'=>'payment_amount_'.$i, 'value'=>$row->payment_amount, 'id'=>'payment_amount_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+						<?php echo form_input (['name' => "payment_amount_$i", 'value' => $row->payment_amount, 'id' => "payment_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true'])	//TODO: add type attribute ?>
 						<?php if(currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 						<?php endif; ?>
 					</div>
 				</div>
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('sales_refund'), 'refund_'.$i, array('class'=>'control-label col-xs-3')); ?>
+				<?php echo form_label(lang('Sales.refund'), "refund_$i", ['class' => 'control-label col-xs-3']) ?>
 				<div class='col-xs-4'>
 					<?php // no editing of Gift Card payments as it's a complex change ?>
-					<?php if( !empty(strstr($row->payment_type, $this->lang->line('sales_giftcard'))) ): ?>
-						<?php echo form_input(array('name'=>'refund_type_'.$i, 'value'=>$this->lang->line('sales_cash'), 'id'=>'refund_type_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+					<?php if( !empty(strstr($row->payment_type, lang('Sales.giftcard')))): ?>
+						<?php echo form_input (['name' => "refund_type_$i", 'value'=>lang('Sales.cash'), 'id' => "refund_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?>
 					<?php else: ?>
-						<?php echo form_dropdown('refund_type_'.$i, $payment_options, $this->lang->line('sales_cash'), array('id'=>'refund_types_'.$i, 'class'=>'form-control')); ?>
+						<?php echo form_dropdown("refund_type_$i", esc($payment_options, 'attr'), lang('Sales.cash'), ['id' => "refund_types_$i", 'class' => 'form-control']) ?>
 					<?php endif; ?>
 				</div>
 				<div class='col-xs-4'>
 					<div class="input-group input-group-sm">
 						<?php if(!currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 						<?php endif; ?>
-						<?php echo form_input(array('name'=>'refund_amount_'.$i, 'value'=>$row->cash_refund, 'id'=>'refund_amount_'.$i, 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
+						<?php echo form_input (['name' => "refund_amount_$i", 'value' => $row->cash_refund, 'id' => "refund_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?>
 						<?php if(currency_side()): ?>
-							<span class="input-group-addon input-sm"><b><?php echo $this->config->item('currency_symbol'); ?></b></span>
+							<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->currency_symbol) ?></b></span>
 						<?php endif; ?>
 					</div>
 				</div>
@@ -114,41 +131,41 @@
 		<?php 
 			++$i;
 		}
-		echo form_hidden('number_of_payments', $i);			
+		echo form_hidden('number_of_payments', $i);
 		?>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('sales_customer'), 'customer', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Sales.customer'), 'customer', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array('name'=>'customer_name', 'value'=>$selected_customer_name, 'id'=>'customer_name', 'class'=>'form-control input-sm'));?>
-				<?php echo form_hidden('customer_id', $selected_customer_id);?>
+				<?php echo form_input (['name' => 'customer_name', 'value' => esc($selected_customer_name, 'attr'), 'id' => 'customer_name', 'class' => 'form-control input-sm']) ?>
+				<?php echo form_hidden('customer_id', $selected_customer_id) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('sales_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Sales.employee'), 'employee', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_input(array('name'=>'employee_name', 'value'=>$selected_employee_name, 'id'=>'employee_name', 'class'=>'form-control input-sm'));?>
-				<?php echo form_hidden('employee_id', $selected_employee_id);?>
+				<?php echo form_input (['name' => 'employee_name', 'value' => esc($selected_employee_name, 'attr'), 'id' => 'employee_name', 'class' => 'form-control input-sm']) ?>
+				<?php echo form_hidden('employee_id', $selected_employee_id) ?>
 			</div>
 		</div>
 		
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('sales_comment'), 'comment', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Sales.comment'), 'comment', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-8'>
-				<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
+				<?php echo form_textarea (['name' => 'comment', 'value' => esc($sale_info['comment'], 'attr'), 'id' => 'comment', 'class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 	</fieldset>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 $(document).ready(function()
 {	
 	<?php if(!empty($sale_info['email'])): ?>
 		$('#send_invoice').click(function(event) {
-			if (confirm("<?php echo $this->lang->line('sales_invoice_confirm') . ' ' . $sale_info['email'] ?>")) {
-				$.get("<?php echo site_url($controller_name . '/send_pdf/' . $sale_info['sale_id']); ?>",
+			if (confirm("<?php echo lang('Sales.invoice_confirm') . ' ' . $sale_info['email'] ?>")) {
+				$.get("<?php echo esc(site_url("$controller_name/send_pdf/" . $sale_info['sale_id']), 'url') ?>",
 					function(response) {
 						BootstrapDialog.closeAll();
 						$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -158,7 +175,7 @@ $(document).ready(function()
 		});
 	<?php endif; ?>
 	
-	<?php $this->load->view('partial/datepicker_locale'); ?>
+	<?php echo view('partial/datepicker_locale') ?>
 
 	var fill_value_customer = function(event, ui) {
 		event.preventDefault();
@@ -167,7 +184,7 @@ $(document).ready(function()
 	};
 
 	$('#customer_name').autocomplete( {
-		source: "<?php echo site_url('customers/suggest'); ?>",
+		source: "<?php echo site_url('customers/suggest') ?>",
 		minChars: 0,
 		delay: 15, 
 		cacheLength: 1,
@@ -183,7 +200,7 @@ $(document).ready(function()
 	};
 
 	$('#employee_name').autocomplete( {
-		source: "<?php echo site_url('employees/suggest'); ?>",
+		source: "<?php echo site_url('employees/suggest') ?>",
 		minChars: 0,
 		delay: 15, 
 		cacheLength: 1,
@@ -194,12 +211,12 @@ $(document).ready(function()
 
 	$('button#delete').click(function() {
 		dialog_support.hide();
-		table_support.do_delete("<?php echo site_url($controller_name); ?>", <?php echo $sale_info['sale_id']; ?>);
+		table_support.do_delete("<?php echo esc(site_url($controller_name), 'url') ?>", <?php echo $sale_info['sale_id'] ?>);
 	});
 
 	$('button#restore').click(function() {
 		dialog_support.hide();
-		table_support.do_restore("<?php echo site_url($controller_name); ?>", <?php echo $sale_info['sale_id']; ?>);
+		table_support.do_restore("<?php echo esc(site_url($controller_name), 'url') ?>", <?php echo $sale_info['sale_id'] ?>);
 	});
 
 	$('#sales_edit_form').validate($.extend( {
@@ -208,12 +225,7 @@ $(document).ready(function()
 				success: function(response)
 				{
 					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
-
-					const params = $.param(table_support.query_params());
-					$.get("<?php echo site_url($controller_name); ?>/search?" + params, function(response) {
-						$("#payment_summary").html(response.payment_summary);
-					}, 'json');
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
 				},
 				dataType: 'json'
 			});
@@ -227,10 +239,10 @@ $(document).ready(function()
 			{
 				remote:
 				{
-					url: "<?php echo site_url($controller_name . '/check_invoice_number')?>",
+					url: "<?php echo esc(site_url("$controller_name/check_invoice_number"), 'url') ?>",
 					type: 'POST',
 					data: {
-						'sale_id': <?php echo $sale_info['sale_id']; ?>,
+						'sale_id': <?php echo $sale_info['sale_id'] ?>,
 						'invoice_number': function() {
 							return $('#invoice_number').val();
 						}
@@ -241,7 +253,7 @@ $(document).ready(function()
 
 		messages: 
 		{
-			invoice_number: "<?php echo $this->lang->line("sales_invoice_number_duplicate"); ?>"
+			invoice_number: "<?php echo lang('Sales.invoice_number_duplicate') ?>"
 		}
 	}, form_support.error));
 });
diff --git a/app/Views/sales/invoice.php b/app/Views/sales/invoice.php
old mode 100755
new mode 100644
index 276cc1c61..470d6eb01
--- a/app/Views/sales/invoice.php
+++ b/app/Views/sales/invoice.php
@@ -1,9 +1,29 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $sale_id_num
+ * @var bool $print_after_sale
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $invoice_number
+ * @var string $transaction_date
+ * @var float $total
+ * @var bool $include_hsn
+ * @var string $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var array $payments
+ * @var float $amount_change
+ * @var string $barcode
+ * @var int $sale_id
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if(isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
@@ -14,7 +34,7 @@ $(document).ready(function()
 {
 	var send_email = function()
 	{
-		$.get('<?php echo site_url() . "sales/send_pdf/" . $sale_id_num; ?>',
+		$.get('<?php echo site_url() . "sales/send_pdf/$sale_id_num" ?>',
 			function(response)
 			{
 				$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
@@ -31,27 +51,27 @@ $(document).ready(function()
 </script>
 <?php endif; ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => $print_after_sale, 'selected_printer' => 'invoice_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
-	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
+	<?php /* this line will allow to print and go back to sales automatically.... echo anchor('sales', '<span class=\'glyphicon glyphicon-print\'>&nbsp</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();')); */ ?>
 	<?php if(isset($customer_email) && !empty($customer_email)): ?>
-		<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . $this->lang->line('sales_send_invoice'); ?></div></a>
+		<a href="javascript:void(0);"><div class="btn btn-info btn-sm" id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . lang('Sales.send_invoice') ?></div></a>
 	<?php endif; ?>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
-	<?php echo anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>
+	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+	<?php echo anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 </div>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_invoice'); ?></div>
+	<div id="header"><?php echo lang('Sales.invoice') ?></div>
 	<div id="block1">
 		<div id="customer-title">
 			<?php
 			if(isset($customer))
 			{
 			?>
-				<div id="customer"><?php echo nl2br($customer_info) ?></div>
+				<div id="customer"><?php echo nl2br(esc($customer_info)) ?></div>
 			<?php
 			}
 			?>
@@ -59,19 +79,19 @@ $(document).ready(function()
 
 		<div id="logo">
 			<?php
-			if($this->Appconfig->get('company_logo') != '')
+			if(config('OSPOS')->company_logo != '')
 			{
 			?>
-				<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo base_url('uploads/' . config('OSPOS')->company_logo) ?>" alt="company_logo" />
 			<?php
 			}
 			?>
 			<div>&nbsp</div>
 			<?php
-			if($this->Appconfig->get('receipt_show_company_name'))
+			if(config('OSPOS')->receipt_show_company_name)
 			{
 			?>
-				<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+				<div id="company_name"><?php echo config('OSPOS')->company ?></div>
 			<?php
 			}
 			?>
@@ -79,79 +99,79 @@ $(document).ready(function()
 	</div>
 
 	<div id="block2">
-		<div id="company-title"><?php echo nl2br($company_info) ?></div>
+		<div id="company-title"><?php echo nl2br(esc($company_info)) ?></div>
 		<table id="meta">
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
-				<td><?php echo $invoice_number; ?></td>
+				<td class="meta-head"><?php echo lang('Sales.invoice_number') ?> </td>
+				<td><?php echo esc($invoice_number) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><?php echo $transaction_date; ?></td>
+				<td class="meta-head"><?php echo lang('Common.date') ?></td>
+				<td><?php echo esc($transaction_date) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_total'); ?></td>
-				<td><?php echo to_currency($total); ?></td>
+				<td class="meta-head"><?php echo lang('Sales.invoice_total') ?></td>
+				<td><?php echo to_currency($total) ?></td>
 			</tr>
 		</table>
 	</div>
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
 			<?php
 				$invoice_columns = 6;
 				if($include_hsn)
 				{
 					$invoice_columns += 1;
 					?>
-					<th><?php echo $this->lang->line('sales_hsn'); ?></th>
+					<th><?php echo lang('Sales.hsn') ?></th>
 					<?php
 				}
 			?>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
 			<?php
 			if($discount > 0)
 			{
 				$invoice_columns += 1;
 				?>
-				<th><?php echo $this->lang->line('sales_customer_discount'); ?></th>
+				<th><?php echo lang('Sales.customer_discount') ?></th>
 			<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
+					<td><?php echo esc($item['item_number']) ?></td>
 					<?php if($include_hsn): ?>
-						<td style='text-align:center;'><?php echo $item['hsn_code']; ?></td>
+						<td style='text-align:center;'><?php echo esc($item['hsn_code']) ?></td>
 					<?php endif; ?>
-					<td class="item-name"><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name'] . ' ' . $item['attribute_values']; ?></td>
-					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
+					<td class="item-name"><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name'] . ' ' . $item['attribute_values'] ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
 					<?php if($discount > 0): ?>
-					<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+					<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']) ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 				<?php
 				if($item['is_serialized'])
 				{
 				?>
 					<tr class="item-row">
-						<td class="item-description" colspan="<?php echo $invoice_columns-1; ?>"></td>
-						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
+						<td class="item-description" colspan="<?php echo $invoice_columns-1 ?>"></td>
+						<td style='text-align:center;'><?php echo $item['serialnumber'] //TODO: serialnumber does not match variable naming conventions for this project. ?></td>
 					</tr>
 				<?php
 				}
@@ -160,13 +180,13 @@ $(document).ready(function()
 		?>
 
 		<tr>
-			<td class="blank" colspan="<?php echo $invoice_columns; ?>" align="center"><?php echo '&nbsp;'; ?></td>
+			<td class="blank" colspan="<?php echo $invoice_columns ?>" style="text-align: center;"><?php echo '&nbsp;' ?></td>
 		</tr>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank-bottom"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal) ?></td>
 		</tr>
 
 		<?php
@@ -174,33 +194,33 @@ $(document).ready(function()
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
-			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+			$splitpayment = explode(':', $payment['payment_type']);	//TODO: $splitpayment does not meet variable naming standards for this project.
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
-				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0] ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ) ?></td>
 			</tr>
 		<?php
 		}
@@ -209,9 +229,9 @@ $(document).ready(function()
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
-				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo lang('Sales.giftcard_balance') ?></td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value) ?></td>
 			</tr>
 			<?php
 		}
@@ -220,9 +240,9 @@ $(document).ready(function()
 		{
 		?>
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></td>
-			<td class="total-value" id="change"><?php echo to_currency($amount_change); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?></td>
+			<td class="total-value" id="change"><?php echo to_currency($amount_change) ?></td>
 		</tr>
 		<?php
 		}
@@ -233,15 +253,15 @@ $(document).ready(function()
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div><?php echo nl2br($this->config->item('payment_message')); ?></div>
-				<div style='padding:4%;'><?php echo empty($comments) ? '' : $this->lang->line('sales_comments') . ': ' . $comments; ?></div>
-				<div style='padding:4%;'><?php echo $this->config->item('invoice_default_comments'); ?></div>
+				<span><?php echo nl2br(esc(config('OSPOS')->payment_message)) ?></span>
+				<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . ': ' . esc($comments) ?></span>
+				<span style='padding:4%;'><?php echo esc(config('OSPOS')->invoice_default_comments) ?></span>
 			</h5>
-			<div style='padding:2%;'><?php echo nl2br($this->config->item('return_policy')); ?></div>
+			<div style='padding:2%;'><?php echo nl2br(esc(config('OSPOS')->return_policy)) ?></div>
 		</div>
 		<div id='barcode'>
-			<img style='padding-top:4%;' src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-			<?php echo $sale_id; ?>
+			<img alt='<?php echo esc($barcode, 'attr') ?>' style='padding-top:4%;' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+			<?php echo $sale_id ?>
 		</div>
 	</div>
 </div>
@@ -252,7 +272,7 @@ $(window).on("load", function()
 	// install firefox addon in order to use this plugin
 	if(window.jsPrintSetup)
 	{
-		<?php if(!$this->Appconfig->get('print_header'))
+		<?php if(!config('OSPOS')->print_header)
 		{
 		?>
 			// set page header
@@ -262,7 +282,7 @@ $(window).on("load", function()
 		<?php
 		}
 
-		if(!$this->Appconfig->get('print_footer'))
+		if(!config('OSPOS')->print_footer)
 		{
 		?>
 			// set empty page footer
@@ -276,4 +296,4 @@ $(window).on("load", function()
 });
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/invoice_email.php b/app/Views/sales/invoice_email.php
index 0706e509b..0a6df0594 100644
--- a/app/Views/sales/invoice_email.php
+++ b/app/Views/sales/invoice_email.php
@@ -1,8 +1,28 @@
+<?php
+/**
+ * @var string $mimetype
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $invoice_number
+ * @var string $transaction_date
+ * @var float $amount_due
+ * @var float $total
+ * @var float $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var array $payments
+ * @var float $amount_change
+ * @var string $barcode
+ * @var int $sale_id
+ */
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<html lang="<?php echo $this->request->getLocale() ?>">
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css';?>"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css' ?>"/>
+	<title><?php echo lang('Sales.email_receipt') ?></title>
 </head>
 
 <body>
@@ -10,48 +30,48 @@
 <?php
 if(isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_invoice'); ?></div>
+	<div id="header"><?php echo lang('Sales.invoice') ?></div>
 	<table id="info">
 		<tr>
 			<td id="logo">
-				<?php if($this->config->item('company_logo') != '')
+				<?php if(config('OSPOS')->company_logo != '')
 				{
 				?>
-					<img id="image" src="data:<?=$mimetype?>;base64,<?php echo base64_encode(file_get_contents('uploads/' . $this->config->item('company_logo'))); ?>" alt="company_logo" />
+					<img id="image" src="data:<?php echo esc($mimetype) ?>;base64,<?php echo base64_encode(file_get_contents('uploads/' . esc(config('OSPOS')->company_logo))) ?>" alt="company_logo" />
 				<?php
 				}
 				?>
 			</td>
-			<td id="customer-title" id="customer"><?php if(isset($customer)) { echo nl2br($customer_info); } ?></td>
+			<td id="customer-title" id="customer"><?php if(isset($customer)) { echo nl2br(esc($customer_info)); } ?></td>
 		</tr>
 		<tr>
 			<td id="company-title" id="company">
-				<?php echo $this->config->item('company'); ?><br/>
-				<?php echo nl2br($company_info); ?>
+				<?php echo esc(config('OSPOS')->company) ?><br/>
+				<?php echo nl2br(esc($company_info)) ?>
 			</td>
 			<td id="meta">
 				<table id="meta-content"  align="right">
 				<tr>
-					<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?></td>
-					<td><?php echo $invoice_number; ?></td>
+					<td class="meta-head"><?php echo lang('Sales.invoice_number') ?></td>
+					<td><?php echo esc($invoice_number) ?></td>
 				</tr>
 				<tr>
-					<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-					<td><?php echo $transaction_date; ?></td>
+					<td class="meta-head"><?php echo lang('Common.date') ?></td>
+					<td><?php echo esc($transaction_date) ?></td>
 				</tr>
 				<?php
 				if($amount_due > 0)
 				{
 				?>
 					<tr>
-						<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-						<td class="due"><?php echo to_currency($total); ?></td>
+						<td class="meta-head"><?php echo lang('Sales.amount_due') ?></td>
+						<td class="due"><?php echo to_currency($total) ?></td>
 					</tr>
 				<?php
 				}
@@ -63,22 +83,22 @@ if(isset($error_message))
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
 			<?php
 			$invoice_columns = 6;
 			if($discount > 0)
 			{
 				$invoice_columns = $invoice_columns + 1;
 			?>
-				<th><?php echo $this->lang->line('sales_customer_discount'); ?></th>
+				<th><?php echo lang('Sales.customer_discount') ?></th>
 			<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
@@ -88,15 +108,15 @@ if(isset($error_message))
 			{
 		?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
+					<td><?php echo $item['item_number'] ?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
 					<?php if ($item['discount'] > 0): ?>
-						<td><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+						<td><?php echo to_currency($item['discounted_total'] / $item['quantity']) ?></td>
 					<?php endif; ?>
-					<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
+					<td class="total-line"><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 		<?php
 			}
@@ -104,32 +124,32 @@ if(isset($error_message))
 		?>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns; ?>" align="center"><?php echo '&nbsp;'; ?></td>
+			<td colspan="<?php echo $invoice_columns ?>" align="center"><?php echo '&nbsp;' ?></td>
 		</tr>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td id="subtotal" class="total-value"><?php echo to_currency($subtotal); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td id="subtotal" class="total-value"><?php echo to_currency($subtotal) ?></td>
 		</tr>
 
 		<?php
-		foreach($taxes as $tax_group_index=>$tax)
+		foreach($taxes as $tax_group_index => $tax)
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-				<td id="taxes" class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+				<td id="taxes" class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td id="total" class="total-value"><?php echo to_currency($total); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td id="total" class="total-value"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<?php
@@ -138,14 +158,14 @@ if(isset($error_message))
 
 		foreach($payments as $payment_id=>$payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
-			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+			$splitpayment = explode(':', $payment['payment_type']);	//TODO: $splitpayment does not meet the variable naming conventions for this project
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
-				<td class="total-value"><?php echo to_currency(-$payment['payment_amount']); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0] ?></td>
+				<td class="total-value"><?php echo to_currency(-$payment['payment_amount']) ?></td>
 			</tr>
 		<?php
 		}
@@ -156,9 +176,9 @@ if(isset($error_message))
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
-				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo lang('Sales.giftcard_balance') ?></td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value) ?></td>
 			</tr>
 		<?php
 		}
@@ -169,9 +189,9 @@ if(isset($error_message))
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></td>
-				<td class="total-value"><?php echo to_currency($amount_change); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?></td>
+				<td class="total-value"><?php echo to_currency($amount_change) ?></td>
 			</tr>
 		<?php
 		}
@@ -181,14 +201,14 @@ if(isset($error_message))
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div><?php echo nl2br($this->config->item('payment_message')); ?></div>
-				<div><?php echo $this->lang->line('sales_comments') . ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></div>
+				<span><?php echo nl2br(config('OSPOS')->payment_message) ?></span>
+				<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? config('OSPOS')->invoice_default_comments : $comments) ?></span>
 			</h5>
-			<?php echo nl2br($this->config->item('return_policy')); ?>
+			<?php echo nl2br(config('OSPOS')->return_policy) ?>
 		</div>
 		<div id='barcode'>
-			<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-			<?php echo $sale_id; ?>
+			<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+			<?php echo $sale_id ?>
 		</div>
 	</div>
 </div>
diff --git a/app/Views/sales/manage.php b/app/Views/sales/manage.php
old mode 100755
new mode 100644
index b5b920bde..978184ba1
--- a/app/Views/sales/manage.php
+++ b/app/Views/sales/manage.php
@@ -1,4 +1,11 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var string $table_headers
+ * @var array $filters
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -9,37 +16,31 @@ $(document).ready(function()
 	});
 	
 	// load the preset datarange picker
-	<?php $this->load->view('partial/daterangepicker'); ?>
+	<?php echo view('partial/daterangepicker') ?>
 
 	$("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
 		table_support.refresh();
 	});
 
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
-
-	table_support.query_params = function()
-	{
-		return {
-			start_date: start_date,
-			end_date: end_date,
-			filters: $("#filters").val() || [""]
-		}
-	};
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name),'url') ?>',
+		headers: <?php echo esc($table_headers, 'js') ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'sale_id',
 		onLoadSuccess: function(response) {
 			if($("#table tbody tr").length > 1) {
 				$("#payment_summary").html(response.payment_summary);
 				$("#table tbody tr:last td:first").html("");
-				$("#table tbody tr:last").css('font-weight', 'bold');
 			}
 		},
 		queryParams: function() {
-			return $.extend(arguments[0], table_support.query_params());
+			return $.extend(arguments[0], {
+				start_date: start_date,
+				end_date: end_date,
+				filters: $("#filters").val() || [""]
+			});
 		},
 		columns: {
 			'invoice': {
@@ -50,23 +51,23 @@ $(document).ready(function()
 });
 </script>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'takings_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale'=>false, 'selected_printer' => 'takings_printer']) ?>
 
 <div id="title_bar" class="print_hide btn-toolbar">
 	<button onclick="javascript:printdoc()" class='btn btn-info btn-sm pull-right'>
-		<span class="glyphicon glyphicon-print">&nbsp</span><?php echo $this->lang->line('common_print'); ?>
+		<span class="glyphicon glyphicon-print">&nbsp</span><?php echo lang('Common.print') ?>
 	</button>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm pull-right', 'id'=>'show_sales_button')); ?>
+	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm pull-right', 'id' => 'show_sales_button']) ?>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
 		<button id="delete" class="btn btn-default btn-sm print_hide">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 
-		<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
-		<?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+		<?php echo form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
+		<?php echo form_multiselect('filters[]', esc($filters), [''], ['id' => 'filters', 'data-none-selected-text'=>lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 	</div>
 </div>
 
@@ -77,4 +78,4 @@ $(document).ready(function()
 <div id="payment_summary">
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/quote.php b/app/Views/sales/quote.php
index 7bb2df179..a0cd4462c 100644
--- a/app/Views/sales/quote.php
+++ b/app/Views/sales/quote.php
@@ -1,9 +1,25 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var int $sale_id_num
+ * @var bool $print_after_sale
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $quote_number
+ * @var string $transaction_date
+ * @var float $total
+ * @var float $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var array $payments
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if (isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
@@ -14,7 +30,7 @@ if (isset($error_message))
 		{
 			var send_email = function()
 			{
-				$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num . "/quote"; ?>',
+				$.get('<?php echo site_url() . esc("/sales/send_pdf/$sale_id_num/quote") ?>',
 					function(response)
 					{
 						$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -31,27 +47,27 @@ if (isset($error_message))
 	</script>
 <?php endif; ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => $print_after_sale, 'selected_printer' => 'invoice_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
-	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
+	<?php /* this line will allow to print and go back to sales automatically.... echo anchor('sales', '<span class=\'glyphicon glyphicon-print\'>&nbsp</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();']); */ ?>
 	<?php if(isset($customer_email) && !empty($customer_email)): ?>
-		<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . $this->lang->line('sales_send_quote'); ?></div></a>
+		<a href="javascript:void(0);"><div class="btn btn-info btn-sm" id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . lang('Sales.send_quote') ?></div></a>
 	<?php endif; ?>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
-	<?php echo anchor("sales/discard_suspended_sale", '<span class="glyphicon glyphicon-remove">&nbsp</span>' . $this->lang->line('sales_discard'), array('class'=>'btn btn-danger btn-sm', 'id'=>'discard_quote_button')); ?>
+	<?php echo anchor('sales', '<span class=\'glyphicon glyphicon-shopping-cart\'>&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+	<?php echo anchor('sales/discard_suspended_sale', '<span class="glyphicon glyphicon-remove">&nbsp</span>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_quote_button']) ?>
 </div>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_quote'); ?></div>
+	<div id="header"><?php echo lang('Sales.quote') ?></div>
 	<div id="block1">
 		<div id="customer-title">
 			<?php
 			if(isset($customer))
 			{
 			?>
-				<div id="customer"><?php echo nl2br($customer_info) ?></div>
+				<div id="customer"><?php echo nl2br(esc($customer_info)) ?></div>
 			<?php
 			}
 			?>
@@ -59,19 +75,19 @@ if (isset($error_message))
 
 		<div id="logo">
 			<?php
-			if($this->Appconfig->get('company_logo') != '')
+			if(config('OSPOS')->company_logo != '')
 			{
 			?>
-				<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->company_logo, 'url')) ?>" alt="company_logo" />
 			<?php
 			}
 			?>
 			<div>&nbsp</div>
 			<?php
-			if($this->Appconfig->get('receipt_show_company_name'))
+			if(config('OSPOS')->receipt_show_company_name)
 			{
 			?>
-				<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+				<div id="company_name"><?php echo esc(config('OSPOS')->company) ?></div>
 			<?php
 			}
 			?>
@@ -79,67 +95,67 @@ if (isset($error_message))
 	</div>
 
 	<div id="block2">
-		<div id="company-title"><?php echo nl2br($company_info) ?></div>
+		<div id="company-title"><?php echo nl2br(esc($company_info)) ?></div>
 		<table id="meta">
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?></td>
-				<td><?php echo $quote_number; ?></td>
+				<td class="meta-head"><?php echo lang('Sales.quote_number') ?></td>
+				<td><?php echo esc($quote_number) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><?php echo $transaction_date; ?></td>
+				<td class="meta-head"><?php echo lang('Common.date') ?></td>
+				<td><?php echo esc($transaction_date) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_total'); ?></td>
-				<td><?php echo to_currency($total); ?></td>
+				<td class="meta-head"><?php echo lang('Sales.invoice_total') ?></td>
+				<td><?php echo to_currency($total) ?></td>
 			</tr>
 		</table>
 	</div>
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
 			<?php
 			$quote_columns = 6;
 			if($discount > 0)
 			{
 				$quote_columns = $quote_columns + 1;
 			?>
-				<th><?php echo $this->lang->line('sales_customer_discount'); ?></th>
+				<th><?php echo lang('Sales.customer_discount') ?></th>
 			<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
+					<td><?php echo esc($item['item_number']) ?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
 					<?php if($discount > 0): ?>
-						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']) ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 
 				<?php if($item['is_serialized'])
 				{
 				?>
 					<tr class="item-row">
-						<td class="item-name" colspan="<?php echo $quote_columns-1; ?>"></td>
-						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
+						<td class="item-name" colspan="<?php echo $quote_columns-1 ?>"></td>
+						<td style='text-align:center;'><?php echo esc($item['serialnumber']) //TODO: the variable serialnumber does not meet naming conventions for this project?></td>
 					</tr>
 				<?php
 				}
@@ -148,47 +164,48 @@ if (isset($error_message))
 		?>
 
 		<tr>
-			<td class="blank" colspan="<?php echo $quote_columns; ?>" align="center"><?php echo '&nbsp;'; ?></td>
+			<td class="blank" colspan="<?php echo $quote_columns ?>" style="text-align: center;"><?php echo '&nbsp;' //TODO: align is deprecated.  Also should replace the php echo for nbsp with simple html?></td>
 		</tr>
 
 		<tr>
-			<td colspan="<?php echo $quote_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
+			<td colspan="<?php echo $quote_columns-3 ?>" class="blank-bottom"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal) ?></td>
 		</tr>
 
 		<?php
-		foreach($taxes as $tax_group_index=>$tax)
+		foreach($taxes as $tax_group_index => $tax)
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+				<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<tr>
-			<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
+			<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
 			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
-				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
+				<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0] ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency($payment['payment_amount']) ?></td>
 			</tr>
 		<?php
 		}
@@ -197,8 +214,8 @@ if (isset($error_message))
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div style='padding:4%;'><?php echo empty($comments) ? '' : $this->lang->line('sales_comments') . ': ' . $comments; ?></div>
-				<div style='padding:4%;'><?php echo $this->config->item('quote_default_comments'); ?></div>
+				<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . ': ' . esc($comments) ?></span>
+				<span style='padding:4%;'><?php echo esc(config('OSPOS')->quote_default_comments) ?></span>
 			</h5>
 		</div>
 	</div>
@@ -211,7 +228,7 @@ if (isset($error_message))
 		if (window.jsPrintSetup)
 		{
 			<?php
-			if(!$this->Appconfig->get('print_header'))
+			if(!config('OSPOS')->print_header)
 			{
 			?>
 				// set page header
@@ -221,7 +238,7 @@ if (isset($error_message))
 			<?php
 			}
 
-			if(!$this->Appconfig->get('print_footer'))
+			if(!config('OSPOS')->print_footer)
 			{
 			?>
 				// set empty page footer
@@ -235,4 +252,4 @@ if (isset($error_message))
 	});
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/quote_email.php b/app/Views/sales/quote_email.php
index 5826c366a..ac870779a 100644
--- a/app/Views/sales/quote_email.php
+++ b/app/Views/sales/quote_email.php
@@ -1,60 +1,75 @@
+<?php
+/**
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $quote_number
+ * @var string $transaction_date
+ * @var float $amount_due
+ * @var float $total
+ * @var float $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ */
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<html lang="<?php echo $this->request->getLocale() ?>">
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css';?>"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css' ?>"/>
+	<title><?php echo lang('Sales.send_quote') ?></title>
 </head>
 
 <body>
 <?php
 	if(isset($error_message))
 	{
-		echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+		echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 		exit;
 	}
 ?>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_quote'); ?></div>
+	<div id="header"><?php echo lang('Sales.quote') ?></div>
 	<table id="info">
 		<tr>
 			<td id="logo">
-				<?php if($this->config->item('company_logo') != '')
+				<?php if(config('OSPOS')->company_logo != '')
 				{
 				?>
-					<img id="image" src="<?php echo 'uploads/' . $this->config->item('company_logo'); ?>" alt="company_logo" />
+					<img id="image" src="<?php echo 'uploads/' . esc(config('OSPOS')->company_logo,'url') ?>" alt="company_logo" />
 				<?php
 				}
 				?>
 			</td>
 			<td id="customer-title">
-				<pre><?php if(isset($customer)) { echo $customer_info; } ?></pre>
+				<pre><?php if(isset($customer)) { echo esc($customer_info); } ?></pre>
 			</td>
 		</tr>
 		<tr>
 			<td id="company-title">
 				<div id="company">
-					<?php echo $this->config->item('company'); ?>
-					<?php echo nl2br($company_info); ?>
+					<?php echo esc(config('OSPOS')->company) ?>
+					<?php echo nl2br(esc($company_info)) ?>
 				</div>
 			</td>
 			<td id="meta">
 				<table id="meta-content"  align="right">
 					<tr>
-						<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?> </td>
-						<td><?php echo $quote_number; ?></td>
+						<td class="meta-head"><?php echo lang('Sales.quote_number') ?> </td>
+						<td><?php echo esc($quote_number) ?></td>
 					</tr>
 					<tr>
-						<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-						<td><?php echo $transaction_date; ?></td>
+						<td class="meta-head"><?php echo lang('Common.date') ?></td>
+						<td><?php echo $transaction_date ?></td>
 					</tr>
 					<?php
 					if($amount_due > 0)
 					{
 					?>
 						<tr>
-							<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-							<td class="due"><?php echo to_currency($total); ?></td>
+							<td class="meta-head"><?php echo lang('Sales.amount_due') ?></td>
+							<td class="due"><?php echo to_currency($total) ?></td>
 						</tr>
 					<?php
 					}
@@ -66,40 +81,40 @@
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
 			<?php
 			$quote_columns = 6;
 			if($discount > 0)
 			{
 				$quote_columns = $quote_columns + 1;
 				?>
-				<th><?php echo $this->lang->line('sales_customer_discount'); ?></th>
+				<th><?php echo lang('Sales.customer_discount') ?></th>
 				<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
+					<td><?php echo esc($item['item_number']) ?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
 					<?php if($discount > 0): ?>
-						<td><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+						<td><?php echo to_currency($item['discounted_total'] / $item['quantity']) ?></td>
 					<?php endif; ?>
-					<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
+					<td class="total-line"><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 			<?php
 			}
@@ -107,45 +122,45 @@
 		?>
 
 		<tr>
-			<td colspan="<?php echo $quote_columns; ?>" align="center"><?php echo '&nbsp;'; ?></td>
+			<td colspan="<?php echo $quote_columns ?>" align="center"><?php echo '&nbsp;' //TODO: Replace the php echo for nbsp with just straight html? ?></td>
 		</tr>
 
 		<tr>
-			<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td id="subtotal" class="total-value"><?php echo to_currency($subtotal); ?></td>
+			<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td id="subtotal" class="total-value"><?php echo to_currency($subtotal) ?></td>
 		</tr>
 
 		<?php
-		foreach($taxes as $tax_group_index=>$tax)
+		foreach($taxes as $tax_group_index => $tax)
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-				<td id="taxes" class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+				<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+				<td id="taxes" class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<tr>
-			<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td id="total" class="total-value"><?php echo to_currency($total); ?></td>
+			<td colspan="<?php echo $quote_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td id="total" class="total-value"><?php echo to_currency($total) ?></td>
 		</tr>
 	</table>
 
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div><?php echo nl2br($this->config->item('payment_message')); ?></div>
-				<div><?php echo $this->lang->line('sales_comments') . ': ' . (empty($comments) ? $this->config->item('quote_default_comments') : $comments); ?></div>
+				<span><?php echo nl2br(esc(config('OSPOS')->payment_message)) ?></span>
+				<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? config('OSPOS')->quote_default_comments : esc($comments)) ?></span>
 			</h5>
-			<?php echo nl2br($this->config->item('return_policy')); ?>
+			<?php echo nl2br(esc(config('OSPOS')->return_policy)) ?>
 		</div>
 		<div id='barcode'>
-			<?php echo $quote_number; ?>
+			<?php echo $quote_number ?>
 		</div>
 	</div>
 </div>
diff --git a/app/Views/sales/receipt.php b/app/Views/sales/receipt.php
index 2107d4f6e..0e60929c9 100644
--- a/app/Views/sales/receipt.php
+++ b/app/Views/sales/receipt.php
@@ -1,9 +1,18 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var int $sale_id_num
+ * @var bool $print_after_sale
+ */
+
+use app\Models\Employee;
+
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if (isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
@@ -14,7 +23,7 @@ if (isset($error_message))
 	{
 		var send_email = function()
 		{
-			$.get('<?php echo site_url() . "/sales/send_receipt/" . $sale_id_num; ?>',
+			$.get('<?php echo site_url() . esc("/sales/send_receipt/$sale_id_num", 'url') ?>',
 				function(response)
 				{
 					$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -31,19 +40,21 @@ if (isset($error_message))
 	</script>
 <?php endif; ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'receipt_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => $print_after_sale, 'selected_printer' => 'receipt_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
 	<?php if(!empty($customer_email)): ?>
-		<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . $this->lang->line('sales_send_receipt'); ?></div></a>
+		<a href="javascript:void(0);"><div class="btn btn-info btn-sm" id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . lang('Sales.send_receipt') ?></div></a>
 	<?php endif; ?>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
-	<?php if($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id'))): ?>
-		<?php echo anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>
+	<?php echo anchor('sales', '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+	<?php
+		$employee = model(Employee::class);
+		if($employee->has_grant('reports_sales', $this->session->get('person_id'))): ?>
+		<?php echo anchor('sales/manage', '<span class=\'glyphicon glyphicon-list-alt\'>&nbsp</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 	<?php endif; ?>
 </div>
 
-<?php $this->load->view("sales/" . $this->config->item('receipt_template')); ?>
+<?php echo view('sales/' . config('OSPOS')->receipt_template) ?>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/receipt_default.php b/app/Views/sales/receipt_default.php
index 19a6445af..581a7aed1 100644
--- a/app/Views/sales/receipt_default.php
+++ b/app/Views/sales/receipt_default.php
@@ -1,30 +1,47 @@
+<?php
+/**
+ * @var string $transaction_time
+ * @var int $sale_id
+ * @var string $invoice_number
+ * @var string $employee
+ * @var array $cart
+ * @var float $discount
+ * @var float $prediscount_subtotal
+ * @var float $subtotal
+ * @var array $taxes
+ * @var float $total
+ * @var array $payments
+ * @var float $amount_change
+ * @var string $barcode
+ */
+?>
 
-<div id="receipt_wrapper" style="font-size:<?php echo $this->config->item('receipt_font_size');?>px">
+<div id="receipt_wrapper" style="font-size:<?php echo config('OSPOS')->receipt_font_size ?>px">
 	<div id="receipt_header">
 		<?php
-		if($this->config->item('company_logo') != '')
+		if(config('OSPOS')->company_logo != '')
 		{
 		?>
 			<div id="company_name">
-				<img id="image" src="<?php echo base_url('uploads/' . $this->config->item('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->company_logo, 'url')) ?>" alt="company_logo" />
 			</div>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_company_name'))
+		if(config('OSPOS')->receipt_show_company_name)
 		{
 		?>
-			<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+			<div id="company_name"><?php echo config('OSPOS')->company ?></div>
 		<?php
 		}
 		?>
 
-		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
-		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
-		<div id="sale_receipt"><?php echo $this->lang->line('sales_receipt'); ?></div>
-		<div id="sale_time"><?php echo $transaction_time ?></div>
+		<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->address)) ?></div>
+		<div id="company_phone"><?php echo esc(config('OSPOS')->phone) ?></div>
+		<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
+		<div id="sale_time"><?php echo($transaction_time) ?></div>
 	</div>
 
 	<div id="receipt_general_info">
@@ -32,33 +49,33 @@
 		if(isset($customer))
 		{
 		?>
-			<div id="customer"><?php echo $this->lang->line('customers_customer').": ".$customer; ?></div>
+			<div id="customer"><?php echo lang('Customers.customer') . esc(": $customer") ?></div>
 		<?php
 		}
 		?>
 
-		<div id="sale_id"><?php echo $this->lang->line('sales_id').": ".$sale_id; ?></div>
+		<div id="sale_id"><?php echo lang('Sales.id') . esc(": $sale_id") ?></div>
 
 		<?php
 		if(!empty($invoice_number))
 		{
 		?>
-			<div id="invoice_number"><?php echo $this->lang->line('sales_invoice_number').": ".$invoice_number; ?></div>
+			<div id="invoice_number"><?php echo lang('Sales.invoice_number') . esc(": $invoice_number") ?></div>
 		<?php
 		}
 		?>
 
-		<div id="employee"><?php echo $this->lang->line('employees_employee').": ".$employee; ?></div>
+		<div id="employee"><?php echo lang('Employees.employee') . esc(": $employee") ?></div>
 	</div>
 
 	<table id="receipt_items">
 		<tr>
-			<th style="width:40%;"><?php echo $this->lang->line('sales_description_abbrv'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('sales_price'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th style="width:20%;" class="total-value"><?php echo $this->lang->line('sales_total'); ?></th>
+			<th style="width:40%;"><?php echo lang('Sales.description_abbrv') ?></th>
+			<th style="width:20%;"><?php echo lang('Sales.price') ?></th>
+			<th style="width:20%;"><?php echo lang('Sales.quantity') ?></th>
+			<th style="width:20%;" class="total-value"><?php echo lang('Sales.total') ?></th>
 			<?php
-			if($this->config->item('receipt_show_tax_ind'))
+			if(config('OSPOS')->receipt_show_tax_ind)
 			{
 			?>
 				<th style="width:20%;"></th>
@@ -67,18 +84,18 @@
 			?>
 		</tr>
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr>
-					<td><?php echo ucfirst($item['name'] . ' ' . $item['attribute_values']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td class="total-value"><?php echo to_currency($item[($this->config->item('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
+					<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td class="total-value"><?php echo to_currency($item[(config('OSPOS')->receipt_show_total_discount ? 'total' : 'discounted_total')]) ?></td>
 					<?php
-					if($this->config->item('receipt_show_tax_ind'))
+					if(config('OSPOS')->receipt_show_tax_ind)
 					{
 					?>
 						<td><?php echo $item['taxed_flag'] ?></td>
@@ -88,17 +105,17 @@
 				</tr>
 				<tr>
 					<?php
-					if($this->config->item('receipt_show_description'))
+					if(config('OSPOS')->receipt_show_description)
 					{
 					?>
-						<td colspan="2"><?php echo $item['description']; ?></td>
+						<td colspan="2"><?php echo esc($item['description']) ?></td>
 					<?php
 					}
 
-					if($this->config->item('receipt_show_serialnumber'))
+					if(config('OSPOS')->receipt_show_serialnumber)
 					{
 					?>
-						<td><?php echo $item['serialnumber']; ?></td>
+						<td><?php echo esc($item['serialnumber']) ?></td>
 					<?php
 					}
 					?>
@@ -112,17 +129,17 @@
 						if($item['discount_type'] == FIXED)
 						{
 						?>
-							<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . " " . $this->lang->line("sales_discount") ?></td>
+							<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . " " . lang('Sales.discount') ?></td>
 						<?php
 						}
 						elseif($item['discount_type'] == PERCENT)
 						{
 						?>
-							<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . " " . $this->lang->line("sales_discount_included") ?></td>
+							<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . " " . lang('Sales.discount_included') ?></td>
 						<?php
 						}	
 						?>
-						<td class="total-value"><?php echo to_currency($item['discounted_total']); ?></td>
+						<td class="total-value"><?php echo to_currency($item['discounted_total']) ?></td>
 					</tr>
 				<?php
 				}
@@ -131,36 +148,36 @@
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_total_discount') && $discount > 0)
+		if(config('OSPOS')->receipt_show_total_discount && $discount > 0)
 		{
 		?>
 			<tr>
-				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($prediscount_subtotal); ?></td>
+				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.sub_total') ?></td>
+				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($prediscount_subtotal) ?></td>
 			</tr>
 			<tr>
-				<td colspan="3" class="total-value"><?php echo $this->lang->line('sales_customer_discount'); ?>:</td>
-				<td class="total-value"><?php echo to_currency($discount * -1); ?></td>
+				<td colspan="3" class="total-value"><?php echo lang('Sales.customer_discount') ?>:</td>
+				<td class="total-value"><?php echo to_currency($discount * -1) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_taxes'))
+		if(config('OSPOS')->receipt_show_taxes)
 		{
 		?>
 			<tr>
-				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
+				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.sub_total') ?></td>
+				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<?php
-			foreach($taxes as $tax_group_index=>$tax)
+			foreach($taxes as $tax_group_index => $tax)
 			{
 			?>
 				<tr>
-					<td colspan="3" class="total-value"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?>:</td>
-					<td class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+					<td colspan="3" class="total-value"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?>:</td>
+					<td class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 				</tr>
 			<?php
 			}
@@ -172,10 +189,10 @@
 		<tr>
 		</tr>
 
-		<?php $border = (!$this->config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
+		<?php $border = (!config('OSPOS')->receipt_show_taxes && !(config('OSPOS')->receipt_show_total_discount && $discount > 0)); ?>
 		<tr>
-			<td colspan="3" style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo to_currency($total); ?></td>
+			<td colspan="3" style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo lang('Sales.total') ?></td>
+			<td style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<tr>
@@ -185,15 +202,15 @@
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
-			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+			$splitpayment = explode(':', $payment['payment_type']);	//TODO: The variable splitpayment does not follow naming conventions for this project
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="3" style="text-align:right;"><?php echo $splitpayment[0]; ?> </td>
-				<td class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
+				<td colspan="3" style="text-align:right;"><?php echo $splitpayment[0] ?> </td>
+				<td class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ) ?></td>
 			</tr>
 		<?php
 		}
@@ -208,24 +225,24 @@
 		{
 		?>
 			<tr>
-				<td colspan="3" style="text-align:right;"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
-				<td class="total-value"><?php echo to_currency($cur_giftcard_value); ?></td>
+				<td colspan="3" style="text-align:right;"><?php echo lang('Sales.giftcard_balance') ?></td>
+				<td class="total-value"><?php echo to_currency($cur_giftcard_value) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 		<tr>
-			<td colspan="3" style="text-align:right;"> <?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> </td>
-			<td class="total-value"><?php echo to_currency($amount_change); ?></td>
+			<td colspan="3" style="text-align:right;"> <?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?> </td>
+			<td class="total-value"><?php echo to_currency($amount_change) ?></td>
 		</tr>
 	</table>
 
 	<div id="sale_return_policy">
-		<?php echo nl2br($this->config->item('return_policy')); ?>
+		<?php echo nl2br(config('OSPOS')->return_policy) ?>
 	</div>
 
 	<div id="barcode">
-		<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-		<?php echo $sale_id; ?>
+		<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+		<?php echo $sale_id ?>
 	</div>
 </div>
diff --git a/app/Views/sales/receipt_email.php b/app/Views/sales/receipt_email.php
index 0a905e4a1..424e15e97 100644
--- a/app/Views/sales/receipt_email.php
+++ b/app/Views/sales/receipt_email.php
@@ -1,30 +1,45 @@
+<?php
+/**
+ * @var string $transaction_time
+ * @var int $sale_id
+ * @var string $employee
+ * @var array $cart
+ * @var float $discount
+ * @var float $subtotal
+ * @var array $taxes
+ * @var float $total
+ * @var array $payments
+ * @var float $amount_change
+ * @var string $barcode
+ */
+?>
 <div id="receipt_wrapper" style="width:100%;">
 	<div id="receipt_header" style="text-align:center;">
 		<?php
-		if($this->config->item('company_logo') != '')
+		if(config('OSPOS')->company_logo != '')
 		{
 		?>
 			<div id="company_name">
-				<img id="image" src="data:image/png;base64,<?php echo base64_encode(file_get_contents('uploads/' . $this->config->item('company_logo'))); ?>" alt="company_logo" />
+				<img id="image" src="data:image/png;base64,<?php echo base64_encode(file_get_contents('uploads/' . config('OSPOS')->company_logo)) ?>" alt="company_logo" />
 			</div>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_company_name'))
+		if(config('OSPOS')->receipt_show_company_name)
 		{
 		?>
-			<div id="company_name" style="font-size:150%; font-weight:bold;"><?php echo $this->config->item('company'); ?></div>
+			<div id="company_name" style="font-size:150%; font-weight:bold;"><?php echo esc(config('OSPOS')->company) ?></div>
 		<?php
 		}
 		?>
 
-		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
-		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
+		<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->address)) ?></div>
+		<div id="company_phone"><?php echo esc(config('OSPOS')->phone) ?></div>
 		<br>
-		<div id="sale_receipt"><?php echo $this->lang->line('sales_receipt'); ?></div>
-		<div id="sale_time"><?php echo $transaction_time ?></div>
+		<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
+		<div id="sale_time"><?php echo esc($transaction_time) ?></div>
 	</div>
 
 	<br>
@@ -34,49 +49,49 @@
 		if(isset($customer))
 		{
 		?>
-			<div id="customer"><?php echo $this->lang->line('customers_customer').": ".$customer; ?></div>
+			<div id="customer"><?php echo lang('Customers.customer') . esc(": $customer") ?></div>
 		<?php
 		}
 		?>
 
-		<div id="sale_id"><?php echo $this->lang->line('sales_id').": ".$sale_id; ?></div>
-		<div id="employee"><?php echo $this->lang->line('employees_employee').": ".$employee; ?></div>
+		<div id="sale_id"><?php echo lang('Sales.id') . esc(": $sale_id") ?></div>
+		<div id="employee"><?php echo lang('Employees.employee') . esc(": $employee") ?></div>
 	</div>
 
 	<br>
 
 	<table id="receipt_items" style="text-align:left;width:100%;">
 		<tr>
-			<th style="width:40%;"><?php echo $this->lang->line('sales_description_abbrv'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('sales_price'); ?></th>
-			<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th style="width:20%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
+			<th style="width:40%;"><?php echo lang('Sales.description_abbrv') ?></th>
+			<th style="width:20%;"><?php echo lang('Sales.price') ?></th>
+			<th style="width:20%;"><?php echo lang('Sales.quantity') ?></th>
+			<th style="width:20%;text-align:right;"><?php echo lang('Sales.total') ?></th>
 		</tr>
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr>
-					<td><?php echo ucfirst($item['name'] . ' ' . $item['attribute_values']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td style="text-align:right;"><?php echo to_currency($item[($this->config->item('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
+					<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td style="text-align:right;"><?php echo to_currency($item[(config('OSPOS')->receipt_show_total_discount ? 'total' : 'discounted_total')]) ?></td>
 				</tr>
 				<tr>
 					<?php
-					if($this->config->item('receipt_show_description'))
+					if(config('OSPOS')->receipt_show_description)
 					{
 					?>
-						<td colspan="2"><?php echo $item['description']; ?></td>
+						<td colspan="2"><?php echo esc($item['description']) ?></td>
 					<?php
 					}
 
-					if($this->config->item('receipt_show_serialnumber'))
+					if(config('OSPOS')->receipt_show_serialnumber)
 					{
 					?>
-						<td><?php echo $item['serialnumber']; ?></td>
+						<td><?php echo esc($item['serialnumber']) ?></td>
 					<?php
 					}
 					?>
@@ -90,53 +105,53 @@
 						if($item['discount_type'] == FIXED)
 						{
 						?>
-							<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . " " . $this->lang->line("sales_discount") ?></td>
+							<td colspan="3" class="discount"><?php echo to_currency($item['discount']) . " " . lang('Sales.discount') ?></td>
 						<?php
 						}
 						elseif($item['discount_type'] == PERCENT)
 						{
 						?>
-							<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . " " . $this->lang->line("sales_discount_included") ?></td>
+							<td colspan="3" class="discount"><?php echo to_decimals($item['discount']) . " " . lang('Sales.discount_included') ?></td>
 						<?php
 						}	
 						?>
-						<td class="total-value"><?php echo to_currency($item['discounted_total']); ?></td>
+						<td class="total-value"><?php echo to_currency($item['discounted_total']) ?></td>
 					</tr>
 				<?php
 				}
 			}
 		}
 
-		if($this->config->item('receipt_show_total_discount') && $discount > 0)
+		if(config('OSPOS')->receipt_show_total_discount && $discount > 0)
 		{
 		?>
 			<tr>
-				<td colspan="3" style="text-align:right;border-top:2px solid #000000;"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style="text-align:right;border-top:2px solid #000000;"><?php echo to_currency($subtotal); ?></td>
+				<td colspan="3" style="text-align:right;border-top:2px solid #000000;"><?php echo lang('Sales.sub_total') ?></td>
+				<td style="text-align:right;border-top:2px solid #000000;"><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<tr>
-				<td colspan="3" style="text-align:right;"><?php echo $this->lang->line('sales_discount'); ?>:</td>
-				<td style="text-align:right;"><?php echo to_currency($discount*-1); ?></td>
+				<td colspan="3" style="text-align:right;"><?php echo lang('Sales.discount') ?>:</td>
+				<td style="text-align:right;"><?php echo to_currency($discount*-1) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_taxes'))
+		if(config('OSPOS')->receipt_show_taxes)
 		{
 		?>
 			<tr>
-				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style="text-align:right;border-top:2px solid #000000;"><?php echo to_currency($subtotal); ?></td>
+				<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.sub_total') ?></td>
+				<td style="text-align:right;border-top:2px solid #000000;"><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<?php
-			foreach($taxes as $tax_group_index=>$tax)
+			foreach($taxes as $tax_group_index => $tax)
 			{
 			?>
 				<tr>
-					<td colspan="3" style="text-align:right;"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?>:</td>
-					<td style="text-align:right;"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+					<td colspan="3" style="text-align:right;"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?>:</td>
+					<td style="text-align:right;"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 				</tr>
 			<?php
 			}
@@ -148,10 +163,10 @@
 		<tr>
 		</tr>
 
-		<?php $border = (!$this->config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
+		<?php $border = (!config('OSPOS')->receipt_show_taxes && !(config('OSPOS')->receipt_show_total_discount && $discount > 0)) ?>
 		<tr>
-			<td colspan="3" style="<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right;"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td style="<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right"><?php echo to_currency($total); ?></td>
+			<td colspan="3" style="<?php echo $border ? 'border-top: 2px solid black;' : '' ?>text-align:right;"><?php echo lang('Sales.total') ?></td>
+			<td style="<?php echo $border ? 'border-top: 2px solid black;' : '' ?>text-align:right"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<tr>
@@ -161,15 +176,15 @@
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
 			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="3" style="text-align:right;"><?php echo $splitpayment[0]; ?> </td>
-				<td style="text-align:right;"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
+				<td colspan="3" style="text-align:right;"><?php echo $splitpayment[0] ?> </td>
+				<td style="text-align:right;"><?php echo to_currency( $payment['payment_amount'] * -1 ) ?></td>
 			</tr>
 		<?php
 		}
@@ -184,15 +199,15 @@
 		{
 		?>
 		<tr>
-			<td colspan="3" style="text-align:right;"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
-			<td style="text-align:right"><?php echo to_currency($cur_giftcard_value); ?></td>
+			<td colspan="3" style="text-align:right;"><?php echo lang('Sales.giftcard_balance') ?></td>
+			<td style="text-align:right"><?php echo to_currency($cur_giftcard_value) ?></td>
 		</tr>
 		<?php
 		}
 		?>
 		<tr>
-			<td colspan="3" style="text-align:right;"> <?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> </td>
-			<td style="text-align:right"><?php echo to_currency($amount_change); ?></td>
+			<td colspan="3" style="text-align:right;"> <?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?> </td>
+			<td style="text-align:right"><?php echo to_currency($amount_change) ?></td>
 		</tr>
 
 		<tr>
@@ -201,13 +216,13 @@
 	</table>
 
 	<div id="sale_return_policy" style="text-align:center">
-		<?php echo nl2br($this->config->item('return_policy')); ?>
+		<?php echo nl2br(esc(config('OSPOS')->return_policy)) ?>
 	</div>
 
 	<br>
 
 	<div id="barcode" style="text-align:center">
-		<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-		<?php echo $sale_id; ?>
+		<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+		<?php echo $sale_id ?>
 	</div>
 </div>
diff --git a/app/Views/sales/receipt_short.php b/app/Views/sales/receipt_short.php
index 283c3a5c6..e8db5beff 100644
--- a/app/Views/sales/receipt_short.php
+++ b/app/Views/sales/receipt_short.php
@@ -1,29 +1,44 @@
-<div id="receipt_wrapper" style="font-size:<?php echo $this->config->item('receipt_font_size');?>px">
+<?php
+/**
+ * @var string $transaction_time
+ * @var int $sale_id
+ * @var string $employee
+ * @var float $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var float $total
+ * @var array $payments
+ * @var float $amount_change
+ * @var string $barcode
+ */
+?>
+<div id="receipt_wrapper" style="font-size:<?php echo esc(config('OSPOS')->receipt_font_size) ?>px">
 	<div id="receipt_header">
 		<?php
-		if($this->config->item('company_logo') != '')
+		if(config('OSPOS')->company_logo != '')
 		{
 		?>
 			<div id="company_name">
-				<img id="image" src="<?php echo base_url('uploads/' . $this->config->item('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->company_logo, 'url')) ?>" alt="company_logo" />
 			</div>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_company_name'))
+		if(config('OSPOS')->receipt_show_company_name)
 		{
 		?>
-			<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+			<div id="company_name"><?php echo esc(config('OSPOS')->company) ?></div>
 		<?php
 		}
 		?>
 
-		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
-		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
-		<div id="sale_receipt"><?php echo $this->lang->line('sales_receipt'); ?></div>
-		<div id="sale_time"><?php echo $transaction_time ?></div>
+		<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->address)) ?></div>
+		<div id="company_phone"><?php echo esc(config('OSPOS')->phone) ?></div>
+		<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
+		<div id="sale_time"><?php echo esc($transaction_time) ?></div>
 	</div>
 
 	<div id="receipt_general_info">
@@ -31,54 +46,54 @@
 		if(isset($customer))
 		{
 		?>
-			<div id="customer"><?php echo $this->lang->line('customers_customer').": ".$customer; ?></div>
+			<div id="customer"><?php echo lang('Customers.customer') . esc(": $customer") ?></div>
 		<?php
 		}
 		?>
 
-		<div id="sale_id"><?php echo $this->lang->line('sales_id').": ".$sale_id; ?></div>
+		<div id="sale_id"><?php echo lang('Sales.id') . esc(": $sale_id") ?></div>
 
 		<?php
 		if(!empty($invoice_number))
 		{
 		?>
-			<div id="invoice_number"><?php echo $this->lang->line('sales_invoice_number').": ".$invoice_number; ?></div>
+			<div id="invoice_number"><?php echo lang('Sales.invoice_number') . ": $invoice_number" ?></div>
 		<?php
 		}
 		?>
 
-		<div id="employee"><?php echo $this->lang->line('employees_employee').": ".$employee; ?></div>
+		<div id="employee"><?php echo lang('Employees.employee') . esc(": $employee") ?></div>
 	</div>
 
 	<table id="receipt_items">
 		<tr>
-			<th style="width:50%;"><?php echo $this->lang->line('sales_description_abbrv'); ?></th>
-			<th style="width:25%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th colspan="4" style="width:25%;" class="total-value"><?php echo $this->lang->line('sales_total'); ?></th>
+			<th style="width:50%;"><?php echo lang('Sales.description_abbrv') ?></th>
+			<th style="width:25%;"><?php echo lang('Sales.quantity') ?></th>
+			<th colspan="4" style="width:25%;" class="total-value"><?php echo lang('Sales.total') ?></th>
 		</tr>
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 		?>
 			<tr>
-				<td><?php echo ucfirst($item['name'] . ' ' . $item['attribute_values']); ?></td>
-				<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-				<td class="total-value"><?php echo to_currency($item[($this->config->item('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
+				<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
+				<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+				<td class="total-value"><?php echo to_currency($item[(config('OSPOS')->receipt_show_total_discount ? 'total' : 'discounted_total')]) ?></td>
 			</tr>
 			<tr>
 				<?php
-				if($this->config->item('receipt_show_description'))
+				if(config('OSPOS')->receipt_show_description)
 				{
 				?>
-					<td colspan="2"><?php echo $item['description']; ?></td>
+					<td colspan="2"><?php echo esc($item['description']) ?></td>
 				<?php
 				}
 				?>
 				<?php
-				if($this->config->item('receipt_show_serialnumber'))
+				if(config('OSPOS')->receipt_show_serialnumber)
 				{
 				?>
-					<td><?php echo $item['serialnumber']; ?></td>
+					<td><?php echo esc($item['serialnumber']) ?></td>
 				<?php
 				}
 				?>
@@ -92,17 +107,17 @@
 					if($item['discount_type'] == FIXED)
 					{
 					?>
-						<td colspan="2" class="discount"><?php echo to_currency($item['discount']) . " " . $this->lang->line("sales_discount") ?></td>
+						<td colspan="2" class="discount"><?php echo to_currency($item['discount']) . " " . lang('Sales.discount') ?></td>
 					<?php
 					}
 					elseif($item['discount_type'] == PERCENT)
 					{
 					?>
-						<td colspan="2" class="discount"><?php echo to_decimals($item['discount']) . " " . $this->lang->line("sales_discount_included") ?></td>
+						<td colspan="2" class="discount"><?php echo to_decimals($item['discount']) . " " . lang('Sales.discount_included') ?></td>
 					<?php
 					}	
 					?>
-					<td class="total-value"><?php echo to_currency($item['discounted_total']); ?></td>
+					<td class="total-value"><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 			<?php
 			}
@@ -113,36 +128,36 @@
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_total_discount') && $discount > 0)
+		if(config('OSPOS')->receipt_show_total_discount && $discount > 0)
 		{
 		?>
 			<tr>
-				<td colspan="2" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
+				<td colspan="2" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.sub_total') ?></td>
+				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<tr>
-				<td colspan="2" class="total-value"><?php echo $this->lang->line('sales_discount'); ?>:</td>
-				<td class="total-value"><?php echo to_currency($discount * -1); ?></td>
+				<td colspan="2" class="total-value"><?php echo lang('Sales.discount') ?>:</td>
+				<td class="total-value"><?php echo to_currency($discount * -1) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<?php
-		if($this->config->item('receipt_show_taxes'))
+		if(config('OSPOS')->receipt_show_taxes)
 		{
 		?>
 			<tr>
-				<td colspan="2" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
+				<td colspan="2" style='text-align:right;border-top:2px solid #000000;'><?php echo lang('Sales.sub_total') ?></td>
+				<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<?php
-			foreach($taxes as $tax_group_index=>$tax)
+			foreach($taxes as $tax_group_index => $tax)
 			{
 			?>
 				<tr>
-					<td colspan="2" class="total-value"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?>:</td>
-					<td class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+					<td colspan="2" class="total-value"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?>:</td>
+					<td class="total-value"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 				</tr>
 			<?php
 			}
@@ -154,25 +169,25 @@
 		<tr>
 		</tr>
 
-		<?php $border = (!$this->config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
+		<?php $border = (!config('OSPOS')->receipt_show_taxes && !(config('OSPOS')->receipt_show_total_discount && $discount > 0)); ?>
 		<tr>
-			<td colspan="2" style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo to_currency($total); ?></td>
+			<td colspan="2" style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo lang('Sales.total') ?></td>
+			<td style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo to_currency($total) ?></td>
 		</tr>
 
 
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
 			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="2" style="text-align:right;"><?php echo $splitpayment[0]; ?> </td>
-				<td class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
+				<td colspan="2" style="text-align:right;"><?php echo $splitpayment[0] ?> </td>
+				<td class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ) ?></td>
 			</tr>
 		<?php
 		}
@@ -183,24 +198,24 @@
 		{
 		?>
 		<tr>
-			<td colspan="2" style="text-align:right;"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
-			<td class="total-value"><?php echo to_currency($cur_giftcard_value); ?></td>
+			<td colspan="2" style="text-align:right;"><?php echo lang('Sales.giftcard_balance') ?></td>
+			<td class="total-value"><?php echo to_currency($cur_giftcard_value) ?></td>
 		</tr>
 		<?php
 		}
 		?>
 		<tr>
-			<td colspan="2" style="text-align:right;"> <?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> </td>
-			<td class="total-value"><?php echo to_currency($amount_change); ?></td>
+			<td colspan="2" style="text-align:right;"> <?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?> </td>
+			<td class="total-value"><?php echo to_currency($amount_change) ?></td>
 		</tr>
 	</table>
 
 	<div id="sale_return_policy">
-		<?php echo nl2br($this->config->item('return_policy')); ?>
+		<?php echo nl2br(esc(config('OSPOS')->return_policy)) ?>
 	</div>
 
 	<div id="barcode">
-		<img src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-		<?php echo $sale_id; ?>
+		<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+		<?php echo $sale_id ?>
 	</div>
 </div>
diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php
index d98776c0c..eea26fe13 100644
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
@@ -1,44 +1,86 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var string $controller_name
+ * @var array $modes
+ * @var array $mode
+ * @var array $empty_tables
+ * @var array $selected_table
+ * @var array $stock_locations
+ * @var array $stock_location
+ * @var array $cart
+ * @var bool $items_module_allowed
+ * @var bool $change_price
+ * @var int $customer_id
+ * @var int $customer_discount_type
+ * @var float $customer_discount
+ * @var float $customer_total
+ * @var string $customer_required
+ * @var float|int $item_count
+ * @var float|int $total_units
+ * @var float $subtotal
+ * @var array $taxes
+ * @var float $total
+ * @var float $payments_total
+ * @var float $amount_due
+ * @var bool $payments_cover_total
+ * @var array $payment_options
+ * @var array $selected_payment_type
+ * @var bool $pos_mode
+ * @var array $payments
+ * @var string $mode_label
+ * @var string $comment
+ * @var bool $print_after_sale
+ * @var bool $email_receipt
+ * @var bool $price_work_orders
+ * @var string $invoice_number
+ * @var int $cash_mode
+ * @var float $non_cash_total
+ * @var float $cash_amount_due
+ */
+
+use app\Models\Employee;
+
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if(isset($error))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error</div>";
 }
 
 if(!empty($warning))
 {
-	echo "<div class='alert alert-dismissible alert-warning'>".$warning."</div>";
+	echo "<div class='alert alert-dismissible alert-warning'>$warning</div>";
 }
 
 if(isset($success))
 {
-	echo "<div class='alert alert-dismissible alert-success'>".$success."</div>";
+	echo "<div class='alert alert-dismissible alert-success'>$success</div>";
 }
 ?>
 
 <div id="register_wrapper">
 
 <!-- Top register controls -->
-
-	<?php echo form_open($controller_name."/change_mode", array('id'=>'mode_form', 'class'=>'form-horizontal panel panel-default')); ?>
+	<?php echo form_open(esc("$controller_name/change_mode"), ['id' => 'mode_form', 'class' => 'form-horizontal panel panel-default']) ?>
 		<div class="panel-body form-group">
 			<ul>
 				<li class="pull-left first_li">
-					<label class="control-label"><?php echo $this->lang->line('sales_mode'); ?></label>
+					<label class="control-label"><?php echo lang('Sales.mode') ?></label>
 				</li>
 				<li class="pull-left">
-					<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+					<?php echo form_dropdown('mode', esc($modes), esc($mode), ['onchange' => "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 				</li>
 				<?php
-				if($this->config->item('dinner_table_enable') == TRUE)
+				if(config('OSPOS')->dinner_table_enable == TRUE)
 				{
 				?>
 					<li class="pull-left first_li">
-						<label class="control-label"><?php echo $this->lang->line('sales_table'); ?></label>
+						<label class="control-label"><?php echo lang('Sales.table') ?></label>
 					</li>
 					<li class="pull-left">
-						<?php echo form_dropdown('dinner_table', $empty_tables, $selected_table, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+						<?php echo form_dropdown('dinner_table', esc($empty_tables), esc($selected_table), ['onchange'=>"$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 					</li>
 				<?php
 				}
@@ -46,59 +88,59 @@ if(isset($success))
 				{
 				?>
 					<li class="pull-left">
-						<label class="control-label"><?php echo $this->lang->line('sales_stock_location'); ?></label>
+						<label class="control-label"><?php echo lang('Sales.stock_location') ?></label>
 					</li>
 					<li class="pull-left">
-						<?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+						<?php echo form_dropdown('stock_location', esc($stock_locations), esc($stock_location), ['onchange' => "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 					</li>
 				<?php
 				}
 				?>
 
 				<li class="pull-right">
-					<button class='btn btn-default btn-sm modal-dlg' id='show_suspended_sales_button' data-href="<?php echo site_url($controller_name."/suspended"); ?>"
-							title="<?php echo $this->lang->line('sales_suspended_sales'); ?>">
-						<span class="glyphicon glyphicon-align-justify">&nbsp</span><?php echo $this->lang->line('sales_suspended_sales'); ?>
+					<button class='btn btn-default btn-sm modal-dlg' id='show_suspended_sales_button' data-href="<?php echo esc(site_url("$controller_name/suspended"), 'url') ?>"
+							title="<?php echo lang('Sales.suspended_sales') ?>">
+						<span class="glyphicon glyphicon-align-justify">&nbsp</span><?php echo lang('Sales.suspended_sales') ?>
 					</button>
 				</li>
 
 				<?php
-				if($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id')))
+				$employee = model(Employee::class);
+				if($employee->has_grant('reports_sales', $this->session->get('person_id')))
 				{
 				?>
 					<li class="pull-right">
-						<?php echo anchor($controller_name."/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . $this->lang->line('sales_takings'),
-									array('class'=>'btn btn-primary btn-sm', 'id'=>'sales_takings_button', 'title'=>$this->lang->line('sales_takings'))); ?>
+						<?php echo anchor(esc("$controller_name/manage"), '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . lang('Sales.takings'),
+									array('class' => 'btn btn-primary btn-sm', 'id' => 'sales_takings_button', 'title' => lang('Sales.takings'))) ?>
 					</li>
 				<?php
 				}
 				?>
-
 			</ul>
 		</div>
-	<?php echo form_close(); ?>
+	<?php echo form_close() ?>
 
 	<?php $tabindex = 0; ?>
 
-	<?php echo form_open($controller_name."/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
+	<?php echo form_open(esc("$controller_name/add"), ['id' => 'add_item_form', 'class' => 'form-horizontal panel panel-default']) ?>
 		<div class="panel-body form-group">
 			<ul>
 				<li class="pull-left first_li">
-					<label for="item" class='control-label'><?php echo $this->lang->line('sales_find_or_scan_item_or_receipt'); ?></label>
+					<label for="item" class='control-label'><?php echo lang('Sales.find_or_scan_item_or_receipt') ?></label>
 				</li>
 				<li class="pull-left">
-					<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'size'=>'50', 'tabindex'=>++$tabindex)); ?>
+					<?php echo form_input (['name' => 'item', 'id' => 'item', 'class' => 'form-control input-sm', 'size' => '50', 'tabindex' => ++$tabindex]) ?>
 					<span class="ui-helper-hidden-accessible" role="status"></span>
 				</li>
 				<li class="pull-right">
-					<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new="<?php echo $this->lang->line('common_new') ?>" data-btn-submit="<?php echo $this->lang->line('common_submit')?>" data-href="<?php echo site_url("items/view"); ?>"
-							title="<?php echo $this->lang->line($controller_name . '_new_item'); ?>">
-						<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line($controller_name. '_new_item'); ?>
+					<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new="<?php echo lang('Common.new') ?>" data-btn-submit="<?php echo lang('Common.submit') ?>" data-href="<?php echo esc(site_url("items/view"), 'url') ?>"
+							title="<?php echo lang("$controller_name.new_item") ?>">
+						<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo lang("$controller_name.new_item") ?>
 					</button>
 				</li>
 			</ul>
 		</div>
-	<?php echo form_close(); ?>
+	<?php echo form_close() ?>
 
 
 <!-- Sale Items List -->
@@ -106,14 +148,14 @@ if(isset($success))
 	<table class="sales_table_100" id="register">
 		<thead>
 			<tr>
-				<th style="width: 5%; "><?php echo $this->lang->line('common_delete'); ?></th>
-				<th style="width: 15%;"><?php echo $this->lang->line('sales_item_number'); ?></th>
-				<th style="width: 30%;"><?php echo $this->lang->line('sales_item_name'); ?></th>
-				<th style="width: 10%;"><?php echo $this->lang->line('sales_price'); ?></th>
-				<th style="width: 10%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-				<th style="width: 15%;"><?php echo $this->lang->line('sales_discount'); ?></th>
-				<th style="width: 10%;"><?php echo $this->lang->line('sales_total'); ?></th>
-				<th style="width: 5%; "><?php echo $this->lang->line('sales_update'); ?></th>
+				<th style="width: 5%; "><?php echo lang('Common.delete') ?></th>
+				<th style="width: 15%;"><?php echo lang('Sales.item_number') ?></th>
+				<th style="width: 30%;"><?php echo lang('Sales.item_name') ?></th>
+				<th style="width: 10%;"><?php echo lang('Sales.price') ?></th>
+				<th style="width: 10%;"><?php echo lang('Sales.quantity') ?></th>
+				<th style="width: 15%;"><?php echo lang('Sales.discount') ?></th>
+				<th style="width: 10%;"><?php echo lang('Sales.total') ?></th>
+				<th style="width: 5%; "><?php echo lang('Sales.update') ?></th>
 			</tr>
 		</thead>
 
@@ -124,41 +166,41 @@ if(isset($success))
 			?>
 				<tr>
 					<td colspan='8'>
-						<div class='alert alert-dismissible alert-info'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
+						<div class='alert alert-dismissible alert-info'><?php echo lang('Sales.no_items_in_cart') ?></div>
 					</td>
 				</tr>
 			<?php
 			}
 			else
 			{
-				foreach(array_reverse($cart, TRUE) as $line=>$item)
+				foreach(array_reverse($cart, TRUE) as $line => $item)
 				{
 			?>
-					<?php echo form_open($controller_name."/edit_item/$line", array('class'=>'form-horizontal', 'id'=>'cart_'.$line)); ?>
+					<?php echo form_open(esc("$controller_name/edit_item/$line"), ['class' => 'form-horizontal', 'id' => "cart_$line"]) ?>
 						<tr>
 							<td>
-								<span data-item-id="<?php echo $line; ?>" class="delete_item_button"><span class="glyphicon glyphicon-trash"></span></span>
 								<?php
-								echo form_hidden('location', $item['item_location']);
-								echo form_input(array('type'=>'hidden', 'name'=>'item_id', 'value'=>$item['item_id']));
+									echo anchor(esc("$controller_name/delete_item/$line"), '<span class="glyphicon glyphicon-trash"></span>');
+									echo form_hidden('location', $item['item_location']);
+									echo form_input (['type' => 'hidden', 'name' => 'item_id', 'value'=>$item['item_id']]);
 								?>
 							</td>
 							<?php
 							if($item['item_type'] == ITEM_TEMP)
 							{
 							?>
-								<td><?php echo form_input(array('name'=>'item_number', 'id'=>'item_number','class'=>'form-control input-sm', 'value'=>$item['item_number'], 'tabindex'=>++$tabindex)); ?></td>
+								<td><?php echo form_input (['name' => 'item_number', 'id' => 'item_number','class' => 'form-control input-sm', 'value'=>$item['item_number'], 'tabindex'=>++$tabindex]) ?></td>
 								<td style="align: center;">
-									<?php echo form_input(array('name'=>'name','id'=>'name', 'class'=>'form-control input-sm', 'value'=>$item['name'], 'tabindex'=>++$tabindex)); ?>
+									<?php echo form_input (['name' => 'name','id' => 'name', 'class' => 'form-control input-sm', 'value'=>$item['name'], 'tabindex'=>++$tabindex]) ?>
 								</td>
 							<?php
 							}
 							else
 							{
 							?>
-								<td><?php echo $item['item_number']; ?></td>
+								<td><?php echo esc($item['item_number']) ?></td>
 								<td style="align: center;">
-									<?php echo $item['name'] . ' '. implode(' ', array($item['attribute_values'], $item['attribute_dtvalues'])); ?>
+									<?php echo esc($item['name']) . ' '. implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']]) ?>
 									<br/>
 									<?php if ($item['stock_type'] == '0'): echo '[' . to_quantity_decimals($item['in_stock']) . ' in ' . $item['stock_name'] . ']'; endif; ?>
 								</td>
@@ -170,7 +212,7 @@ if(isset($success))
 								<?php
 								if($items_module_allowed && $change_price)
 								{
-									echo form_input(array('name'=>'price', 'class'=>'form-control input-sm', 'value'=>to_currency_no_money($item['price']), 'tabindex'=>++$tabindex, 'onClick'=>'this.select();'));
+									echo form_input (['name' => 'price', 'class' => 'form-control input-sm', 'value' => to_currency_no_money($item['price']), 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']);
 								}
 								else
 								{
@@ -189,25 +231,25 @@ if(isset($success))
 								}
 								else
 								{
-									echo form_input(array('name'=>'quantity', 'class'=>'form-control input-sm', 'value'=>to_quantity_decimals($item['quantity']), 'tabindex'=>++$tabindex, 'onClick'=>'this.select();'));
+									echo form_input (['name' => 'quantity', 'class' => 'form-control input-sm', 'value' => to_quantity_decimals($item['quantity']), 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']);
 								}
 								?>
 							</td>
 
 							<td>
 								<div class="input-group">
-									<?php echo form_input(array('name'=>'discount', 'class'=>'form-control input-sm', 'value'=>$item['discount_type'] ? to_currency_no_money($item['discount']) : to_decimals($item['discount']), 'tabindex'=>++$tabindex, 'onClick'=>'this.select();')); ?>
+									<?php echo form_input (['name' => 'discount', 'class' => 'form-control input-sm', 'value' => $item['discount_type'] ? to_currency_no_money($item['discount']) : to_decimals($item['discount']), 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']) ?>
 									<span class="input-group-btn">
-										<?php echo form_checkbox(array('id'=>'discount_toggle', 'name'=>'discount_toggle', 'value'=>1, 'data-toggle'=>"toggle",'data-size'=>'small', 'data-onstyle'=>'success', 'data-on'=>'<b>'.$this->config->item('currency_symbol').'</b>', 'data-off'=>'<b>%</b>', 'data-line'=>$line, 'checked'=>$item['discount_type'])); ?>
+										<?php echo form_checkbox (['id' => 'discount_toggle', 'name' => 'discount_toggle', 'value' => 1, 'data-toggle' => "toggle",'data-size' => 'small', 'data-onstyle' => 'success', 'data-on' => '<b>' . config('OSPOS')->currency_symbol . '</b>', 'data-off' => '<b>%</b>', 'data-line' => esc($line), 'checked' => $item['discount_type']]) ?>
 									</span>
 								</div>
 							</td>
 
 							<td>
 								<?php
-								if($item['item_type'] == ITEM_AMOUNT_ENTRY)
+								if($item['item_type'] == ITEM_AMOUNT_ENTRY)	//TODO: === ?
 								{
-									echo form_input(array('name'=>'discounted_total', 'class'=>'form-control input-sm', 'value'=>to_currency_no_money($item['discounted_total']), 'tabindex'=>++$tabindex, 'onClick'=>'this.select();'));
+									echo form_input (['name' => 'discounted_total', 'class' => 'form-control input-sm', 'value' => to_currency_no_money($item['discounted_total']), 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']);
 								}
 								else
 								{
@@ -216,16 +258,16 @@ if(isset($success))
 								?>
 							</td>
 
-							<td><a href="javascript:document.getElementById('<?php echo 'cart_'.$line ?>').submit();" title=<?php echo $this->lang->line('sales_update')?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
+							<td><a href="javascript:document.getElementById('<?php echo "cart_$line" ?>').submit();" title=<?php echo lang('Sales.update') ?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
 						</tr>
 						<tr>
 							<?php
 							if($item['item_type'] == ITEM_TEMP)
 							{
 							?>
-								<td><?php echo form_input(array('type'=>'hidden', 'name'=>'item_id', 'value'=>$item['item_id'])); ?></td>
+								<td><?php echo form_input (['type' => 'hidden', 'name' => 'item_id', 'value' => $item['item_id']]) ?></td>
 								<td style="align: center;" colspan="6">
-									<?php echo form_input(array('name'=>'item_description', 'id'=>'item_description', 'class'=>'form-control input-sm', 'value'=>$item['description'], 'tabindex'=>++$tabindex)); ?>
+									<?php echo form_input (['name' => 'item_description', 'id' => 'item_description', 'class' => 'form-control input-sm', 'value' => esc($item['description'], 'attr'), 'tabindex' => ++$tabindex]) ?>
 								</td>
 								<td> </td>
 							<?php
@@ -238,7 +280,7 @@ if(isset($success))
 								if($item['allow_alt_description'])
 								{
 								?>
-									<td style="color: #2F4F4F;"><?php echo $this->lang->line('sales_description_abbrv'); ?></td>
+									<td style="color: #2F4F4F;"><?php echo lang('Sales.description_abbrv') ?></td>
 								<?php
 								}
 								?>
@@ -247,18 +289,18 @@ if(isset($success))
 									<?php
 									if($item['allow_alt_description'])
 									{
-										echo form_input(array('name'=>'description', 'class'=>'form-control input-sm', 'value'=>$item['description'], 'onClick'=>'this.select();'));
+										echo form_input (['name' => 'description', 'class' => 'form-control input-sm', 'value' => esc($item['description'], 'attr'), 'onClick' => 'this.select();']);
 									}
 									else
 									{
 										if($item['description'] != '')
 										{
 											echo $item['description'];
-											echo form_hidden('description', $item['description']);
+											echo form_hidden('description', esc($item['description']));
 										}
 										else
 										{
-											echo $this->lang->line('sales_no_description');
+											echo lang('Sales.no_description');
 											echo form_hidden('description','');
 										}
 									}
@@ -269,7 +311,7 @@ if(isset($success))
 									<?php
 									if($item['is_serialized'])
 									{
-										echo $this->lang->line('sales_serial');
+										echo lang('Sales.serial');
 									}
 									?>
 								</td>
@@ -277,7 +319,7 @@ if(isset($success))
 									<?php
 									if($item['is_serialized'])
 									{
-										echo form_input(array('name'=>'serialnumber', 'class'=>'form-control input-sm', 'value'=>$item['serialnumber'], 'onClick'=>'this.select();'));
+										echo form_input (['name' => 'serialnumber', 'class' => 'form-control input-sm', 'value' => esc($item['serialnumber']), 'onClick' => 'this.select();']);
 									}
 									else
 									{
@@ -289,7 +331,7 @@ if(isset($success))
 							}
 							?>
 						</tr>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 			<?php
 				}
 			}
@@ -302,23 +344,23 @@ if(isset($success))
 
 <div id="overall_sale" class="panel panel-default">
 	<div class="panel-body">
-		<?php echo form_open($controller_name."/select_customer", array('id'=>'select_customer_form', 'class'=>'form-horizontal')); ?>
+		<?php echo form_open(esc("$controller_name/select_customer"), ['id' => 'select_customer_form', 'class' => 'form-horizontal']) ?>
 			<?php
 			if(isset($customer))
 			{
 			?>
 				<table class="sales_table_100">
 					<tr>
-						<th style="width: 55%;"><?php echo $this->lang->line("sales_customer"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo anchor('customers/view/'.$customer_id, $customer, array('class' => 'modal-dlg', 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('customers_update'))); ?></th>
+						<th style="width: 55%;"><?php echo lang('Sales.customer') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo anchor(esc("customers/view/$customer_id"), esc($customer), ['class' => 'modal-dlg', 'data-btn-submit' => lang('Common.submit'), 'title' => lang('Customers.update')]) ?></th>
 					</tr>
 					<?php
 					if(!empty($customer_email))
 					{
 					?>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_email"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $customer_email; ?></th>
+							<th style="width: 55%;"><?php echo lang('Sales.customer_email') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($customer_email) ?></th>
 						</tr>
 					<?php
 					}
@@ -328,8 +370,8 @@ if(isset($success))
 					{
 					?>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_address"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $customer_address; ?></th>
+							<th style="width: 55%;"><?php echo lang('Sales.customer_address') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($customer_address) ?></th>
 						</tr>
 					<?php
 					}
@@ -339,85 +381,84 @@ if(isset($success))
 					{
 					?>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_location"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $customer_location; ?></th>
+							<th style="width: 55%;"><?php echo lang('Sales.customer_location') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($customer_location) ?></th>
 						</tr>
 					<?php
 					}
 					?>
 					<tr>
-						<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_discount"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo ($customer_discount_type == FIXED)?to_currency($customer_discount):$customer_discount . '%'; ?></th>
+						<th style="width: 55%;"><?php echo lang('Sales.customer_discount') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo ($customer_discount_type == FIXED) ? to_currency($customer_discount) : $customer_discount . '%' ?></th>
 					</tr>
-					<?php if($this->config->item('customer_reward_enable') == TRUE): ?>
+					<?php if(config('OSPOS')->customer_reward_enable == TRUE): ?>
 					<?php
 					if(!empty($customer_rewards))
 					{
 					?>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("rewards_package"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $customer_rewards['package_name']; ?></th>
+							<th style="width: 55%;"><?php echo lang('Sales.rewards_package') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($customer_rewards['package_name']) ?></th>
 						</tr>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("customers_available_points"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $customer_rewards['points']; ?></th>
+							<th style="width: 55%;"><?php echo lang('Customers.available_points') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($customer_rewards['points']) ?></th>
 						</tr>
 					<?php
 					}
 					?>
 					<?php endif; ?>
 					<tr>
-						<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_total"); ?></th>
-						<th style="width: 45%; text-align: right;"><?php echo to_currency($customer_total); ?></th>
+						<th style="width: 55%;"><?php echo lang('Sales.customer_total') ?></th>
+						<th style="width: 45%; text-align: right;"><?php echo to_currency($customer_total) ?></th>
 					</tr>
 					<?php
 					if(!empty($mailchimp_info))
 					{
 					?>
 						<tr>
-							<th style="width: 55%;"><?php echo $this->lang->line("sales_customer_mailchimp_status"); ?></th>
-							<th style="width: 45%; text-align: right;"><?php echo $mailchimp_info['status']; ?></th>
+							<th style="width: 55%;"><?php echo lang('Sales.customer_mailchimp_status') ?></th>
+							<th style="width: 45%; text-align: right;"><?php echo esc($mailchimp_info['status']) ?></th>
 						</tr>
 					<?php
 					}
 					?>
 				</table>
 
-				<button class="btn btn-danger btn-sm" id="remove_customer_button" title="<?php echo $this->lang->line('common_remove').' '.$this->lang->line('customers_customer')?>">
-					<span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('common_remove').' '.$this->lang->line('customers_customer') ?>
-				</button>
-
+				<?php echo anchor(
+					"$controller_name/remove_customer",
+					'<span class=\'glyphicon glyphicon-remove\'>&nbsp</span>' . lang('Common.remove') . ' ' . lang('Customers.customer'),
+						['class' => 'btn btn-danger btn-sm', 'id' => 'remove_customer_button', 'title' => lang('Common.remove') . ' ' . lang('Customers.customer')]
+					)
+				?>
 			<?php
 			}
 			else
 			{
 			?>
 				<div class="form-group" id="select_customer">
-					<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('sales_select_customer') . ' ' . $customer_required; ?></label>
-					<?php echo form_input(array('name'=>'customer', 'id'=>'customer', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('sales_start_typing_customer_name'))); ?>
+					<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo lang('Sales.select_customer') . esc(" $customer_required") ?></label>
+					<?php echo form_input (['name' => 'customer', 'id' => 'customer', 'class' => 'form-control input-sm', 'value' => lang('Sales.start_typing_customer_name')]) ?>
 
-					<button class='btn btn-info btn-sm modal-dlg' data-btn-submit="<?php echo $this->lang->line('common_submit') ?>" data-href="<?php echo site_url("customers/view"); ?>"
-							title="<?php echo $this->lang->line($controller_name. '_new_customer'); ?>">
-						<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line($controller_name. '_new_customer'); ?>
-					</button>					
-					<button class='btn btn-default btn-sm modal-dlg' id='show_keyboard_help' data-href="<?php echo site_url("$controller_name/sales_keyboard_help"); ?>"
-							title="<?php echo $this->lang->line('sales_key_title'); ?>">
-						<span class="glyphicon glyphicon-share-alt">&nbsp</span><?php echo $this->lang->line('sales_key_help'); ?>
+					<button class='btn btn-info btn-sm modal-dlg' data-btn-submit="<?php echo lang('Common.submit') ?>" data-href="<?php echo site_url("customers/view") ?>"
+							title="<?php echo lang("$controller_name.new_customer") ?>">
+						<span class="glyphicon glyphicon-user">&nbsp</span><?php echo lang("$controller_name.new_customer") ?>
 					</button>
+
 				</div>
 			<?php
 			}
 			?>
-		<?php echo form_close(); ?>
+		<?php echo form_close() ?>
 
 		<table class="sales_table_100" id="sale_totals">
 			<tr>
-				<th style="width: 55%;"><?php echo $this->lang->line('sales_quantity_of_items',$item_count); ?></th>
-				<th style="width: 45%; text-align: right;"><?php echo $total_units; ?></th>
+				<th style="width: 55%;"><?php echo lang('Sales.quantity_of_items', ['quantity' => $item_count]) ?></th>
+				<th style="width: 45%; text-align: right;"><?php echo $total_units ?></th>
 			</tr>
 			<tr>
-				<th style="width: 55%;"><?php echo $this->lang->line('sales_sub_total'); ?></th>
-				<th style="width: 45%; text-align: right;"><?php echo to_currency($subtotal); ?></th>
+				<th style="width: 55%;"><?php echo lang('Sales.sub_total') ?></th>
+				<th style="width: 45%; text-align: right;"><?php echo to_currency($subtotal) ?></th>
 			</tr>
 
 			<?php
@@ -425,16 +466,16 @@ if(isset($success))
 			{
 			?>
 				<tr>
-					<th style="width: 55%;"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></th>
-					<th style="width: 45%; text-align: right;"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></th>
+					<th style="width: 55%;"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></th>
+					<th style="width: 45%; text-align: right;"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></th>
 				</tr>
 			<?php
 			}
 			?>
 
 			<tr>
-				<th style="width: 55%; font-size: 150%"><?php echo $this->lang->line('sales_total'); ?></th>
-				<th style="width: 45%; font-size: 150%; text-align: right;"><span id="sale_total"><?php echo to_currency($total); ?></span></th>
+				<th style="width: 55%; font-size: 150%"><?php echo lang('Sales.total') ?></th>
+				<th style="width: 45%; font-size: 150%; text-align: right;"><span id="sale_total"><?php echo to_currency($total) ?></span></th>
 			</tr>
 		</table>
 
@@ -445,12 +486,12 @@ if(isset($success))
 		?>
 			<table class="sales_table_100" id="payment_totals">
 				<tr>
-					<th style="width: 55%;"><?php echo $this->lang->line('sales_payments_total'); ?></th>
-					<th style="width: 45%; text-align: right;"><?php echo to_currency($payments_total); ?></th>
+					<th style="width: 55%;"><?php echo lang('Sales.payments_total') ?></th>
+					<th style="width: 45%; text-align: right;"><?php echo to_currency($payments_total) ?></th>
 				</tr>
 				<tr>
-					<th style="width: 55%; font-size: 120%"><?php echo $this->lang->line('sales_amount_due'); ?></th>
-					<th style="width: 45%; font-size: 120%; text-align: right;"><span id="sale_amount_due"><?php echo to_currency($amount_due); ?></span></th>
+					<th style="width: 55%; font-size: 120%"><?php echo lang('Sales.amount_due') ?></th>
+					<th style="width: 45%; font-size: 120%; text-align: right;"><span id="sale_amount_due"><?php echo to_currency($amount_due) ?></span></th>
 				</tr>
 			</table>
 
@@ -460,22 +501,22 @@ if(isset($success))
 				if($payments_cover_total)
 				{
 				?>
-					<?php echo form_open($controller_name."/add_payment", array('id'=>'add_payment_form', 'class'=>'form-horizontal')); ?>
+					<?php echo form_open(esc("$controller_name/add_payment"), ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
 						<table class="sales_table_100">
 							<tr>
-								<td><?php echo $this->lang->line('sales_payment'); ?></td>
+								<td><?php echo lang('Sales.payment') ?></td>
 								<td>
-									<?php echo form_dropdown('payment_type', $payment_options, $selected_payment_type, array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit', 'disabled'=>'disabled')); ?>
+									<?php echo form_dropdown('payment_type', esc($payment_options), esc($selected_payment_type), ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit', 'disabled' => 'disabled']) ?>
 								</td>
 							</tr>
 							<tr>
-								<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
+								<td><span id="amount_tendered_label"><?php echo lang('Sales.amount_tendered') ?></span></td>
 								<td>
-									<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm disabled', 'disabled'=>'disabled', 'value'=>'0', 'size'=>'5', 'tabindex'=>++$tabindex, 'onClick'=>'this.select();')); ?>
+									<?php echo form_input (['name' => 'amount_tendered', 'id' => 'amount_tendered', 'class' => 'form-control input-sm disabled', 'disabled' => 'disabled', 'value' => '0', 'size' => '5', 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']) ?>
 								</td>
 							</tr>
 						</table>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 
 					<?php
 					// Only show this part if in sale or return mode
@@ -487,17 +528,17 @@ if(isset($success))
 						{
 							foreach($payments as $payment_id => $payment)
 							{
-								if($payment['payment_type'] == $this->lang->line('sales_due'))
+								if($payment['payment_type'] == lang('Sales.due'))
 								{
 									$due_payment = TRUE;
 								}
 							}
 						}
 
-						if(!$due_payment || ($due_payment && isset($customer)))
+						if(!$due_payment || ($due_payment && isset($customer)))	//TODO: $due_payment is not needed because the first clause insures that it will always be true if it gets to this point.  Can be shortened to if(!$due_payment || isset($customer))
 						{
 					?>
-							<div class='btn btn-sm btn-success pull-right' id='finish_sale_button' tabindex="<?php echo ++$tabindex; ?>"><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo $this->lang->line('sales_complete_sale'); ?></div>
+							<div class='btn btn-sm btn-success pull-right' id='finish_sale_button' tabindex="<?php echo ++$tabindex ?>"><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo lang('Sales.complete_sale') ?></div>
 					<?php
 						}
 					}
@@ -507,25 +548,25 @@ if(isset($success))
 				else
 				{
 				?>
-					<?php echo form_open($controller_name."/add_payment", array('id'=>'add_payment_form', 'class'=>'form-horizontal')); ?>
+					<?php echo form_open(esc("$controller_name/add_payment"), ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
 						<table class="sales_table_100">
 							<tr>
-								<td><?php echo $this->lang->line('sales_payment'); ?></td>
+								<td><?php echo lang('Sales.payment') ?></td>
 								<td>
-									<?php echo form_dropdown('payment_type', $payment_options,  $selected_payment_type, array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+									<?php echo form_dropdown('payment_type', esc($payment_options),  esc($selected_payment_type), ['id' => 'payment_types', 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
 								</td>
 							</tr>
 							<tr>
-								<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
+								<td><span id="amount_tendered_label"><?php echo lang('Sales.amount_tendered') ?></span></td>
 								<td>
-									<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm non-giftcard-input', 'value'=>to_currency_no_money($amount_due), 'size'=>'5', 'tabindex'=>++$tabindex, 'onClick'=>'this.select();')); ?>
-									<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm giftcard-input', 'disabled' => true, 'value'=>to_currency_no_money($amount_due), 'size'=>'5', 'tabindex'=>++$tabindex)); ?>
+									<?php echo form_input (['name' => 'amount_tendered', 'id' => 'amount_tendered', 'class' => 'form-control input-sm non-giftcard-input', 'value' => to_currency_no_money($amount_due), 'size' => '5', 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']) ?>
+									<?php echo form_input (['name' => 'amount_tendered', 'id' => 'amount_tendered', 'class' => 'form-control input-sm giftcard-input', 'disabled' => true, 'value' => to_currency_no_money($amount_due), 'size' => '5', 'tabindex' => ++$tabindex]) ?>
 								</td>
 							</tr>
 						</table>
-					<?php echo form_close(); ?>
+					<?php echo form_close() ?>
 
-					<div class='btn btn-sm btn-success pull-right' id='add_payment_button' tabindex="<?php echo ++$tabindex; ?>"><span class="glyphicon glyphicon-credit-card">&nbsp</span><?php echo $this->lang->line('sales_add_payment'); ?></div>
+					<div class='btn btn-sm btn-success pull-right' id='add_payment_button' tabindex="<?php echo ++$tabindex ?>"><span class="glyphicon glyphicon-credit-card">&nbsp</span><?php echo lang('Sales.add_payment') ?></div>
 				<?php
 				}
 				?>
@@ -538,9 +579,9 @@ if(isset($success))
 					<table class="sales_table_100" id="register">
 						<thead>
 							<tr>
-								<th style="width: 10%;"><?php echo $this->lang->line('common_delete'); ?></th>
-								<th style="width: 60%;"><?php echo $this->lang->line('sales_payment_type'); ?></th>
-								<th style="width: 20%;"><?php echo $this->lang->line('sales_payment_amount'); ?></th>
+								<th style="width: 10%;"><?php echo lang('Common.delete') ?></th>
+								<th style="width: 60%;"><?php echo lang('Sales.payment_type') ?></th>
+								<th style="width: 20%;"><?php echo lang('Sales.payment_amount') ?></th>
 							</tr>
 						</thead>
 
@@ -550,9 +591,9 @@ if(isset($success))
 							{
 							?>
 								<tr>
-									<td><span data-payment-id="<?php echo $payment_id; ?>" class="delete_payment_button"><span class="glyphicon glyphicon-trash"></span></span></td>
-									<td><?php echo $payment['payment_type']; ?></td>
-									<td style="text-align: right;"><?php echo to_currency($payment['payment_amount']); ?></td>
+									<td><?php echo anchor(esc("$controller_name/delete_payment/$payment_id"), '<span class="glyphicon glyphicon-trash"></span>') ?></td>
+									<td><?php echo esc($payment['payment_type']) ?></td>
+									<td style="text-align: right;"><?php echo to_currency($payment['payment_amount']) ?></td>
 								</tr>
 							<?php
 							}
@@ -564,22 +605,22 @@ if(isset($success))
 				?>
 			</div>
 
-			<?php echo form_open($controller_name."/cancel", array('id'=>'buttons_form')); ?>
+			<?php echo form_open(esc("$controller_name/cancel"), ['id' => 'buttons_form']) ?>
 				<div class="form-group" id="buttons_sale">
-					<div class='btn btn-sm btn-default pull-left' id='suspend_sale_button'><span class="glyphicon glyphicon-align-justify">&nbsp</span><?php echo $this->lang->line('sales_suspend_sale'); ?></div>
+					<div class='btn btn-sm btn-default pull-left' id='suspend_sale_button'><span class="glyphicon glyphicon-align-justify">&nbsp</span><?php echo lang('Sales.suspend_sale') ?></div>
 					<?php
 					// Only show this part if the payment covers the total
 					if(!$pos_mode && isset($customer))
 					{
 					?>
-						<div class='btn btn-sm btn-success' id='finish_invoice_quote_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo $mode_label; ?></div>
+						<div class='btn btn-sm btn-success' id='finish_invoice_quote_button'><span class="glyphicon glyphicon-ok">&nbsp</span><?php echo esc($mode_label) ?></div>
 					<?php
 					}
 					?>
 
-					<div class='btn btn-sm btn-danger pull-right' id='cancel_sale_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('sales_cancel_sale'); ?></div>
+					<div class='btn btn-sm btn-danger pull-right' id='cancel_sale_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo lang('Sales.cancel_sale') ?></div>
 				</div>
-			<?php echo form_close(); ?>
+			<?php echo form_close() ?>
 
 			<?php
 			// Only show this part if the payment cover the total
@@ -590,8 +631,8 @@ if(isset($success))
 					<div class="no-gutter row">
 						<div class="form-group form-group-sm">
 							<div class="col-xs-12">
-								<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?>
-								<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?>
+								<?php echo form_label(lang('Common.comments'), 'comments', ['class' => 'control-label', 'id' => 'comment_label', 'for' => 'comment']) ?>
+								<?php echo form_textarea (['name' => 'comment', 'id' => 'comment', 'class' => 'form-control input-sm', 'value' => esc($comment), 'rows' => '2']) ?>
 							</div>
 						</div>
 					</div>
@@ -599,8 +640,8 @@ if(isset($success))
 						<div class="form-group form-group-sm">
 							<div class="col-xs-6">
 								<label for="sales_print_after_sale" class="control-label checkbox">
-									<?php echo form_checkbox(array('name'=>'sales_print_after_sale', 'id'=>'sales_print_after_sale', 'value'=>1, 'checked'=>$print_after_sale)); ?>
-									<?php echo $this->lang->line('sales_print_after_sale')?>
+									<?php echo form_checkbox (['name' => 'sales_print_after_sale', 'id' => 'sales_print_after_sale', 'value' => 1, 'checked' => $print_after_sale]) ?>
+									<?php echo lang('Sales.print_after_sale') ?>
 								</label>
 							</div>
 
@@ -610,8 +651,8 @@ if(isset($success))
 							?>
 								<div class="col-xs-6">
 									<label for="email_receipt" class="control-label checkbox">
-										<?php echo form_checkbox(array('name'=>'email_receipt', 'id'=>'email_receipt', 'value'=>1, 'checked'=>$email_receipt)); ?>
-										<?php echo $this->lang->line('sales_email_receipt'); ?>
+										<?php echo form_checkbox (['name' => 'email_receipt', 'id' => 'email_receipt', 'value'=>1, 'checked' => $email_receipt]) ?>
+										<?php echo lang('Sales.email_receipt') ?>
 									</label>
 								</div>
 							<?php
@@ -623,8 +664,8 @@ if(isset($success))
 							?>
 								<div class="col-xs-6">
 									<label for="price_work_orders" class="control-label checkbox">
-									<?php echo form_checkbox(array('name'=>'price_work_orders', 'id'=>'price_work_orders', 'value'=>1, 'checked'=>$price_work_orders)); ?>
-									<?php echo $this->lang->line('sales_include_prices'); ?>
+									<?php echo form_checkbox (['name' => 'price_work_orders', 'id' => 'price_work_orders', 'value' => 1, 'checked' => $price_work_orders]) ?>
+									<?php echo lang('Sales.include_prices') ?>
 									</label>
 								</div>
 							<?php
@@ -633,21 +674,21 @@ if(isset($success))
 						</div>
 					</div>
 					<?php
-					if(($mode == 'sale_invoice') && $this->config->item('invoice_enable') == TRUE)
+					if(($mode == 'sale_invoice') && config('OSPOS')->invoice_enable == TRUE)
 					{
 					?>
 						<div class="row">
 							<div class="form-group form-group-sm">
 								<div class="col-xs-6">
 									<label for="sales_invoice_number" class="control-label checkbox">
-										<?php echo $this->lang->line('sales_invoice_enable'); ?>
+										<?php echo lang('Sales.invoice_enable') ?>
 									</label>
 								</div>
 
 								<div class="col-xs-6">
 									<div class="input-group input-group-sm">
 										<span class="input-group-addon input-sm">#</span>
-										<?php echo form_input(array('name'=>'sales_invoice_number', 'id'=>'sales_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number)); ?>
+										<?php echo form_input (['name' => 'sales_invoice_number', 'id' => 'sales_invoice_number', 'class' => 'form-control input-sm', 'value' => esc($invoice_number)]) ?>
 									</div>
 								</div>
 							</div>
@@ -668,31 +709,11 @@ if(isset($success))
 <script type="text/javascript">
 $(document).ready(function()
 {
-	const redirect = function() {
-		window.location.href = "<?php echo site_url('sales'); ?>";
-	};
-
-	$("#remove_customer_button").click(function()
-	{
-		$.post("<?php echo site_url('sales/remove_customer'); ?>", redirect);
-	});
-
-	$(".delete_item_button").click(function()
-	{
-		const item_id = $(this).data('item-id');
-		$.post("<?php echo site_url('sales/delete_item/'); ?>" + item_id, redirect);
-	});
-
-	$(".delete_payment_button").click(function() {
-		const item_id = $(this).data('payment-id');
-		$.post("<?php echo site_url('sales/delete_payment/'); ?>" + item_id, redirect);
-	});
-
 	$("input[name='item_number']").change(function() {
 		var item_id = $(this).parents('tr').find("input[name='item_id']").val();
 		var item_number = $(this).val();
 		$.ajax({
-			url: "<?php echo site_url('sales/change_item_number'); ?>",
+			url: "<?php echo site_url('sales/change_item_number') ?>",
 			method: 'post',
 			data: {
 				'item_id': item_id,
@@ -706,7 +727,7 @@ $(document).ready(function()
 		var item_id = $(this).parents('tr').find("input[name='item_id']").val();
 		var item_name = $(this).val();
 		$.ajax({
-			url: "<?php echo site_url('sales/change_item_name'); ?>",
+			url: "<?php echo site_url('sales/change_item_name') ?>",
 			method: 'post',
 			data: {
 				'item_id': item_id,
@@ -720,7 +741,7 @@ $(document).ready(function()
 		var item_id = $(this).parents('tr').find("input[name='item_id']").val();
 		var item_description = $(this).val();
 		$.ajax({
-			url: "<?php echo site_url('sales/change_item_description'); ?>",
+			url: "<?php echo site_url('sales/change_item_description') ?>",
 			method: 'post',
 			data: {
 				'item_id': item_id,
@@ -733,11 +754,11 @@ $(document).ready(function()
 	$('#item').focus();
 
 	$('#item').blur(function() {
-		$(this).val("<?php echo $this->lang->line('sales_start_typing_item_name'); ?>");
+		$(this).val("<?php echo lang('Sales.start_typing_item_name') ?>");
 	});
 
 	$('#item').autocomplete( {
-		source: "<?php echo site_url($controller_name . '/item_search'); ?>",
+		source: "<?php echo esc(site_url("$controller_name/item_search"), 'url') ?>",
 		minChars: 0,
 		autoFocus: false,
 		delay: 500,
@@ -756,7 +777,7 @@ $(document).ready(function()
 	});
 
 	var clear_fields = function() {
-		if($(this).val().match("<?php echo $this->lang->line('sales_start_typing_item_name') . '|' . $this->lang->line('sales_start_typing_customer_name'); ?>"))
+		if($(this).val().match("<?php echo lang('Sales.start_typing_item_name') . '|' . lang('Sales.start_typing_customer_name') ?>"))
 		{
 			$(this).val('');
 		}
@@ -767,11 +788,11 @@ $(document).ready(function()
 	});
 
 	$('#customer').blur(function() {
-		$(this).val("<?php echo $this->lang->line('sales_start_typing_customer_name'); ?>");
+		$(this).val("<?php echo lang('Sales.start_typing_customer_name') ?>");
 	});
 
 	$('#customer').autocomplete( {
-		source: "<?php echo site_url('customers/suggest'); ?>",
+		source: "<?php echo site_url('customers/suggest') ?>",
 		minChars: 0,
 		delay: 10,
 		select: function (a, ui) {
@@ -789,7 +810,7 @@ $(document).ready(function()
 	});
 
 	$('.giftcard-input').autocomplete( {
-		source: "<?php echo site_url('giftcards/suggest'); ?>",
+		source: "<?php echo site_url('giftcards/suggest') ?>",
 		minChars: 0,
 		delay: 10,
 		select: function (a, ui) {
@@ -800,15 +821,15 @@ $(document).ready(function()
 	});
 
 	$('#comment').keyup(function() {
-		$.post("<?php echo site_url($controller_name.'/set_comment'); ?>", {comment: $('#comment').val()});
+		$.post("<?php echo esc(site_url("$controller_name/set_comment"), 'url') ?>", {comment: $('#comment').val()});
 	});
 
 	<?php
-	if($this->config->item('invoice_enable') == TRUE)
+	if(config('OSPOS')->invoice_enable == TRUE)
 	{
 	?>
 		$('#sales_invoice_number').keyup(function() {
-			$.post("<?php echo site_url($controller_name.'/set_invoice_number'); ?>", {sales_invoice_number: $('#sales_invoice_number').val()});
+			$.post("<?php echo esc(site_url("$controller_name/set_invoice_number"), 'url') ?>", {sales_invoice_number: $('#sales_invoice_number').val()});
 		});
 
 	<?php
@@ -816,36 +837,36 @@ $(document).ready(function()
 	?>
 
 	$('#sales_print_after_sale').change(function() {
-		$.post("<?php echo site_url($controller_name.'/set_print_after_sale'); ?>", {sales_print_after_sale: $(this).is(':checked')});
+		$.post("<?php echo esc(site_url("$controller_name/set_print_after_sale"), 'url') ?>", {sales_print_after_sale: $(this).is(':checked')});
 	});
 
 	$('#price_work_orders').change(function() {
-		$.post("<?php echo site_url($controller_name.'/set_price_work_orders'); ?>", {price_work_orders: $(this).is(':checked')});
+		$.post("<?php echo esc(site_url("$controller_name/set_price_work_orders"), 'url') ?>", {price_work_orders: $(this).is(':checked')});
 	});
 
 	$('#email_receipt').change(function() {
-		$.post("<?php echo site_url($controller_name.'/set_email_receipt'); ?>", {email_receipt: $(this).is(':checked')});
+		$.post("<?php echo esc(site_url("$controller_name/set_email_receipt"), 'url') ?>", {email_receipt: $(this).is(':checked')});
 	});
 
 	$('#finish_sale_button').click(function() {
-		$('#buttons_form').attr('action', "<?php echo site_url($controller_name.'/complete'); ?>");
+		$('#buttons_form').attr('action', "<?php echo esc(site_url("$controller_name/complete"), 'url') ?>");
 		$('#buttons_form').submit();
 	});
 
 	$('#finish_invoice_quote_button').click(function() {
-		$('#buttons_form').attr('action', "<?php echo site_url($controller_name.'/complete'); ?>");
+		$('#buttons_form').attr('action', "<?php echo esc(site_url("$controller_name/complete"), 'url') ?>");
 		$('#buttons_form').submit();
 	});
 
 	$('#suspend_sale_button').click(function() {
-		$('#buttons_form').attr('action', "<?php echo site_url($controller_name.'/suspend'); ?>");
+		$('#buttons_form').attr('action', "<?php echo esc(site_url("$controller_name/suspend"), 'url') ?>");
 		$('#buttons_form').submit();
 	});
 
 	$('#cancel_sale_button').click(function() {
-		if(confirm("<?php echo $this->lang->line('sales_confirm_cancel_sale'); ?>"))
+		if(confirm("<?php echo lang('Sales.confirm_cancel_sale') ?>"))
 		{
-			$('#buttons_form').attr('action', "<?php echo site_url($controller_name.'/cancel'); ?>");
+			$('#buttons_form').attr('action', "<?php echo esc(site_url("$controller_name/cancel"), 'url') ?>");
 			$('#buttons_form').submit();
 		}
 	});
@@ -919,84 +940,37 @@ $(document).ready(function()
 
 function check_payment_type()
 {
-	var cash_mode = <?php echo json_encode($cash_mode); ?>;
+	var cash_mode = <?php echo json_encode($cash_mode) ?>;
 
-	if($("#payment_types").val() == "<?php echo $this->lang->line('sales_giftcard'); ?>")
+	if($("#payment_types").val() == "<?php echo lang('Sales.giftcard') ?>")
 	{
-		$("#sale_total").html("<?php echo to_currency($total); ?>");
-		$("#sale_amount_due").html("<?php echo to_currency($amount_due); ?>");
-		$("#amount_tendered_label").html("<?php echo $this->lang->line('sales_giftcard_number'); ?>");
+		$("#sale_total").html("<?php echo to_currency($total) ?>");
+		$("#sale_amount_due").html("<?php echo to_currency($amount_due) ?>");
+		$("#amount_tendered_label").html("<?php echo lang('Sales.giftcard_number') ?>");
 		$("#amount_tendered:enabled").val('').focus();
 		$(".giftcard-input").attr('disabled', false);
 		$(".non-giftcard-input").attr('disabled', true);
 		$(".giftcard-input:enabled").val('').focus();
 	}
-	else if(($("#payment_types").val() == "<?php echo $this->lang->line('sales_cash'); ?>" && cash_mode == '1'))
+	else if(($("#payment_types").val() == "<?php echo lang('Sales.cash') ?>" && cash_mode == '1'))
 	{
-		$("#sale_total").html("<?php echo to_currency($non_cash_total); ?>");
-		$("#sale_amount_due").html("<?php echo to_currency($cash_amount_due); ?>");
-		$("#amount_tendered_label").html("<?php echo $this->lang->line('sales_amount_tendered'); ?>");
-		$("#amount_tendered:enabled").val("<?php echo to_currency_no_money($cash_amount_due); ?>");
+		$("#sale_total").html("<?php echo to_currency($non_cash_total) ?>");
+		$("#sale_amount_due").html("<?php echo to_currency($cash_amount_due) ?>");
+		$("#amount_tendered_label").html("<?php echo lang('Sales.amount_tendered') ?>");
+		$("#amount_tendered:enabled").val("<?php echo to_currency_no_money($cash_amount_due) ?>");
 		$(".giftcard-input").attr('disabled', true);
 		$(".non-giftcard-input").attr('disabled', false);
 	}
 	else
 	{
-		$("#sale_total").html("<?php echo to_currency($non_cash_total); ?>");
-		$("#sale_amount_due").html("<?php echo to_currency($amount_due); ?>");
-		$("#amount_tendered_label").html("<?php echo $this->lang->line('sales_amount_tendered'); ?>");
-		$("#amount_tendered:enabled").val("<?php echo to_currency_no_money($amount_due); ?>");
+		$("#sale_total").html("<?php echo to_currency($non_cash_total) ?>");
+		$("#sale_amount_due").html("<?php echo to_currency($amount_due) ?>");
+		$("#amount_tendered_label").html("<?php echo lang('Sales.amount_tendered') ?>");
+		$("#amount_tendered:enabled").val("<?php echo to_currency_no_money($amount_due) ?>");
 		$(".giftcard-input").attr('disabled', true);
 		$(".non-giftcard-input").attr('disabled', false);
 	}
 }
-
-// Add Keyboard Shortcuts/Hotkeys to Sale Register
-document.body.onkeyup = function(e)
-{
-	switch(event.altKey && event.keyCode) 
-	{
-        case 49: // Alt + 1 Items Seach
-			$("#item").focus();
-			$("#item").select();
-            break;
-        case 50: // Alt + 2 Customers Search
-			$("#customer").focus();
-			$("#customer").select();
-            break;
-		case 51: // Alt + 3 Suspend Current Sale
-			$("#suspend_sale_button").click();
-			break;
-		case 52: // Alt + 4 Check Suspended
-			$("#show_suspended_sales_button").click();
-			break;
-        case 53: // Alt + 5 Edit Amount Tendered Value
-			$("#amount_tendered").focus();
-			$("#amount_tendered").select();
-            break;
-		case 54: // Alt + 6 Add Payment
-			$("#add_payment_button").click();
-			break;	
-		case 55: // Alt + 7 Add Payment and Complete Sales/Invoice
-			$("#add_payment_button").click();
-			window.location.href = "<?php echo site_url('sales/complete'); ?>";
-			break; 
-		case 56: // Alt + 8 Finish Quote/Invoice without payment
-			$("#finish_invoice_quote_button").click();
-			break;
-		case 57: // Alt + 9 Open Shortcuts Help Modal
-			$("#show_keyboard_help").click();
-			break;
-	}
-	
-	switch(event.keyCode) 
-	{
-		case 27: // ESC Cancel Current Sale
-			$("#cancel_sale_button").click();
-			break;		  
-    }
-}
-
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/suspended.php b/app/Views/sales/suspended.php
index 1d4c34595..6b102ff62 100644
--- a/app/Views/sales/suspended.php
+++ b/app/Views/sales/suspended.php
@@ -1,3 +1,12 @@
+<?php
+/**
+ * @var array $suspended_sales
+ */
+
+use app\Models\Employee;
+use app\Models\Customer;
+
+?>
 <style>
 @media (min-width: 768px)
 {
@@ -9,21 +18,21 @@
 </style>
 <table id="suspended_sales_table" class="table table-striped table-hover">
 	<thead>
-		<tr bgcolor="#CCC">
-			<th><?php echo $this->lang->line('sales_suspended_doc_id'); ?></th>
-			<th><?php echo $this->lang->line('sales_date'); ?></th>
+		<tr style="background-color: #ccc;">
+			<th><?php echo lang('Sales.suspended_doc_id') ?></th>
+			<th><?php echo lang('Sales.date') ?></th>
 			<?php
-			if($this->config->item('dinner_table_enable') == TRUE)
+			if(config('OSPOS')->dinner_table_enable == TRUE)
 			{
 			?>
-				<th><?php echo $this->lang->line('sales_table'); ?></th>
+				<th><?php echo lang('Sales.table') ?></th>
 			<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_customer'); ?></th>
-			<th><?php echo $this->lang->line('sales_employee'); ?></th>
-			<th><?php echo $this->lang->line('sales_comments'); ?></th>
-			<th><?php echo $this->lang->line('sales_unsuspend_and_delete'); ?></th>
+			<th><?php echo lang('Sales.customer') ?></th>
+			<th><?php echo lang('Sales.employee') ?></th>
+			<th><?php echo lang('Sales.comments') ?></th>
+			<th><?php echo lang('Sales.unsuspend_and_delete') ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -32,13 +41,13 @@
 		{
 		?>
 			<tr>
-				<td><?php echo $suspended_sale['doc_id']; ?></td>
-				<td><?php echo date($this->config->item('dateformat'), strtotime($suspended_sale['sale_time'])); ?></td>
+				<td><?php echo $suspended_sale['doc_id'] ?></td>
+				<td><?php echo date(config('OSPOS')->dateformat, strtotime($suspended_sale['sale_time'])) ?></td>
 				<?php
-				if($this->config->item('dinner_table_enable') == TRUE)
+				if(config('OSPOS')->dinner_table_enable == TRUE)
 				{
 				?>
-					<td><?php echo $this->Dinner_table->get_name($suspended_sale['dinner_table_id']); ?></td>
+					<td><?php echo esc($this->Dinner_table->get_name($suspended_sale['dinner_table_id'])) ?></td>
 				<?php
 				}
 				?>
@@ -46,8 +55,9 @@
 					<?php
 					if(isset($suspended_sale['customer_id']))
 					{
-						$customer = $this->Customer->get_info($suspended_sale['customer_id']);
-						echo $customer->first_name . ' ' . $customer->last_name;
+						$customer = model(Customer::class);	//TODO: Should we be accessing a model in a view rather than passing this data to the view via the controller?
+						$customer_data = $customer->get_info($suspended_sale['customer_id']);
+						echo esc("$customer_data->first_name $customer_data->last_name");
 					}
 					else
 					{
@@ -61,8 +71,9 @@
 					<?php
 					if(isset($suspended_sale['employee_id']))
 					{
-						$employee = $this->Employee->get_info($suspended_sale['employee_id']);
-						echo $employee->first_name . ' ' . $employee->last_name;
+						$employee = model(Employee::class);
+						$employee_data = $employee->get_info($suspended_sale['employee_id']);
+						echo esc("$employee_data->first_name $employee_data->last_name");
 					}
 					else
 					{
@@ -72,12 +83,12 @@
 					}
 					?>
 				</td>
-				<td><?php echo $suspended_sale['comment']; ?></td>
+				<td><?php echo esc($suspended_sale['comment']) ?></td>
 				<td>
-					<?php echo form_open('sales/unsuspend'); ?>
-						<?php echo form_hidden('suspended_sale_id', $suspended_sale['sale_id']); ?>
-						<input type="submit" name="submit" value="<?php echo $this->lang->line('sales_unsuspend'); ?>" id="submit" class="btn btn-primary btn-xs pull-right">
-					<?php echo form_close(); ?>
+					<?php echo form_open('sales/unsuspend') ?>
+						<?php echo form_hidden('suspended_sale_id', $suspended_sale['sale_id']) ?>
+						<input type="submit" name="submit" value="<?php echo lang('Sales.unsuspend') ?>" id="submit" class="btn btn-primary btn-xs pull-right">
+					<?php echo form_close() ?>
 				</td>
 			</tr>
 		<?php
diff --git a/app/Views/sales/tax_invoice.php b/app/Views/sales/tax_invoice.php
index e400bfe4d..445f8fe0b 100644
--- a/app/Views/sales/tax_invoice.php
+++ b/app/Views/sales/tax_invoice.php
@@ -1,9 +1,29 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var int $sale_id_num
+ * @var bool $print_after_sale
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $invoice_number
+ * @var string $transaction_date
+ * @var float $total
+ * @var bool $include_hsn
+ * @var string $discount
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var array $payments
+ * @var string $amount_change
+ * @var string $barcode
+ * @var int $sale_id
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if(isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
@@ -14,7 +34,7 @@ $(document).ready(function()
 {
 	var send_email = function()
 	{
-		$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num; ?>',
+		$.get('<?php echo esc(site_url("/sales/send_pdf/$sale_id_num"), 'url') ?>',
 			function(response)
 			{
 				$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -31,27 +51,27 @@ $(document).ready(function()
 </script>
 <?php endif; ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => $print_after_sale, 'selected_printer' => 'invoice_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
-	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
+	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();')) */ ?>
 	<?php if(isset($customer_email) && !empty($customer_email)): ?>
-		<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . $this->lang->line('sales_send_invoice'); ?></div></a>
+		<a href="javascript:void(0);"><div class="btn btn-info btn-sm" id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . lang('Sales.send_invoice') ?></div></a>
 	<?php endif; ?>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
-	<?php echo anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>
+	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+	<?php echo anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 </div>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_tax_invoice'); ?></div>
+	<div id="header"><?php echo lang('Sales.tax_invoice') ?></div>
 	<div id="block1">
 		<div id="customer-title">
 			<?php
 			if(isset($customer))
 			{
 			?>
-				<div id="customer"><?php echo nl2br($customer_info) ?></div>
+				<div id="customer"><?php echo nl2br(esc($customer_info)) ?></div>
 			<?php
 			}
 			?>
@@ -59,19 +79,19 @@ $(document).ready(function()
 
 		<div id="logo">
 			<?php
-			if($this->Appconfig->get('company_logo') != '')
+			if(config('OSPOS')->company_logo != '')
 			{
 			?>
-				<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo esc(base_url('uploads/' . config('OSPOS')->company_logo), 'url') ?>" alt="company_logo" />
 			<?php
 			}
 			?>
 			<div>&nbsp</div>
 			<?php
-			if($this->Appconfig->get('receipt_show_company_name'))
+			if(config('OSPOS')->receipt_show_company_name)
 			{
 			?>
-				<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+				<div id="company_name"><?php echo esc(config('OSPOS')->company) ?></div>
 			<?php
 			}
 			?>
@@ -79,82 +99,82 @@ $(document).ready(function()
 	</div>
 
 	<div id="block2">
-		<div id="company-title"><?php echo nl2br($company_info) ?></div>
+		<div id="company-title"><?php echo nl2br(esc($company_info)) ?></div>
 		<table id="meta">
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
-				<td><?php echo $invoice_number; ?></td>
+				<td class="meta-head"><?php echo lang('Sales.invoice_number') ?> </td>
+				<td><?php echo esc($invoice_number) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><?php echo $transaction_date; ?></td>
+				<td class="meta-head"><?php echo lang('Common.date') ?></td>
+				<td><?php echo esc($transaction_date) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-				<td><?php echo to_currency($total); ?></td>
+				<td class="meta-head"><?php echo lang('Sales.amount_due') ?></td>
+				<td><?php echo to_currency($total) ?></td>
 			</tr>
 		</table>
 	</div>
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
 			<?php
 				$invoice_columns = 6;
 				if($include_hsn)
 				{
-					$invoice_columns += 1;
+					$invoice_columns += 1;	//TODO: $invoice_columns++; ?
 					?>
-					<th><?php echo $this->lang->line('sales_hsn'); ?></th>
+					<th><?php echo lang('Sales.hsn') ?></th>
 					<?php
 				}
 			?>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
 			<?php
 			if($discount > 0)
 			{
-				$invoice_columns += 1;
+				$invoice_columns += 1;	//TODO: $invoice_columns++; ?
 				?>
-				<th><?php echo $this->lang->line('sales_customer_discount'); ?></th>
+				<th><?php echo lang('Sales.customer_discount') ?></th>
 			<?php
 			}
 			?>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
-			if($item['print_option'] == PRINT_YES)
+			if($item['print_option'] == PRINT_YES)	//TODO: === ?
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
+					<td><?php echo $item['item_number'] ?></td>
 					<?php if($include_hsn): ?>
-						<td style='text-align:center;'><?php echo $item['hsn_code']; ?></td>
+						<td style='text-align:center;'><?php echo esc($item['hsn_code']) ?></td>
 					<?php endif; ?>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
 					<?php if($discount > 0): ?>
-						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']) ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 				<?php
 				if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
 				{
 				?>
 					<tr class="item-row">
-						<td><?php echo $item['hsn_code']; ?></td>
-						<td class="item-description" colspan="<?php echo $invoice_columns-2; ?>">
-							<?php echo $item['description']; ?>
+						<td><?php echo esc($item['hsn_code']) ?></td>
+						<td class="item-description" colspan="<?php echo $invoice_columns-2 ?>">
+							<?php echo esc($item['description']) ?>
 						</td>
-						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
+						<td style='text-align:center;'><?php echo esc($item['serialnumber']) //TODO: serialnumber does not meet naming conventions for this project ?></td>
 					</tr>
 				<?php
 				}
@@ -163,13 +183,13 @@ $(document).ready(function()
 		?>
 
 		<tr>
-			<td class="blank" colspan="<?php echo $invoice_columns; ?>" align="center"><?php echo '&nbsp;'; ?></td>
+			<td class="blank" colspan="<?php echo $invoice_columns ?>" style="text-align: center;"><?php echo '&nbsp;' ?></td>
 		</tr>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank-bottom"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal) ?></td>
 		</tr>
 
 		<?php
@@ -177,33 +197,33 @@ $(document).ready(function()
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 			</tr>
 		<?php
 		}
 		?>
 
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total) ?></td>
 		</tr>
 
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
 			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
-				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0] ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ) ?></td>
 			</tr>
 		<?php
 		}
@@ -212,9 +232,9 @@ $(document).ready(function()
 		{
 		?>
 			<tr>
-				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?>/td>
-				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
+				<td colspan="<?php echo $invoice_columns-3 ?>" class="blank"> </td>
+				<td colspan="2" class="total-line"><?php echo lang('Sales.giftcard_balance') ?>/td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value) ?></td>
 			</tr>
 			<?php
 		}
@@ -223,9 +243,9 @@ $(document).ready(function()
 		{
 		?>
 		<tr>
-			<td colspan="<?php echo $invoice_columns-3; ?>" ><?php echo $this->lang->line('sales_authorized_signature');?>:</td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></td>
-			<td class="total-value" id="change"><?php echo to_currency($amount_change); ?></td>
+			<td colspan="<?php echo $invoice_columns-3 ?>" ><?php echo lang('Sales.authorized_signature') ?>:</td>
+			<td colspan="2" class="total-line"><?php echo lang($amount_change >= 0 ? ($only_sale_check ? 'Sales.check_balance' : 'Sales.change_due') : 'Sales.amount_due') ?></td>
+			<td class="total-value" id="change"><?php echo to_currency($amount_change) ?></td>
 		</tr>
 		<?php
 		}
@@ -235,15 +255,15 @@ $(document).ready(function()
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div><?php echo nl2br($this->config->item('payment_message')); ?></div>
-				<div style='padding:4%;'><?php echo empty($comments) ? '' : $this->lang->line('sales_comments') . ': ' . $comments; ?></div>
-				<div style='padding:4%;'><?php echo $this->config->item('invoice_default_comments'); ?></div>
+				<span><?php echo nl2br(config('OSPOS')->payment_message) ?></span>
+				<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . esc(": $comments") ?></span>
+				<span style='padding:4%;'><?php echo esc(config('OSPOS')->invoice_default_comments) ?></span>
 			</h5>
-			<div style='padding:2%;'><?php echo nl2br($this->config->item('return_policy')); ?></div>
+			<div style='padding:2%;'><?php echo nl2br(esc(config('OSPOS')->return_policy)) ?></div>
 		</div>
 		<div id='barcode'>
-			<img style='padding-top:4%;' src='data:image/png;base64,<?php echo $barcode; ?>' /><br>
-			<?php echo $sale_id; ?>
+			<img style='padding-top:4%;' alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
+			<?php echo $sale_id ?>
 		</div>
 	</div>
 </div>
@@ -254,7 +274,7 @@ $(window).on("load", function()
 	// install firefox addon in order to use this plugin
 	if(window.jsPrintSetup)
 	{
-		<?php if(!$this->Appconfig->get('print_header'))
+		<?php if(!config('OSPOS')->print_header)
 		{
 		?>
 			// set page header
@@ -264,7 +284,7 @@ $(window).on("load", function()
 		<?php
 		}
 
-		if(!$this->Appconfig->get('print_footer'))
+		if(!config('OSPOS')->print_footer)
 		{
 		?>
 			// set empty page footer
@@ -278,4 +298,4 @@ $(window).on("load", function()
 });
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/work_order.php b/app/Views/sales/work_order.php
index 884ff2ee2..acaf9935e 100644
--- a/app/Views/sales/work_order.php
+++ b/app/Views/sales/work_order.php
@@ -1,9 +1,27 @@
-<?php $this->load->view("partial/header"); ?>
+<?php
+/**
+ * @var int $sale_id_num
+ * @var bool $print_after_sale
+ * @var string $sales_work_order
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $work_order_number_label
+ * @var string $work_order_number
+ * @var string $transaction_date
+ * @var bool $print_price_info
+ * @var string $total
+ * @var array $cart
+ * @var float $subtotal
+ * @var array $taxes
+ * @var array $payments
+ */
+?>
+<?php echo view('partial/header') ?>
 
 <?php
 if(isset($error_message))
 {
-	echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+	echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 	exit;
 }
 ?>
@@ -14,7 +32,7 @@ if(isset($error_message))
 		{
 			var send_email = function()
 			{
-				$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num . "/work_order"; ?>',
+				$.get('<?php echo esc(site_url("/sales/send_pdf/$sale_id_num/work_order")) ?>',
 					function(response)
 					{
 						$.notify( { message: response.message }, { type: response.success ? 'success' : 'danger'} )
@@ -31,27 +49,27 @@ if(isset($error_message))
 	</script>
 <?php endif; ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
+<?php echo view('partial/print_receipt', ['print_after_sale' => $print_after_sale, 'selected_printer' => 'invoice_printer']) ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'); ?></div></a>
-	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm" id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print') ?></div></a>
+	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print">&nbsp</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();')) */ ?>
 	<?php if(isset($customer_email) && !empty($customer_email)): ?>
-		<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . $this->lang->line('sales_send_work_order'); ?></div></a>
+		<a href="javascript:void(0);"><div class="btn btn-info btn-sm" id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope">&nbsp</span>' . lang('Sales.send_work_order') ?></div></a>
 	<?php endif; ?>
-	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
-	<?php echo anchor("sales/discard_suspended_sale", '<span class="glyphicon glyphicon-remove">&nbsp</span>' . $this->lang->line('sales_discard'), array('class'=>'btn btn-danger btn-sm', 'id'=>'discard_work_order_button')); ?>
+	<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+	<?php echo anchor("sales/discard_suspended_sale", '<span class="glyphicon glyphicon-remove">&nbsp</span>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_work_order_button']) ?>
 </div>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $sales_work_order; ?></div>
+	<div id="header"><?php echo $sales_work_order ?></div>
 	<div id="block1">
 		<div id="customer-title">
 			<?php
 			if(isset($customer))
 			{
 			?>
-				<div id="customer"><?php echo nl2br($customer_info) ?></div>
+				<div id="customer"><?php echo esc(nl2br($customer_info)) ?></div>
 			<?php
 			}
 			?>
@@ -59,19 +77,19 @@ if(isset($error_message))
 
 		<div id="logo">
 			<?php
-			if($this->Appconfig->get('company_logo') != '')
+			if(config('OSPOS')->company_logo != '')
 			{
 			?>
-				<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
+				<img id="image" src="<?php echo base_url('uploads/' . config('OSPOS')->company_logo) ?>" alt="company_logo" />
 			<?php
 			}
 			?>
 			<div>&nbsp</div>
 			<?php
-			if($this->Appconfig->get('receipt_show_company_name'))
+			if(config('OSPOS')->receipt_show_company_name)
 			{
 			?>
-				<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+				<div id="company_name"><?php echo esc(config('OSPOS')->company) ?></div>
 			<?php
 			}
 			?>
@@ -79,23 +97,23 @@ if(isset($error_message))
 	</div>
 
 	<div id="block2">
-		<div id="company-title"><?php echo nl2br($company_info) ?></div>
+		<div id="company-title"><?php echo esc(nl2br($company_info)) ?></div>
 		<table id="meta">
 			<tr>
-				<td class="meta-head"><?php echo $work_order_number_label;?> </td>
-				<td><?php echo $work_order_number; ?></td>
+				<td class="meta-head"><?php echo esc($work_order_number_label) ?> </td>
+				<td><?php echo esc($work_order_number) ?></td>
 			</tr>
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><?php echo $transaction_date; ?></td>
+				<td class="meta-head"><?php echo lang('Common.date') ?></td>
+				<td><?php echo esc($transaction_date) ?></td>
 			</tr>
 			<?php
 			if($print_price_info)
 			{
 			?>
 				<tr>
-					<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-					<td><?php echo to_currency($total); ?></td>
+					<td class="meta-head"><?php echo lang('Sales.amount_due') ?></td>
+					<td><?php echo to_currency(esc($total)) ?></td>
 				</tr>
 			<?php
 			}
@@ -105,26 +123,26 @@ if(isset($error_message))
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php if($print_price_info) echo to_currency($item['price']); ?></td>
-					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
-					<td style='border-right: solid 1px; text-align:right;'><?php if($print_price_info) echo to_currency($item['discounted_total']); ?></td>
+					<td><?php echo esc($item['item_number']) ?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php if($print_price_info) echo to_currency($item['price']) ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php if($print_price_info) echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 
 				<?php
@@ -133,8 +151,8 @@ if(isset($error_message))
 				?>
 					<tr class="item-row">
 						<td></td>
-						<td class="item-name" colspan="4"><?php echo $item['description']; ?></td>
-						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
+						<td class="item-name" colspan="4"><?php echo esc($item['description']) ?></td>
+						<td style='text-align:center;'><?php echo esc($item['serialnumber']) ?></td>
 					</tr>
 				<?php
 				}
@@ -142,45 +160,45 @@ if(isset($error_message))
 		}
 		?>
 		<tr>
-			<td class="blank" colspan="6" align="center"><?php echo '&nbsp;'; ?></td>
+			<td class="blank" colspan="6" style="text-align: center;"><?php echo '&nbsp;' //TODO: Why is PHP needed for an HTML `&nbsp;`? ?></td>
 		</tr>
 		<?php if($print_price_info) { ?>
 			<tr>
 				<td colspan="3" class="blank-bottom"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-				<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
+				<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+				<td class="total-value" id="subtotal"><?php echo to_currency($subtotal) ?></td>
 			</tr>
 			<?php
-			foreach($taxes as $tax_group_index=>$tax)
+			foreach($taxes as $tax_group_index => $tax)
 			{
 				?>
 				<tr>
 					<td colspan="3" class="blank"> </td>
-					<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
-					<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
+					<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group'] ?></td>
+					<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']) ?></td>
 				</tr>
 				<?php
 			}
 			?>
 			<tr>
 				<td colspan="3" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-				<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
+				<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+				<td class="total-value" id="total"><?php echo to_currency($total) ?></td>
 			</tr>
 		<?php } ?>
 		<?php
 		$only_sale_check = FALSE;
 		$show_giftcard_remainder = FALSE;
-		foreach($payments as $payment_id=>$payment)
+		foreach($payments as $payment_id => $payment)
 		{
-			$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
-			$splitpayment = explode(':', $payment['payment_type']);
-			$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+			$only_sale_check |= $payment['payment_type'] == lang('Sales.check');
+			$splitpayment = explode(':', $payment['payment_type']);	//TODO: $splitpayment does not match naming conventions for the project
+			$show_giftcard_remainder |= $splitpayment[0] == lang('Sales.giftcard');
 			?>
 			<tr>
 				<td colspan="3" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
-				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0] ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] ) ?></td>
 			</tr>
 			<?php
 		}
@@ -189,7 +207,7 @@ if(isset($error_message))
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div style='padding:4%;'><?php echo empty($comments) ? '' : $this->lang->line('sales_comments') . ': ' . $comments; ?></div>
+				<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . esc(": $comments") ?></span>
 			</h5>
 		</div>
 	</div>
@@ -201,7 +219,7 @@ if(isset($error_message))
 		// install firefox addon in order to use this plugin
 		if(window.jsPrintSetup)
 		{
-			<?php if(!$this->Appconfig->get('print_header'))
+			<?php if(!config('OSPOS')->print_header)
 			{
 			?>
 				// set page header
@@ -211,7 +229,7 @@ if(isset($error_message))
 			<?php
 			}
 
-			if(!$this->Appconfig->get('print_footer'))
+			if(!config('OSPOS')->print_footer)
 			{
 			?>
 				// set empty page footer
@@ -225,4 +243,4 @@ if(isset($error_message))
 	});
 </script>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/sales/work_order_email.php b/app/Views/sales/work_order_email.php
index 73b9dd104..d7f87751f 100644
--- a/app/Views/sales/work_order_email.php
+++ b/app/Views/sales/work_order_email.php
@@ -1,59 +1,72 @@
+<?php
+/**
+ * @var string $customer_info
+ * @var string $company_info
+ * @var string $work_order_number
+ * @var string $transaction_date
+ * @var string $amount_due
+ * @var float $total
+ * @var array $cart
+ * @var float $tax_exclusive_subtotal
+ * @var array $taxes
+ */
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
+<html lang="<?php echo $this->request->getLocale() ?>">
+<head title="<?php echo lang('Sales.work_order') ?>">
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css';?>"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url() . 'css/invoice_email.css' ?>"/>
 </head>
 
 <body>
 <?php
 	if(isset($error_message))
 	{
-		echo "<div class='alert alert-dismissible alert-danger'>".$error_message."</div>";
+		echo "<div class='alert alert-dismissible alert-danger'>$error_message</div>";
 		exit;
 	}
 ?>
 
 <div id="page-wrap">
-	<div id="header"><?php echo $this->lang->line('sales_work_order'); ?></div>
+	<div id="header"><?php echo lang('Sales.work_order') ?></div>
 	<table id="info">
 		<tr>
 			<td id="logo">
 				<?php
-				if($this->config->item('company_logo') != '')
+				if(config('OSPOS')->company_logo != '')
 				{
 				?>
-					<img id="image" src="<?php echo 'uploads/' . $this->config->item('company_logo'); ?>" alt="company_logo" />
+					<img id="image" src="<?php echo esc('uploads/' . config('OSPOS')->company_logo, 'url') ?>" alt="company_logo" />
 				<?php
 				}
 				?>
 			</td>
 			<td id="customer-title">
-				<pre><?php if(isset($customer)) { echo $customer_info; } ?></pre>
+				<pre><?php if(isset($customer)) { echo esc($customer_info); } ?></pre>
 			</td>
 		</tr>
 		<tr>
 			<td id="company-title">
-				<pre><?php echo $this->config->item('company'); ?></pre>
-				<pre><?php echo $company_info; ?></pre>
+				<pre><?php echo esc(config('OSPOS')->company) ?></pre>
+				<pre><?php echo esc($company_info) ?></pre>
 			</td>
 			<td id="meta">
 				<table align="right">
 					<tr>
-						<td class="meta-head"><?php echo $this->lang->line('sales_work_order_number');?> </td>
-						<td><?php echo $work_order_number; ?></td>
+						<td class="meta-head"><?php echo lang('Sales.work_order_number') ?> </td>
+						<td><?php echo esc($work_order_number) ?></td>
 					</tr>
 					<tr>
-						<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-						<td><?php echo $transaction_date; ?></td>
+						<td class="meta-head"><?php echo lang('Common.date') ?></td>
+						<td><?php echo esc($transaction_date) ?></td>
 					</tr>
 					<?php
 					if($amount_due > 0)
 					{
 					?>
 						<tr>
-							<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-							<td class="due"><?php echo to_currency($total); ?></td>
+							<td class="meta-head"><?php echo lang('Sales.amount_due') ?></td>
+							<td class="due"><?php echo to_currency($total) ?></td>
 						</tr>
 					<?php
 					}
@@ -65,27 +78,27 @@
 
 	<table id="items">
 		<tr>
-			<th><?php echo $this->lang->line('sales_item_number'); ?></th>
-			<th><?php echo $this->lang->line('sales_item_name'); ?></th>
-			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
-			<th><?php echo $this->lang->line('sales_price'); ?></th>
-			<th><?php echo $this->lang->line('sales_discount'); ?></th>
-			<th><?php echo $this->lang->line('sales_total'); ?></th>
+			<th><?php echo lang('Sales.item_number') ?></th>
+			<th><?php echo lang('Sales.item_name') ?></th>
+			<th><?php echo lang('Sales.quantity') ?></th>
+			<th><?php echo lang('Sales.price') ?></th>
+			<th><?php echo lang('Sales.discount') ?></th>
+			<th><?php echo lang('Sales.total') ?></th>
 		</tr>
 
 		<?php
-		foreach($cart as $line=>$item)
+		foreach($cart as $line => $item)
 		{
 			if($item['print_option'] == PRINT_YES)
 			{
 			?>
 				<tr class="item-row">
-					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><?php echo $item['name']; ?></td>
-					<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
-					<td><?php echo to_currency($item['price']); ?></td>
-					<td><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):to_decimals($item['discount']) . '%';?></td>
-					<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
+					<td><?php echo esc($item['item_number']) ?></td>
+					<td class="item-name"><?php echo esc($item['name']) ?></td>
+					<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
+					<td><?php echo to_currency($item['price']) ?></td>
+					<td><?php echo ($item['discount_type'] == FIXED) ? to_currency($item['discount']) : to_decimals($item['discount']) . '%' ?></td>
+					<td class="total-line"><?php echo to_currency($item['discounted_total']) ?></td>
 				</tr>
 			<?php
 			}
@@ -93,23 +106,23 @@
 		?>
 
 		<tr>
-			<td colspan="6" align="center"><?php echo '&nbsp;'; ?></td>
+			<td colspan="6" align="center"><?php echo '&nbsp;' ?></td>
 		</tr>
 
 		<tr>
 			<td colspan="3" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
-			<td id="subtotal" class="total-value"><?php echo to_currency($tax_exclusive_subtotal); ?></td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.sub_total') ?></td>
+			<td id="subtotal" class="total-value"><?php echo to_currency($tax_exclusive_subtotal) ?></td>
 		</tr>
 
 		<?php
-		foreach($taxes as $name=>$value)
+		foreach($taxes as $name => $value)
 		{
 		?>
 			<tr>
 				<td colspan="3" class="blank"> </td>
-				<td colspan="2" class="total-line"><?php echo $name; ?></td>
-				<td id="taxes" class="total-value"><?php echo to_currency_tax($value); ?></td>
+				<td colspan="2" class="total-line"><?php echo esc($name) ?></td>
+				<td id="taxes" class="total-value"><?php echo to_currency_tax($value) ?></td>
 			</tr>
 		<?php
 		}
@@ -117,15 +130,15 @@
 
 		<tr>
 			<td colspan="3" class="blank"> </td>
-			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
-			<td id="total" class="total-value"><?php echo to_currency($total); ?></td>
+			<td colspan="2" class="total-line"><?php echo lang('Sales.total') ?></td>
+			<td id="total" class="total-value"><?php echo to_currency($total) ?></td>
 		</tr>
 	</table>
 
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<div style='padding:4%;'><?php echo empty($comments) ? '' : $this->lang->line('sales_comments') . ': ' . $comments; ?></div>
+				<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . esc(": $comments") ?></span>
 			</h5>
 		</div>
 	</div>
diff --git a/app/Views/suppliers/form.php b/app/Views/suppliers/form.php
index e38aad396..734263eb5 100644
--- a/app/Views/suppliers/form.php
+++ b/app/Views/suppliers/form.php
@@ -1,101 +1,112 @@
-<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-
-<ul id="error_message_box" class="error_message_box"></ul>
-
-<?php echo form_open($controller_name . '/save/' . $person_info->person_id, array('id'=>'supplier_form', 'class'=>'form-horizontal')); ?>
-	<fieldset id="supplier_basic_info">
-		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('suppliers_company_name'), 'company_name', array('class'=>'required control-label col-xs-3')); ?>
-			<div class='col-xs-8'>
-				<?php echo form_input(array(
-					'name'=>'company_name',
-					'id'=>'company_name_input',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->company_name)
-					);?>
-			</div>
-		</div>
-
-		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('suppliers_category'), 'category', array('class'=>'required control-label col-xs-3')); ?>
-			<div class='col-xs-6'>
-				<?php echo form_dropdown('category', $categories, $person_info->category, array('class'=>'form-control', 'id'=>'category'));?>
-			</div>
-		</div>
-
-		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('suppliers_agency_name'), 'agency_name', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-8'>
-				<?php echo form_input(array(
-					'name'=>'agency_name',
-					'id'=>'agency_name_input',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->agency_name)
-					);?>
-			</div>
-		</div>
-
-		<?php $this->load->view("people/form_basic_info"); ?>
-
-		<div class="form-group form-group-sm">	
-			<?php echo form_label($this->lang->line('suppliers_account_number'), 'account_number', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-8'>
-				<?php echo form_input(array(
-					'name'=>'account_number',
-					'id'=>'account_number',
-					'class'=>'form-control input-sm',
-					'value'=>$person_info->account_number)
-					);?>
-			</div>
-		</div>
-
-		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('suppliers_tax_id'), 'tax_id', array('class'=>'control-label col-xs-3')); ?>
-			<div class='col-xs-8'>
-				<?php echo form_input(array(
-						'name'=>'tax_id',
-						'id'=>'tax_id',
-						'class'=>'form-control input-sm',
-						'value'=>$person_info->tax_id)
-				);?>
-			</div>
-		</div>
-	</fieldset>
-<?php echo form_close(); ?>
-
-<script type="text/javascript">
-//validation and submit handling
-$(document).ready(function()
-{
-	$('#supplier_form').validate($.extend({
-		submitHandler: function(form) {
-			$(form).ajaxSubmit({
-				success: function(response)
-				{
-					dialog_support.hide();
-					table_support.handle_submit("<?php echo site_url($controller_name); ?>", response);
-				},
-				dataType: 'json'
-			});
-		},
-
-		errorLabelContainer: '#error_message_box',
- 
-		rules:
-		{
-			company_name: 'required',
-			first_name: 'required',
-			last_name: 'required',
-			email: 'email'
-   		},
-
-		messages: 
-		{
-			company_name: "<?php echo $this->lang->line('suppliers_company_name_required'); ?>",
-			first_name: "<?php echo $this->lang->line('common_first_name_required'); ?>",
-			last_name: "<?php echo $this->lang->line('common_last_name_required'); ?>",
-			email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>"
-		}
-	}, form_support.error));
-});
-</script>
+<?php
+/**
+ * @var string $controller_name
+ * @var object $person_info
+ * @var array $categories
+ */
+?>
+<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
+
+<ul id="error_message_box" class="error_message_box"></ul>
+
+<?php echo form_open(esc("$controller_name/save/$person_info->person_id", 'url'), ['id' => 'supplier_form', 'class' => 'form-horizontal']) ?>
+	<fieldset id="supplier_basic_info">
+		<div class="form-group form-group-sm">
+			<?php echo form_label(lang('Suppliers.company_name'), 'company_name', ['class' => 'required control-label col-xs-3']) ?>
+			<div class='col-xs-8'>
+				<?php echo form_input([
+					'name' => 'company_name',
+					'id' => 'company_name_input',
+					'class' => 'form-control input-sm',
+					'value' => esc($person_info->company_name, 'attr')
+					])
+				?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label(lang('Suppliers.category'), 'category', ['class' => 'required control-label col-xs-3']) ?>
+			<div class='col-xs-6'>
+				<?php echo form_dropdown('category', esc($categories), esc($person_info->category), ['class' => 'form-control', 'id' => 'category']) ?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">	
+			<?php echo form_label(lang('Suppliers.agency_name'), 'agency_name', ['class' => 'control-label col-xs-3']) ?>
+			<div class='col-xs-8'>
+				<?php echo form_input ([
+					'name' => 'agency_name',
+					'id' => 'agency_name_input',
+					'class' => 'form-control input-sm',
+					'value' => esc($person_info->agency_name, 'attr')
+					])
+				?>
+			</div>
+		</div>
+
+		<?php echo view('people/form_basic_info') ?>
+
+		<div class="form-group form-group-sm">	
+			<?php echo form_label(lang('Suppliers.account_number'), 'account_number', ['class' => 'control-label col-xs-3']) ?>
+			<div class='col-xs-8'>
+				<?php echo form_input ([
+					'name' => 'account_number',
+					'id' => 'account_number',
+					'class' => 'form-control input-sm',
+					'value' => esc($person_info->account_number, 'attr')
+					])
+				?>
+			</div>
+		</div>
+
+		<div class="form-group form-group-sm">
+			<?php echo form_label(lang('Suppliers.tax_id'), 'tax_id', ['class' => 'control-label col-xs-3']) ?>
+			<div class='col-xs-8'>
+				<?php echo form_input ([
+						'name' => 'tax_id',
+						'id' => 'tax_id',
+						'class' => 'form-control input-sm',
+						'value' => esc($person_info->tax_id, 'attr')
+					])
+				?>
+			</div>
+		</div>
+	</fieldset>
+<?php echo form_close() ?>
+
+<script type="text/javascript">
+//validation and submit handling
+$(document).ready(function()
+{
+	$('#supplier_form').validate($.extend({
+		submitHandler: function(form) {
+			$(form).ajaxSubmit({
+				success: function(response)
+				{
+					dialog_support.hide();
+					table_support.handle_submit("<?php echo esc(site_url($controller_name), 'url') ?>", response);
+				},
+				dataType: 'json'
+			});
+		},
+
+		errorLabelContainer: '#error_message_box',
+ 
+		rules:
+		{
+			company_name: 'required',
+			first_name: 'required',
+			last_name: 'required',
+			email: 'email'
+   		},
+
+		messages: 
+		{
+			company_name: "<?php echo lang('Suppliers.company_name_required') ?>",
+			first_name: "<?php echo lang('Common.first_name_required') ?>",
+			last_name: "<?php echo lang('Common.last_name_required') ?>",
+			email: "<?php echo lang('Common.email_invalid_format') ?>"
+		}
+	}, form_support.error));
+});
+</script>
diff --git a/app/Views/taxes/manage.php b/app/Views/taxes/manage.php
index ffddc3c2e..27b289651 100644
--- a/app/Views/taxes/manage.php
+++ b/app/Views/taxes/manage.php
@@ -1,4 +1,4 @@
-<?php $this->load->view("partial/header"); ?>
+<?php echo view('partial/header') ?>
 
 <script type="text/javascript">
 	dialog_support.init("a.modal-dlg");
@@ -6,32 +6,32 @@
 
 <ul class="nav nav-tabs" data-tabs="tabs">
 	<li class="active" role="presentation">
-		<a data-toggle="tab" href="#tax_codes_tab" title="<?php echo $this->lang->line('taxes_tax_codes_configuration'); ?>"><?php echo $this->lang->line('taxes_tax_codes'); ?></a>
+		<a data-toggle="tab" href="#tax_codes_tab" title="<?php echo lang('Taxes.tax_codes_configuration') ?>"><?php echo lang('Taxes.tax_codes') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#tax_jurisdictions_tab" title="<?php echo $this->lang->line('taxes_tax_jurisdictions_configuration'); ?>"><?php echo $this->lang->line('taxes_tax_jurisdictions'); ?></a>
+		<a data-toggle="tab" href="#tax_jurisdictions_tab" title="<?php echo lang('Taxes.tax_jurisdictions_configuration') ?>"><?php echo lang('Taxes.tax_jurisdictions') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#tax_categories_tab" title="<?php echo $this->lang->line('taxes_tax_categories_configuration'); ?>"><?php echo $this->lang->line('taxes_tax_categories'); ?></a>
+		<a data-toggle="tab" href="#tax_categories_tab" title="<?php echo lang('Taxes.tax_categories_configuration') ?>"><?php echo lang('Taxes.tax_categories') ?></a>
 	</li>
 	<li role="presentation">
-		<a data-toggle="tab" href="#tax_rates_tab" title="<?php echo $this->lang->line('taxes_tax_rate_configuration'); ?>"><?php echo $this->lang->line('taxes_tax_rates'); ?></a>
+		<a data-toggle="tab" href="#tax_rates_tab" title="<?php echo lang('Taxes.tax_rate_configuration') ?>"><?php echo lang('Taxes.tax_rates') ?></a>
 	</li>
 </ul>
 
 <div class="tab-content">
 	<div class="tab-pane fade in active" id="tax_codes_tab">
-		<?php $this->load->view("taxes/tax_codes"); ?>
+		<?php echo view('taxes/tax_codes') ?>
 	</div>
 	<div class="tab-pane" id="tax_jurisdictions_tab">
-		<?php $this->load->view("taxes/tax_jurisdictions"); ?>
+		<?php echo view('taxes/tax_jurisdictions') ?>
 	</div>
 	<div class="tab-pane" id="tax_categories_tab">
-		<?php $this->load->view("taxes/tax_categories"); ?>
+		<?php echo view('taxes/tax_categories') ?>
 	</div>
 	<div class="tab-pane" id="tax_rates_tab">
-		<?php $this->load->view("taxes/tax_rates"); ?>
+		<?php echo view('taxes/tax_rates') ?>
 	</div>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php echo view('partial/footer') ?>
diff --git a/app/Views/taxes/tax_categories.php b/app/Views/taxes/tax_categories.php
index b1ede7ffc..84838c89c 100644
--- a/app/Views/taxes/tax_categories.php
+++ b/app/Views/taxes/tax_categories.php
@@ -1,27 +1,33 @@
-<?php echo form_open('taxes/save_tax_categories/', array('id' => 'tax_categories_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $tax_categories
+ */
+?>
+<?php echo form_open('taxes/save_tax_categories/', ['id' => 'tax_categories_form', 'class' => 'form-horizontal']) ?>
 <div id="config_wrapper">
 	<fieldset id="config_info">
-		<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+		<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 		<ul id="tax_categories_error_message_box" class="error_message_box"></ul>
 
 		<div id="tax_categories">
-			<?php $this->load->view('partial/tax_categories'); ?>
+			<?php echo view('partial/tax_categories') ?>
 		</div>
 
-		<?php echo form_submit(array(
+		<?php echo form_submit([
 			'name' => 'submit_tax_categories',
 			'id' => 'submit_tax_categories',
-			'value' => $this->lang->line('common_submit'),
-			'class' => 'btn btn-primary btn-sm pull-right')); ?>
+			'value' => lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm pull-right'
+		]) ?>
 	</fieldset>
 </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 	//validation and submit handling
 	$(document).ready(function()
 	{
-		var tax_categories_count = <?php echo sizeof($tax_categories); ?>;
+		var tax_categories_count = <?php echo sizeof($tax_categories) ?>;
 		if (tax_categories_count == 0) {
 			tax_categories_count = 1;
 		}
@@ -47,7 +53,7 @@
 			++tax_categories_count;
 			var new_tax_category_id = 'tax_category_' + tax_categories_count;
 
-			$(new_block).find('label').html("<?php echo $this->lang->line('taxes_tax_category'); ?> " + tax_categories_count).attr('for', new_tax_category_id).attr('class', 'control-label col-xs-2');
+			$(new_block).find('label').html("<?php echo lang('Taxes.tax_category') ?> " + tax_categories_count).attr('for', new_tax_category_id).attr('class', 'control-label col-xs-2');
 			$(new_block).find("input[name='tax_category[]']").attr('id', new_tax_category_id).removeAttr('disabled').attr('class', 'form-control input-sm required').val('');
 			$(new_block).find("input[name='tax_group_sequence[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
 			$(new_block).find("input[name='tax_category_id[]']").val('-1');
@@ -78,34 +84,34 @@
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_category_duplicate'); ?>");
+		}, "<?php echo lang('Taxes.tax_category_duplicate') ?>");
 
 		$.validator.addMethod('validateTaxCategoryCharacters', function(value, element) {
 			if ((value.indexOf('_') != -1)) {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_category_invalid_chars'); ?>");
+		}, "<?php echo lang('Taxes.tax_category_invalid_chars') ?>");
 
 		$.validator.addMethod('requireTaxCategory', function(value, element) {
 			if (value .trim() == '') {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_category_required'); ?>");
+		}, "<?php echo lang('Taxes.tax_category_required') ?>");
 
 		$('#tax_categories_form').validate($.extend(form_support.handler, {
 			submitHandler: function(form) {
 				$(form).ajaxSubmit({
 					success: function(response)	{
 						$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-						$("#tax_categories").load('<?php echo site_url("taxes/ajax_tax_categories"); ?>', init_add_remove_tax_categories);
+						$("#tax_categories").load('<?php echo esc(site_url("taxes/ajax_tax_categories"), 'url') ?>', init_add_remove_tax_categories);
 					},
 					dataType: 'json'
 				});
 			},
 			invalidHandler: function(event, validator) {
-				$.notify("<?php echo $this->lang->line('common_correct_errors'); ?>");
+				$.notify("<?php echo lang('Common.correct_errors') ?>");
 			},
 			errorLabelContainer: "#tax_category_error_message_box"
 		}));
diff --git a/app/Views/taxes/tax_codes.php b/app/Views/taxes/tax_codes.php
index d061fb500..45fa8af51 100644
--- a/app/Views/taxes/tax_codes.php
+++ b/app/Views/taxes/tax_codes.php
@@ -1,27 +1,32 @@
-<?php echo form_open('taxes/save_tax_codes/', array('id' => 'tax_codes_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $tax_codes
+ */
+?>
+<?php echo form_open('taxes/save_tax_codes/', ['id' => 'tax_codes_form', 'class' => 'form-horizontal']) ?>
 <div id="config_wrapper">
 	<fieldset id="config_info">
-		<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+		<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 		<ul id="tax_codes_error_message_box" class="error_message_box"></ul>
 
 		<div id="tax_codes">
-			<?php $this->load->view('partial/tax_codes', array('tax_codes' => $tax_codes)); ?>
+			<?php echo view('partial/tax_codes', ['tax_codes' => $tax_codes]) ?>
 		</div>
 
-		<?php echo form_submit(array(
+		<?php echo form_submit ([
 			'name' => 'submit_tax_codes',
 			'id' => 'submit_tax_codes',
-			'value' => $this->lang->line('common_submit'),
-			'class' => 'btn btn-primary btn-sm pull-right')); ?>
+			'value' => lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm pull-right']) ?>
 	</fieldset>
 </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 	//validation and submit handling
 	$(document).ready(function()
 	{
-		var tax_code_count = <?php echo sizeof($tax_codes); ?>;
+		var tax_code_count = <?php echo sizeof($tax_codes) ?>;
 		if (tax_code_count == 0) {
 			tax_code_count = 1;
 		}
@@ -46,7 +51,7 @@
 			++tax_code_count;
 			var new_tax_code_id = 'tax_code_' + tax_code_count;
 
-			$(new_block).find('label').html("<?php echo $this->lang->line('taxes_tax_code'); ?> " + tax_code_count).attr('for', new_tax_code_id).attr('class', 'control-label col-xs-2');
+			$(new_block).find('label').html("<?php echo lang('Taxes.tax_code') ?> " + tax_code_count).attr('for', new_tax_code_id).attr('class', 'control-label col-xs-2');
 			$(new_block).find("input[name='tax_code[]']").attr('id', new_tax_code_id).removeAttr('disabled').attr('class', 'form-control text-uppercase required input-sm').val('');
 			$(new_block).find("input[name='tax_code_name[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
 			$(new_block).find("input[name='city[]']").removeAttr('disabled').attr('class', 'form-control input-sm').val('');
@@ -78,41 +83,41 @@
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_code_duplicate'); ?>");
+		}, "<?php echo lang('Taxes.tax_code_duplicate') ?>");
 
 		$.validator.addMethod('validateTaxCodeCharacters', function(value, element) {
 			if ((value.indexOf('_') != -1)) {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_code_invalid_chars'); ?>");
+		}, "<?php echo lang('Taxes.tax_code_invalid_chars') ?>");
 
 		$.validator.addMethod('requireTaxCode', function(value, element) {
 			if (value .trim() == '') {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_code_required'); ?>");
+		}, "<?php echo lang('Taxes.tax_code_required') ?>");
 
 		$('#tax_codes_form').validate($.extend(form_support.handler, {
 			submitHandler: function(form, event) {
 				$(form).ajaxSubmit({
 					success: function(response)	{
 						$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-						$("#tax_codes").load('<?php echo site_url("taxes/ajax_tax_codes"); ?>', init_add_remove_tax_codes);
+						$("#tax_codes").load('<?php echo site_url("taxes/ajax_tax_codes") ?>', init_add_remove_tax_codes);
 					},
 					dataType: 'json'
 				});
 			},
 			invalidHandler: function(event, validator) {
-				$.notify("<?php echo $this->lang->line('common_correct_errors'); ?>");
+				$.notify("<?php echo lang('Common.correct_errors') ?>");
 			},
 			errorLabelContainer: "#tax_code_error_message_box"
 		}));
 
 		<?php
 		$i = 0;
-		foreach($tax_codes as $tax_code=>$tax_code_data)
+		foreach($tax_codes as $tax_code => $tax_code_data)
 		{
 		?>
 		$('<?php echo '#tax_code_' . ++$i ?>').rules( "add", {
diff --git a/app/Views/taxes/tax_jurisdictions.php b/app/Views/taxes/tax_jurisdictions.php
index 1327c54f6..5bc1790bc 100644
--- a/app/Views/taxes/tax_jurisdictions.php
+++ b/app/Views/taxes/tax_jurisdictions.php
@@ -1,31 +1,37 @@
-<?php echo form_open('taxes/save_tax_jurisdictions/', array('id' => 'tax_jurisdictions_form', 'class' => 'form-horizontal')); ?>
+<?php
+/**
+ * @var array $tax_jurisdictions
+ * @var string $tax_type_options
+ */
+?>
+<?php echo form_open('taxes/save_tax_jurisdictions/', ['id' => 'tax_jurisdictions_form', 'class' => 'form-horizontal']) ?>
 <div id="config_wrapper">
 	<fieldset id="config_info">
-		<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+		<div id="required_fields_message"><?php echo lang('Common.fields_required_message') ?></div>
 		<ul id="tax_jurisdictions_error_message_box" class="error_message_box"></ul>
 
 		<div id="tax_jurisdictions">
-			<?php $this->load->view('partial/tax_jurisdictions'); ?>
+			<?php echo view('partial/tax_jurisdictions') ?>
 		</div>
 
-		<?php echo form_submit(array(
+		<?php echo form_submit ([
 			'name' => 'submit_tax_jurisdictions',
 			'id' => 'submit_tax_jurisdictions',
-			'value' => $this->lang->line('common_submit'),
-			'class' => 'btn btn-primary btn-sm pull-right')); ?>
+			'value' => lang('Common.submit'),
+			'class' => 'btn btn-primary btn-sm pull-right']) ?>
 	</fieldset>
 </div>
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
 	//validation and submit handling
 	$(document).ready(function()
 	{
-		var tax_jurisdictions_count = <?php echo sizeof($tax_jurisdictions); ?>;
+		var tax_jurisdictions_count = <?php echo sizeof($tax_jurisdictions) ?>;
 		if (tax_jurisdictions_count == 0) {
 			tax_jurisdictions_count = 1;
 		}
-		var tax_type_options = '<?php echo $tax_type_options; ?>';
+		var tax_type_options = '<?php echo esc($tax_type_options, 'js') ?>';
 
 		var hide_show_remove_tax_jurisdiction = function() {
 			if ($("input[name*='tax_jurisdiction']:enabled").length > 1)
@@ -48,7 +54,7 @@
 			++tax_jurisdictions_count;
 			var new_jurisdiction_name_id = 'jurisdiction_name_' + tax_jurisdictions_count;
 
-			$(new_block).find('label').html("<?php echo $this->lang->line('taxes_tax_jurisdiction'); ?> " + tax_jurisdictions_count).attr('for', new_jurisdiction_name_id).attr('class', 'control-label col-xs-2');
+			$(new_block).find('label').html("<?php echo lang('Taxes.tax_jurisdiction') ?> " + tax_jurisdictions_count).attr('for', new_jurisdiction_name_id).attr('class', 'control-label col-xs-2');
 			$(new_block).find("input[name='jurisdiction_name[]']").attr('id', new_jurisdiction_name_id).removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
 			$(new_block).find("input[name='tax_group[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
 			$(new_block).find("select[name='tax_type[]']").removeAttr('disabled').attr('class', 'form-control required input-sm').val('');
@@ -81,41 +87,41 @@
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_jurisdiction_duplicate'); ?>");
+		}, "<?php echo lang('Taxes.tax_jurisdiction_duplicate') ?>");
 
 		$.validator.addMethod('validateTaxJurisdictionCharacters', function(value, element) {
 			if ((value.indexOf('_') != -1)) {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_jurisdiction_invalid_chars'); ?>");
+		}, "<?php echo lang('Taxes.tax_jurisdiction_invalid_chars') ?>");
 
 		$.validator.addMethod('requireTaxJurisdiction', function(value, element) {
 			if (value .trim() == '') {
 				return false;
 			}
 			return true;
-		}, "<?php echo $this->lang->line('taxes_tax_jurisdiction_required'); ?>");
+		}, "<?php echo lang('Taxes.tax_jurisdiction_required') ?>");
 
 		$('#tax_jurisdictions_form').validate($.extend(form_support.handler, {
 			submitHandler: function(form) {
 				$(form).ajaxSubmit({
 					success: function(response)	{
 						$.notify({ message: response.message }, { type: response.success ? 'success' : 'danger'});
-						$("#tax_jurisdictions").load('<?php echo site_url("taxes/ajax_tax_jurisdictions"); ?>', init_add_remove_tax_jurisdiction);
+						$("#tax_jurisdictions").load('<?php echo esc(site_url("taxes/ajax_tax_jurisdictions"), 'url') ?>', init_add_remove_tax_jurisdiction);
 					},
 					dataType: 'json'
 				});
 			},
 			invalidHandler: function(event, validator) {
-				$.notify("<?php echo $this->lang->line('common_correct_errors'); ?>");
+				$.notify("<?php echo lang('Common.correct_errors') ?>");
 			},
 			errorLabelContainer: "#tax_jurisdiction_error_message_box"
 		}));
 
 		<?php
 		$i = 0;
-		foreach($tax_jurisdictions as $tax_jurisdiction=>$tax_jurisdiction_data)
+		foreach($tax_jurisdictions as $tax_jurisdiction => $tax_jurisdiction_data)
 		{
 		?>
 		$('<?php echo '#jurisdiction_name_' . ++$i ?>').rules( "add", {
diff --git a/app/Views/taxes/tax_rates.php b/app/Views/taxes/tax_rates.php
index b31bdfd18..2dc5d9257 100644
--- a/app/Views/taxes/tax_rates.php
+++ b/app/Views/taxes/tax_rates.php
@@ -1,27 +1,33 @@
+<?php
+/**
+ * @var string $controller_name
+ * @var string $tax_rate_table_headers
+ */
+?>
 <script type="text/javascript">
 $(document).ready(function()
 {
-	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+	<?php echo view('partial/bootstrap_tables_locale') ?>
 	table_support.init({
-		resource: '<?php echo site_url($controller_name);?>',
-		headers: <?php echo $tax_rate_table_headers; ?>,
-		pageSize: <?php echo $this->config->item('lines_per_page'); ?>,
+		resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
+		headers: <?php echo esc($tax_rate_table_headers, 'js') ?>,
+		pageSize: <?php echo config('OSPOS')->lines_per_page ?>,
 		uniqueId: 'tax_rate_id'
 	});
 });
 </script>
 
 <div id="title_bar" class="btn-toolbar">
-	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
-			title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
-		<span class="glyphicon glyphicon-usd">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
+	<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo lang('Common.submit') ?>' data-href='<?php echo esc(site_url("$controller_name/view"), 'url') ?>'
+			title='<?php echo lang("$controller_name.new") ?>'>
+		<span class="glyphicon glyphicon-usd">&nbsp</span><?php echo lang("$controller_name.new") ?>
 	</button>
 </div>
 
 <div id="toolbar">
 	<div class="pull-left btn-toolbar">
 		<button id="delete" class="btn btn-default btn-sm">
-			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete"); ?>
+			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo lang('Common.delete') ?>
 		</button>
 	</div>
 </div>
diff --git a/app/Views/taxes/tax_rates_form.php b/app/Views/taxes/tax_rates_form.php
index 7ce3c2fee..36e794f04 100644
--- a/app/Views/taxes/tax_rates_form.php
+++ b/app/Views/taxes/tax_rates_form.php
@@ -1,53 +1,66 @@
-
+<?php
+/**
+ * @var int $tax_rate_id
+ * @var array $tax_code_options
+ * @var array $rate_tax_code_id
+ * @var array $tax_category_options
+ * @var array $rate_tax_category_id
+ * @var array $tax_jurisdiction_options
+ * @var array $rate_jurisdiction_id
+ * @var float $tax_rate
+ * @var array $rounding_options
+ * @var array $tax_rounding_code
+ */
+?>
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open('taxes/save/'.$tax_rate_id, array('id'=>'tax_code_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open(esc("taxes/save/$tax_rate_id", 'url'), ['id' => 'tax_code_form', 'class' => 'form-horizontal']) ?>
 	<fieldset id="tax_rate_info">
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('taxes_tax_code'), 'rate_tax_code_id', array('class' => 'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Taxes.tax_code'), 'rate_tax_code_id', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('rate_tax_code_id', $tax_code_options, $rate_tax_code_id, array('class' => 'form-control input-sm')); ?>
+				<?php echo form_dropdown('rate_tax_code_id',esc($tax_code_options, 'attr'), esc($rate_tax_code_id, 'attr'), ['class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('taxes_tax_category'), 'rate_tax_category_id', array('class' => 'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Taxes.tax_category'), 'rate_tax_category_id', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('rate_tax_category_id', $tax_category_options, $rate_tax_category_id, array('class' => 'form-control input-sm')); ?>
+				<?php echo form_dropdown('rate_tax_category_id', esc($tax_category_options, 'attr'), esc($rate_tax_category_id, 'attr'), ['class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('taxes_tax_jurisdiction'), 'rate_jurisdiction_id', array('class' => 'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Taxes.tax_jurisdiction'), 'rate_jurisdiction_id', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('rate_jurisdiction_id', $tax_jurisdiction_options, $rate_jurisdiction_id, array('class' => 'form-control input-sm')); ?>
+				<?php echo form_dropdown('rate_jurisdiction_id', esc($tax_jurisdiction_options, 'attr'), esc($rate_jurisdiction_id, 'attr'), ['class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('taxes_tax_rate'), 'tax_rate', array('class'=>'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Taxes.tax_rate'), 'tax_rate', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-5 input-group' style='padding-left:15px;' >
-				<?php echo form_input(array(
-						'name'=>'tax_rate',
-						'id'=>'tax_rate',
-						'class'=>'form-control input-sm text-uppercase',
-						'value'=>$tax_rate)
-				);?>
+				<?php echo form_input ([
+						'name' => 'tax_rate',
+						'id' => 'tax_rate',
+						'class' => 'form-control input-sm text-uppercase',
+						'value' => esc($tax_rate, 'attr')
+					])
+				?>
 				<span class="input-group-addon input-sm">%</span>
 			</div>
 
 		</div>
 
 		<div class="form-group form-group-sm">
-			<?php echo form_label($this->lang->line('taxes_tax_rounding'), 'tax_rounding_code', array('class' => 'control-label col-xs-3')); ?>
+			<?php echo form_label(lang('Taxes.tax_rounding'), 'tax_rounding_code', ['class' => 'control-label col-xs-3']) ?>
 			<div class='col-xs-5'>
-				<?php echo form_dropdown('tax_rounding_code', $rounding_options, $tax_rounding_code, array('class' => 'form-control input-sm'));
-				?>
+				<?php echo form_dropdown('tax_rounding_code', esc($rounding_options, 'attr'), esc($tax_rounding_code, 'attr'), ['class' => 'form-control input-sm']) ?>
 			</div>
 		</div>
 	</fieldset>
 
-<?php echo form_close(); ?>
+<?php echo form_close() ?>
 
 <script type="text/javascript">
     //validation and submit handling
@@ -58,7 +71,7 @@
                 $(form).ajaxSubmit({
                     success: function (response) {
                         dialog_support.hide();
-                        table_support.handle_submit('<?php echo site_url('taxes'); ?>', response);
+                        table_support.handle_submit('<?php echo site_url('taxes') ?>', response);
                     },
                     dataType: 'json'
                 });
diff --git a/application/config/index.html b/app/index.html
similarity index 87%
rename from application/config/index.html
rename to app/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/config/index.html
+++ b/app/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/application/tests/.gitignore b/app/tests/.gitignore
similarity index 100%
rename from application/tests/.gitignore
rename to app/tests/.gitignore
diff --git a/app/tests/helpers/LocaleHelperTest.php b/app/tests/helpers/LocaleHelperTest.php
index 4b7994215..c84042f17 100644
--- a/app/tests/helpers/LocaleHelperTest.php
+++ b/app/tests/helpers/LocaleHelperTest.php
@@ -1,8 +1,12 @@
 <?php
+namespace App\Helpers;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
 /**
  * @backupGlobals disabled
  */
-class Locale_helper_test extends UnitTestCase
+class LocaleHelperTest extends CIUnitTestCase 
 {
     public function test_parse_decimals_precision()
     {
@@ -17,6 +21,4 @@ class Locale_helper_test extends UnitTestCase
 
         $this->assertEquals(5.00, $decimals);
     }
-
-
 }
diff --git a/app/tests/libraries/TokenLibTest.php b/app/tests/libraries/TokenLibTest.php
index 8f493461b..b495c343e 100644
--- a/app/tests/libraries/TokenLibTest.php
+++ b/app/tests/libraries/TokenLibTest.php
@@ -1,70 +1,76 @@
 <?php
+namespace App\Libraries;
+
+use app\Models\Appconfig;
+use app\Libraries\Token_lib;
+use App\Models\Tokens\Token;
+use CodeIgniter\Test\CIUnitTestCase;
+
 /**
  * @backupGlobals disabled
+ * @property appconfig appconfig
+ * @property token_lib token_lib
  */
-class Token_lib_test extends UnitTestCase
+class TokenLibTest extends CIUnitTestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
-        $this->resetInstance();
-
-        $this->obj = $this->newLibrary('Token_lib');
+        parent::setUp();
+		$this->appconfig = model('Appconfig');
+        $this->token_lib = new Token_lib();
     }
 
     public function test_token_parser()
     {
         $tokens = Token::get_barcode_tokens();
 
-        $parsed_tokens = $this->obj->parse("0250200000abc", "02{P:2}{W:6}{I:3}", $tokens);
+        $parsed_tokens = $this->token_lib->parse("0250200000abc", "02{P:2}{W:6}{I:3}", $tokens);
 
-        $this->assertEquals($parsed_tokens['I'], 'abc');
-        $this->assertEquals($parsed_tokens['P'], '50');
-        $this->assertEquals($parsed_tokens['W'], '200000');
+        $this->assertEquals('abc', $parsed_tokens['I']);
+        $this->assertEquals('50', $parsed_tokens['P']);
+        $this->assertEquals('200000', $parsed_tokens['W']);
 
     }
 
     public function test_barcode_item_number_and_quantity()
     {
-        $this->CI->config->set_item('barcode_formats', json_encode(array("02{I:5}{W:6}")));
+        $this->appconfig->set('barcode_formats', json_encode (["02{I:5}{W:6}"]));
 
         $item_number = "0250000123456";
         $quantity = 0;
-        $this->obj->parse_barcode($quantity, $price, $item_number);
+        $this->token_lib->parse_barcode($quantity, $price, $item_number);
 
-        $this->assertEquals($quantity, 123.456);
-        $this->assertEquals($item_number, "50000");
-        $this->assertEquals($price, NULL);
+        $this->assertEquals(123.456, $quantity);
+        $this->assertEquals("50000", $item_number);
+        $this->assertEquals(NULL, $price);
     }
 
     public function test_barcode_quantity_and_item_number()
     {
-        $this->CI->config->set_item('barcode_formats', json_encode(array("02{I:6}{W:5}{P:2}")));
+        $this->appconfig->set('barcode_formats', json_encode (["02{I:6}{W:5}{P:2}"]));
 
         $item_number = "021234565000110";
         $quantity = 0;
-        $this->obj->parse_barcode($quantity, $price, $item_number);
+        $this->token_lib->parse_barcode($quantity, $price, $item_number);
 
 
-        $this->assertEquals($price, 10);
-        $this->assertEquals($item_number, 123456);
-        $this->assertEquals($quantity, 50.001);
+        $this->assertEquals(10, $price);
+        $this->assertEquals(123456, $item_number);
+        $this->assertEquals(50.001, $quantity);
     }
 
     public function test_no_barcode_format()
     {
-        $this->CI->config->set_item('barcode_formats', json_encode(array("")));
+		$this->appconfig->set('barcode_formats', json_encode ([""]));
 
         $item_number = "021234565000110";
         $quantity = 0;
 
-        $this->obj->parse_barcode($quantity, $price, $item_number);
+        $this->token_lib->parse_barcode($quantity, $price, $item_number);
 
-        $this->assertEquals($quantity, 1);
-        $this->assertEquals($price, 0);
-        $this->assertEquals($item_number, "021234565000110");
+        $this->assertEquals(1, $quantity);
+        $this->assertEquals(0, $price);
+        $this->assertEquals("021234565000110", $item_number);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/app/tests/models/RoundingModeTest.php b/app/tests/models/RoundingModeTest.php
index c64cdd5c3..180c45e3d 100644
--- a/app/tests/models/RoundingModeTest.php
+++ b/app/tests/models/RoundingModeTest.php
@@ -1,16 +1,22 @@
 <?php
+
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+use App\Models\Enums\Rounding_mode;
+
 /**
  * @backupGlobals disabled
  */
 
-
-class Rounding_mode_test extends UnitTestCase
+class RoundingModeTest extends CIUnitTestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->resetInstance();
-        $this->CI->load->model('enums/Rounding_mode');
+        $this->rounding_mode = model('enums/Rounding_mode');
     }
 
     public function test_rounding()
diff --git a/app/tests/phpunit.xml b/app/tests/phpunit.xml
new file mode 100644
index 000000000..ccde244d8
--- /dev/null
+++ b/app/tests/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap = "../../vendor/autoload.php"
+    backupGlobals               = "false"
+    backupStaticAttributes      = "false"
+    colors                      = "true"
+    convertErrorsToExceptions   = "true"
+    convertNoticesToExceptions  = "true"
+    convertWarningsToExceptions = "true"
+    processIsolation            = "false"
+    stopOnFailure               = "false"
+    syntaxCheck                 = "false">
+
+<testsuites>
+    <testsuite name="Helpers">
+        <directory>helpers</directory>
+    </testsuite>
+    <testsuite name="Libraries">
+        <directory>libraries</directory>
+    </testsuite>
+    <testsuite name="Models">
+        <directory>models</directory>
+    </testsuite>
+</testsuites>
+
+</phpunit>
diff --git a/application/config/autoload.php b/application/config/autoload.php
deleted file mode 100644
index 32ac62491..000000000
--- a/application/config/autoload.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| AUTO-LOADER
-| -------------------------------------------------------------------
-| This file specifies which systems should be loaded by default.
-|
-| In order to keep the framework as light-weight as possible only the
-| absolute minimal resources are loaded by default. For example,
-| the database is not connected to automatically since no assumption
-| is made regarding whether you intend to use it.  This file lets
-| you globally define which systems you would like loaded with every
-| request.
-|
-| -------------------------------------------------------------------
-| Instructions
-| -------------------------------------------------------------------
-|
-| These are the things you can load automatically:
-|
-| 1. Packages
-| 2. Libraries
-| 3. Drivers
-| 4. Helper files
-| 5. Custom config files
-| 6. Language files
-| 7. Models
-|
-*/
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Packages
-| -------------------------------------------------------------------
-| Prototype:
-|
-|  $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
-|
-*/
-$autoload['packages'] = array();
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Libraries
-| -------------------------------------------------------------------
-| These are the classes located in system/libraries/ or your
-| application/libraries/ directory, with the addition of the
-| 'database' library, which is somewhat of a special case.
-|
-| Prototype:
-|
-|	$autoload['libraries'] = array('database', 'email', 'session');
-|
-| You can also supply an alternative library name to be assigned
-| in the controller:
-|
-|	$autoload['libraries'] = array('user_agent' => 'ua');
-*/
-$autoload['libraries'] = array('database', 'form_validation', 'session', 'user_agent', 'pagination', 'encryption');
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Drivers
-| -------------------------------------------------------------------
-| These classes are located in system/libraries/ or in your
-| application/libraries/ directory, but are also placed inside their
-| own subdirectory and they extend the CI_Driver_Library class. They
-| offer multiple interchangeable driver options.
-|
-| Prototype:
-|
-|	$autoload['drivers'] = array('cache');
-|
-| You can also supply an alternative property name to be assigned in
-| the controller:
-|
-|	$autoload['drivers'] = array('cache' => 'cch');
-|
-*/
-$autoload['drivers'] = array();
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Helper Files
-| -------------------------------------------------------------------
-| Prototype:
-|
-|	$autoload['helper'] = array('url', 'file');
-*/
-$autoload['helper'] = array('form', 'url', 'tabular', 'text', 'locale', 'html', 'download', 'directory', 'migration', 'importfile');
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Config files
-| -------------------------------------------------------------------
-| Prototype:
-|
-|	$autoload['config'] = array('config1', 'config2');
-|
-| NOTE: This item is intended for use ONLY if you have created custom
-| config files.  Otherwise, leave it blank.
-|
-*/
-$autoload['config'] = array();
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Language files
-| -------------------------------------------------------------------
-| Prototype:
-|
-|	$autoload['language'] = array('lang1', 'lang2');
-|
-| NOTE: Do not include the "_lang" part of your file.  For example
-| "codeigniter_lang.php" would be referenced as array('codeigniter');
-|
-*/
-$autoload['language'] = array();
-
-/*
-| -------------------------------------------------------------------
-|  Auto-load Models
-| -------------------------------------------------------------------
-| Prototype:
-|
-|	$autoload['model'] = array('first_model', 'second_model');
-|
-| You can also supply an alternative model name to be assigned
-| in the controller:
-|
-|	$autoload['model'] = array('first_model' => 'first');
-*/
-$autoload['model'] = array(
-	'Appconfig',
-	'Person',
-	'Customer',
-	'Employee',
-	'Module',
-	'Item',
-	'Item_taxes',
-	'Sale',
-	'Supplier',
-	'Inventory',
-	'Receiving',
-	'Giftcard',
-	'Item_kit',
-	'Item_kit_items',
-	'Stock_location',
-	'Item_quantity',
-	'Dinner_table',
-	'Customer_rewards',
-	'Rewards',
-	'Expense_category',
-	'Expense',
-	'Cashup',
-	'Attribute',
-	'Tax',
-	'Tax_category',
-	'Tax_code',
-	'Tax_jurisdiction'
-);
diff --git a/application/config/config.php b/application/config/config.php
deleted file mode 100644
index e58f6327c..000000000
--- a/application/config/config.php
+++ /dev/null
@@ -1,559 +0,0 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
-/*
-|-------------------------------------------------------------------------- 
-| Code Version 
-|-------------------------------------------------------------------------- 
-| 
-| This is the version of Open Source Point of Sale you're running 
-| 
-| 
-*/ 
-$config['application_version'] = '3.3.9';
-
-/* 
-|-------------------------------------------------------------------------- 
-| Commit sha1 
-|-------------------------------------------------------------------------- 
-| 
-| This is the commit hash for the version you are currently using 
-| 
-| 
-*/ 
-$config['commit_sha1'] = 'dev';
- 
-/* 
-|-------------------------------------------------------------------------- 
-| Internal to OSPOS XSS Clean 
-|-------------------------------------------------------------------------- 
-| 
-| This is to indicated whether we want XSS clean to be performed or not 
-| By default it's enabled as it's assumed the installation has Internet access and needs to be protected, 
-| however intranet only installations may not need this so they can set FALSE to improve performance 
-| 
-*/ 
-$config['ospos_xss_clean'] = TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| Enable database query logging hook
-|--------------------------------------------------------------------------
-|
-| Logs are stored in application/logs
-|
-*/
-$config['db_log_enabled'] = FALSE;
-
-/* 
-|-------------------------------------------------------------------------- 
-| Base Site URL
-|--------------------------------------------------------------------------
-|
-| URL to your CodeIgniter root. Typically this will be your base URL,
-| WITH a trailing slash:
-|
-|	http://example.com/
-|
-| WARNING: You MUST set this value!
-|
-| If it is not set, then CodeIgniter will try guess the protocol and path
-| your installation, but due to security concerns the hostname will be set
-| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise.
-| The auto-detection mechanism exists only for convenience during
-| development and MUST NOT be used in production!
-|
-| If you need to allow multiple domains, remember that this file is still
-| a PHP script and you can easily do that on your own.
-|
-*/
-$config['https_on'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
-$config['base_url'] = $config['https_on'] ? 'https' : 'http';
-$config['base_url'] .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') ;
-$config['base_url'] .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
-
-/*
-|--------------------------------------------------------------------------
-| Index File
-|--------------------------------------------------------------------------
-|
-| Typically this will be your index.php file, unless you've renamed it to
-| something else. If you are using mod_rewrite to remove the page set this
-| variable so that it is blank.
-|
-*/
-$config['index_page'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| URI PROTOCOL
-|--------------------------------------------------------------------------
-|
-| This item determines which server global should be used to retrieve the
-| URI string.  The default setting of 'REQUEST_URI' works for most servers.
-| If your links do not seem to work, try one of the other delicious flavors:
-|
-| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
-| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
-| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
-|
-| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
-*/
-$config['uri_protocol']	= 'REQUEST_URI';
-
-/*
-|--------------------------------------------------------------------------
-| URL suffix
-|--------------------------------------------------------------------------
-|
-| This option allows you to add a suffix to all URLs generated by CodeIgniter.
-| For more information please see the user guide:
-|
-| https://codeigniter.com/user_guide/general/urls.html
-*/
-$config['url_suffix'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Default Language
-|--------------------------------------------------------------------------
-|
-| This determines which set of language files should be used. Make sure
-| there is an available translation if you intend to use something other
-| than english.
-|
-*/
-$config['language'] = 'english';
-
-/*
-|--------------------------------------------------------------------------
-| Default Character Set
-|--------------------------------------------------------------------------
-|
-| This determines which character set is used by default in various methods
-| that require a character set to be provided.
-|
-| See http://php.net/htmlspecialchars for a list of supported charsets.
-|
-*/
-$config['charset'] = 'UTF-8';
-
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Hooks
-|--------------------------------------------------------------------------
-|
-| If you would like to use the 'hooks' feature you must enable it by
-| setting this variable to TRUE (boolean).  See the user guide for details.
-|
-*/
-$config['enable_hooks'] = TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| Class Extension Prefix
-|--------------------------------------------------------------------------
-|
-| This item allows you to set the filename/classname prefix when extending
-| native libraries.  For more information please see the user guide:
-|
-| https://codeigniter.com/user_guide/general/core_classes.html
-| https://codeigniter.com/user_guide/general/creating_libraries.html
-|
-*/
-$config['subclass_prefix'] = 'MY_';
-
-/*
-|--------------------------------------------------------------------------
-| Composer auto-loading
-|--------------------------------------------------------------------------
-|
-| Enabling this setting will tell CodeIgniter to look for a Composer
-| package auto-loader script in application/vendor/autoload.php.
-|
-|	$config['composer_autoload'] = TRUE;
-|
-| Or if you have your vendor/ directory located somewhere else, you
-| can opt to set a specific path as well:
-|
-|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
-|
-| For more information about Composer, please visit http://getcomposer.org/
-|
-| Note: This will NOT disable or override the CodeIgniter-specific
-|	autoloading (application/config/autoload.php)
-*/
-$config['composer_autoload'] = realpath(APPPATH . '../vendor/autoload.php');
-
-/*
-|--------------------------------------------------------------------------
-| Allowed URL Characters
-|--------------------------------------------------------------------------
-|
-| This lets you specify which characters are permitted within your URLs.
-| When someone tries to submit a URL with disallowed characters they will
-| get a warning message.
-|
-| As a security measure you are STRONGLY encouraged to restrict URLs to
-| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
-|
-| Leave blank to allow all characters -- but only if you are insane.
-|
-| The configured value is actually a regular expression character group
-| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
-|
-| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
-|
-*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
-
-/*
-|--------------------------------------------------------------------------
-| Enable Query Strings
-|--------------------------------------------------------------------------
-|
-| By default CodeIgniter uses search-engine friendly segment based URLs:
-| example.com/who/what/where/
-|
-| By default CodeIgniter enables access to the $_GET array.  If for some
-| reason you would like to disable it, set 'allow_get_array' to FALSE.
-|
-| You can optionally enable standard query string based URLs:
-| example.com?who=me&what=something&where=here
-|
-| Options are: TRUE or FALSE (boolean)
-|
-| The other items let you set the query string 'words' that will
-| invoke your controllers and its functions:
-| example.com/index.php?c=controller&m=function
-|
-| Please note that some of the helpers won't work as expected when
-| this feature is enabled, since CodeIgniter is designed primarily to
-| use segment based URLs.
-|
-*/
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-$config['directory_trigger'] = 'd';
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Threshold
-|--------------------------------------------------------------------------
-|
-| You can enable error logging by setting a threshold over zero. The
-| threshold determines what gets logged. Threshold options are:
-|
-|	0 = Disables logging, Error logging TURNED OFF
-|	1 = Error Messages (including PHP errors)
-|	2 = Debug Messages
-|	3 = Informational Messages
-|	4 = All Messages
-|
-| You can also pass an array with threshold levels to show individual error types
-|
-| 	array(2) = Debug Messages, without Error Messages
-|
-| For a live site you'll usually only enable Errors (1) to be logged otherwise
-| your log files will fill up very fast.
-|
-*/
-$config['log_threshold'] = 0;
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/logs/ directory. Use a full server path with trailing slash.
-|
-*/
-$config['log_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Extension
-|--------------------------------------------------------------------------
-|
-| The default filename extension for log files. The default 'php' allows for
-| protecting the log files via basic scripting, when they are to be stored
-| under a publicly accessible directory.
-|
-| Note: Leaving it blank will default to 'php'.
-|
-*/
-$config['log_file_extension'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Permissions
-|--------------------------------------------------------------------------
-|
-| The file system permissions to be applied on newly created log files.
-|
-| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
-|            integer notation (i.e. 0700, 0644, etc.)
-*/
-$config['log_file_permissions'] = 0640;
-
-/*
-|--------------------------------------------------------------------------
-| Date Format for Logs
-|--------------------------------------------------------------------------
-|
-| Each item that is logged has an associated date. You can use PHP date
-| codes to set your own date formatting
-|
-*/
-$config['log_date_format'] = 'Y-m-d H:i:s';
-
-/*
-|--------------------------------------------------------------------------
-| Error Views Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/views/errors/ directory.  Use a full server path with trailing slash.
-|
-*/
-$config['error_views_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/cache/ directory.  Use a full server path with trailing slash.
-|
-*/
-$config['cache_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Include Query String
-|--------------------------------------------------------------------------
-|
-| Whether to take the URL query string into consideration when generating
-| output cache files. Valid options are:
-|
-|	FALSE      = Disabled
-|	TRUE       = Enabled, take all query parameters into account.
-|	             Please be aware that this may result in numerous cache
-|	             files generated for the same page over and over again.
-|	array('q') = Enabled, but only take into account the specified list
-|	             of query parameters.
-|
-*/
-$config['cache_query_string'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Encryption Key
-|--------------------------------------------------------------------------
-|
-| If you use the Encryption class, you must set an encryption key.
-| See the user guide for more info.
-|
-| https://codeigniter.com/user_guide/libraries/encryption.html
-|
-*/
-$config['encryption_key'] = getenv('ENCRYPTION_KEY') ? getenv('ENCRYPTION_KEY') : '';
-
-/*
-|--------------------------------------------------------------------------
-| Session Variables
-|--------------------------------------------------------------------------
-|
-| 'sess_driver'
-|
-|	The storage driver to use: files, database, redis, memcached
-|
-| 'sess_cookie_name'
-|
-|	The session cookie name, must contain only [0-9a-z_-] characters
-|
-| 'sess_expiration'
-|
-|	The number of SECONDS you want the session to last.
-|	Setting to 0 (zero) means expire when the browser is closed.
-|
-| 'sess_save_path'
-|
-|	The location to save sessions to, driver dependent.
-|
-|	For the 'files' driver, it's a path to a writable directory.
-|	WARNING: Only absolute paths are supported!
-|
-|	For the 'database' driver, it's a table name.
-|	Please read up the manual for the format with other session drivers.
-|
-|	IMPORTANT: You are REQUIRED to set a valid save path!
-|
-| 'sess_match_ip'
-|
-|	Whether to match the user's IP address when reading the session data.
-|
-|	WARNING: If you're using the database driver, don't forget to update
-|	         your session table's PRIMARY KEY when changing this setting.
-|
-| 'sess_time_to_update'
-|
-|	How many seconds between CI regenerating the session ID.
-|
-| 'sess_regenerate_destroy'
-|
-|	Whether to destroy session data associated with the old session ID
-|	when auto-regenerating the session ID. When set to FALSE, the data
-|	will be later deleted by the garbage collector.
-|
-| Other session cookie settings are shared with the rest of the application,
-| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
-|
-*/
-$config['sess_driver'] = 'database';
-$config['sess_cookie_name'] = 'ospos_session';
-$config['sess_expiration'] = 7200;
-$config['sess_save_path'] = 'sessions';
-$config['sess_match_ip'] = TRUE;
-$config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cookie Related Variables
-|--------------------------------------------------------------------------
-|
-| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
-| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
-| 'cookie_path'     = Typically will be a forward slash
-| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
-| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
-|
-| Note: These settings (with the exception of 'cookie_prefix' and
-|       'cookie_httponly') will also affect sessions.
-|
-*/
-$config['cookie_prefix'] = '';
-$config['cookie_domain'] = '';
-$config['cookie_path'] = '/';
-$config['cookie_secure'] = $config['https_on'];
-$config['cookie_httponly'] = TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| Standardize newlines
-|--------------------------------------------------------------------------
-|
-| Determines whether to standardize newline characters in input data,
-| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
-|
-| This is particularly useful for portability between UNIX-based OSes,
-| (usually \n) and Windows (\r\n).
-|
-*/
-$config['standardize_newlines'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Global XSS Filtering
-|--------------------------------------------------------------------------
-|
-| Determines whether the XSS filter is always active when GET, POST or
-| COOKIE data is encountered
-|
-| WARNING: This feature is DEPRECATED and currently available only
-|          for backwards compatibility purposes!
-|
-*/
-$config['global_xss_filtering'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cross Site Request Forgery
-|--------------------------------------------------------------------------
-| Enables a CSRF cookie token to be set. When set to TRUE, token will be
-| checked on a submitted form. If you are accepting user data, it is strongly
-| recommended CSRF protection be enabled.
-|
-| 'csrf_token_name' = The token name
-| 'csrf_cookie_name' = The cookie name
-| 'csrf_expire' = The number in seconds the token should expire.
-| 'csrf_regenerate' = Regenerate token on every submission
-| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
-*/
-$config['csrf_protection'] = TRUE;
-$config['csrf_token_name'] = 'csrf_ospos_v3';
-$config['csrf_cookie_name'] = 'csrf_cookie_ospos_v3';
-$config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
-$config['csrf_exclude_uris'] = array('login');
-
-/*
-|--------------------------------------------------------------------------
-| Output Compression
-|--------------------------------------------------------------------------
-|
-| Enables Gzip output compression for faster page loads.  When enabled,
-| the output class will test whether your server supports Gzip.
-| Even if it does, however, not all browsers support compression
-| so enable only if you are reasonably sure your visitors can handle it.
-|
-| Only used if zlib.output_compression is turned off in your php.ini.
-| Please do not use it together with httpd-level output compression.
-|
-| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
-| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts.  For
-| compression to work, nothing can be sent before the output buffer is called
-| by the output class.  Do not 'echo' any values with compression enabled.
-|
-*/
-$config['compress_output'] = FALSE;
-
-
-/*
-|--------------------------------------------------------------------------
-| Master Time Reference
-|--------------------------------------------------------------------------
-|
-| Options are 'local' or any PHP supported timezone. This preference tells
-| the system whether to use your server's local time as the master 'now'
-| reference, or convert it to the configured one timezone. See the 'date
-| helper' page of the user guide for information regarding date handling.
-|
-*/
-$config['time_reference'] = 'local';
-
-/*
-|--------------------------------------------------------------------------
-| Rewrite PHP Short Tags
-|--------------------------------------------------------------------------
-|
-| If your PHP installation does not have short tag support enabled CI
-| can rewrite the tags on-the-fly, enabling you to utilize that syntax
-| in your view files.  Options are TRUE or FALSE (boolean)
-|
-| Note: You need to have eval() enabled for this to work.
-|
-*/
-$config['rewrite_short_tags'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Reverse Proxy IPs
-|--------------------------------------------------------------------------
-|
-| If your server is behind a reverse proxy, you must whitelist the proxy
-| IP addresses from which CodeIgniter should trust headers such as
-| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
-| the visitor's IP address.
-|
-| You can use both an array or a comma-separated list of proxy addresses,
-| as well as specifying whole subnets. Here are a few examples:
-|
-| Comma-separated:	'10.0.1.200,192.168.5.0/24'
-| Array:		array('10.0.1.200', '192.168.5.0/24')
-*/
-$config['proxy_ips'] = '';
diff --git a/application/config/constants.php b/application/config/constants.php
deleted file mode 100644
index 140987273..000000000
--- a/application/config/constants.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Display Debug backtrace
-|--------------------------------------------------------------------------
-|
-| If set to TRUE, a backtrace will be displayed along with php errors. If
-| error_reporting is disabled, the backtrace will not display, regardless
-| of this setting
-|
-*/
-defined('SHOW_DEBUG_BACKTRACE') OR define('SHOW_DEBUG_BACKTRACE', TRUE);
-
-/*
-|--------------------------------------------------------------------------
-| File and Directory Modes
-|--------------------------------------------------------------------------
-|
-| These prefs are used when checking and setting modes when working
-| with the file system.  The defaults are fine on servers with proper
-| security, but you may wish (or even need) to change the values in
-| certain environments (Apache running a separate process for each
-| user, PHP under CGI with Apache suEXEC, etc.).  Octal values should
-| always be used to set the mode correctly.
-|
-*/
-defined('FILE_READ_MODE')  OR define('FILE_READ_MODE', 0644);
-defined('FILE_WRITE_MODE') OR define('FILE_WRITE_MODE', 0666);
-defined('DIR_READ_MODE')   OR define('DIR_READ_MODE', 0755);
-defined('DIR_WRITE_MODE')  OR define('DIR_WRITE_MODE', 0755);
-
-/*
-|--------------------------------------------------------------------------
-| File Stream Modes
-|--------------------------------------------------------------------------
-|
-| These modes are used when working with fopen()/popen()
-|
-*/
-defined('FOPEN_READ')                           OR define('FOPEN_READ', 'rb');
-defined('FOPEN_READ_WRITE')                     OR define('FOPEN_READ_WRITE', 'r+b');
-defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')       OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
-defined('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE')  OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
-defined('FOPEN_WRITE_CREATE')                   OR define('FOPEN_WRITE_CREATE', 'ab');
-defined('FOPEN_READ_WRITE_CREATE')              OR define('FOPEN_READ_WRITE_CREATE', 'a+b');
-defined('FOPEN_WRITE_CREATE_STRICT')            OR define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-defined('FOPEN_READ_WRITE_CREATE_STRICT')       OR define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
-
-/*
-|--------------------------------------------------------------------------
-| Exit Status Codes
-|--------------------------------------------------------------------------
-|
-| Used to indicate the conditions under which the script is exit()ing.
-| While there is no universal standard for error codes, there are some
-| broad conventions.  Three such conventions are mentioned below, for
-| those who wish to make use of them.  The CodeIgniter defaults were
-| chosen for the least overlap with these conventions, while still
-| leaving room for others to be defined in future versions and user
-| applications.
-|
-| The three main conventions used for determining exit status codes
-| are as follows:
-|
-|    Standard C/C++ Library (stdlibc):
-|       http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
-|       (This link also contains other GNU-specific conventions)
-|    BSD sysexits.h:
-|       http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
-|    Bash scripting:
-|       http://tldp.org/LDP/abs/html/exitcodes.html
-|
-*/
-defined('EXIT_SUCCESS')        OR define('EXIT_SUCCESS', 0); // no errors
-defined('EXIT_ERROR')          OR define('EXIT_ERROR', 1); // generic error
-defined('EXIT_CONFIG')         OR define('EXIT_CONFIG', 3); // configuration error
-defined('EXIT_UNKNOWN_FILE')   OR define('EXIT_UNKNOWN_FILE', 4); // file not found
-defined('EXIT_UNKNOWN_CLASS')  OR define('EXIT_UNKNOWN_CLASS', 5); // unknown class
-defined('EXIT_UNKNOWN_METHOD') OR define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user input
-defined('EXIT_DATABASE')       OR define('EXIT_DATABASE', 8); // database error
-defined('EXIT__AUTO_MIN')      OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
-
-/*
- | Attribute Related Constants.
- */
-define('GROUP', 'GROUP');
-define('DROPDOWN', 'DROPDOWN');
-define('DECIMAL', 'DECIMAL');
-define('DATE', 'DATE');
-define('TEXT', 'TEXT');
-define('CHECKBOX', 'CHECKBOX');
-define('NO_DEFINITION_ID', 0);
-define('CATEGORY_DEFINITION_ID', -1);
-
-
-const DEFINITION_TYPES = [GROUP, DROPDOWN, DECIMAL, TEXT, DATE, CHECKBOX];
-
-
-/*
- | Item Related Constants.
- */
-define('HAS_STOCK', 0);
-define('HAS_NO_STOCK', 1);
-
-define('ITEM', 0);
-define('ITEM_KIT', 1);
-define('ITEM_AMOUNT_ENTRY', 2);
-define('ITEM_TEMP', 3);
-define('NEW_ITEM', -1);
-
-define('PRINT_ALL', 0);
-define('PRINT_PRICED', 1);
-define('PRINT_KIT', 2);
-
-define('PRINT_YES', 0);
-define('PRINT_NO', 1);
-
-define('PRICE_ALL', 0);
-define('PRICE_KIT', 1);
-define('PRICE_KIT_ITEMS', 2);
-
-define('PRICE_OPTION_ALL', 0);
-define('PRICE_OPTION_KIT', 1);
-define('PRICE_OPTION_KIT_STOCK', 2);
-
-define('NAME_SEPARATOR', ' | ');
-
-/*
- | Sale Related Constants.
- */
-define('COMPLETED', 0);
-define('SUSPENDED', 1);
-define('CANCELED', 2);
-
-
-define('SALE_TYPE_POS', 0);
-define('SALE_TYPE_INVOICE', 1);
-define('SALE_TYPE_WORK_ORDER', 2);
-define('SALE_TYPE_QUOTE', 3);
-define('SALE_TYPE_RETURN', 4);
-
-define('PERCENT', 0);
-define('FIXED', 1);
-
-define('PRICE_MODE_STANDARD', 0);
-define('PRICE_MODE_KIT', 1);
-
-define('PAYMENT_TYPE_UNASSIGNED', '--');
-
-define('CASH_ADJUSTMENT_TRUE', 1);
-define('CASH_ADJUSTMENT_FALSE', 0);
-define('CASH_MODE_TRUE', 1);
-define('CASH_MODE_FALSE', 0);
diff --git a/application/config/database.php b/application/config/database.php
deleted file mode 100644
index 720bdb732..000000000
--- a/application/config/database.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| DATABASE CONNECTIVITY SETTINGS
-| -------------------------------------------------------------------
-| This file will contain the settings needed to access your database.
-|
-| For complete instructions please consult the 'Database Connection'
-| page of the User Guide.
-|
-| -------------------------------------------------------------------
-| EXPLANATION OF VARIABLES
-| -------------------------------------------------------------------
-|
-|	['dsn']      The full DSN string describe a connection to the database.
-|	['hostname'] The hostname of your database server.
-|	['username'] The username used to connect to the database
-|	['password'] The password used to connect to the database
-|	['database'] The name of the database you want to connect to
-|	['dbdriver'] The database driver. e.g.: mysqli.
-|			Currently supported:
-|				 cubrid, ibase, mssql, mysql, mysqli, oci8,
-|				 odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
-|	['dbprefix'] You can add an optional prefix, which will be added
-|				 to the table name when using the  Query Builder class
-|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
-|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
-|	['cache_on'] TRUE/FALSE - Enables/disables query caching
-|	['cachedir'] The path to the folder where cache files should be stored
-|	['char_set'] The character set used in communicating with the database
-|	['dbcollat'] The character collation used in communicating with the database
-|				 NOTE: For MySQL and MySQLi databases, this setting is only used
-| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
-|				 (and in table creation queries made with DB Forge).
-| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
-| 				 can make your site vulnerable to SQL injection if you are using a
-| 				 multi-byte character set and are running versions lower than these.
-| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
-|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
-|	['encrypt']  Whether or not to use an encrypted connection.
-|
-|			'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
-|			'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
-|
-|				'ssl_key'    - Path to the private key file
-|				'ssl_cert'   - Path to the public key certificate file
-|				'ssl_ca'     - Path to the certificate authority file
-|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
-|				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
-|
-|	['compress'] Whether or not to use client compression (MySQL only)
-|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
-|							- good for ensuring strict SQL while developing
-|	['ssl_options']	Used to set various SSL options that can be used when making SSL connections.
-|	['failover'] array - A array with 0 or more data for connections if the main should fail.
-|	['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
-| 				NOTE: Disabling this will also effectively disable both
-| 				$this->db->last_query() and profiling of DB queries.
-| 				When you run a query, with this setting set to TRUE (default),
-| 				CodeIgniter will store the SQL statement for debugging purposes.
-| 				However, this may cause high memory usage, especially if you run
-| 				a lot of SQL queries ... disable this to avoid that problem.
-|
-| The $active_group variable lets you choose which connection group to
-| make active.  By default there is only one group (the 'default' group).
-|
-| The $query_builder variables lets you determine whether or not to load
-| the query builder class.
-*/
-$active_group = 'default';
-$query_builder = TRUE;
-
-$db['default'] = array(
-	'dsn'	=> '',
-	'hostname' => !empty(getenv('MYSQL_HOST_NAME')) ? getenv('MYSQL_HOST_NAME') : 'localhost',
-	'username' => !empty(getenv('MYSQL_USERNAME')) ? getenv('MYSQL_USERNAME') : 'admin',
-	'password' => !empty(getenv('MYSQL_PASSWORD')) ? getenv('MYSQL_PASSWORD') : 'pointofsale',
-	'database' => !empty(getenv('MYSQL_DB_NAME')) ? getenv('MYSQL_DB_NAME') : 'ospos',
-	'dbdriver' => 'mysqli',
-	'dbprefix' => 'ospos_',
-	'pconnect' => FALSE,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
-);
\ No newline at end of file
diff --git a/application/config/doctypes.php b/application/config/doctypes.php
deleted file mode 100644
index 59a7991e3..000000000
--- a/application/config/doctypes.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$_doctypes = array(
-	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-	'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-	'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-	'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-	'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
-	'html5' => '<!DOCTYPE html>',
-	'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-	'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-	'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
-	'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
-	'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
-	'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
-	'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
-	'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
-	'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
-	'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-	'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-	'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
-	'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
-);
diff --git a/application/config/email.php b/application/config/email.php
deleted file mode 100644
index f242e888f..000000000
--- a/application/config/email.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');                                                                                                                                            
-$config['default_email_address'] = "";
-$config['default_cc_address'] = '';
-$config['default_sender_name'] = "";
-$config['default_sender_address'] = "";
-$config['default_bounce_address'] = "";
-$config['charset'] = 'utf-8';
-$config['mailtype'] = 'html';
-$config['wordwrap'] = FALSE;
-
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
deleted file mode 100644
index ac406e3d4..000000000
--- a/application/config/foreign_chars.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| Foreign Characters
-| -------------------------------------------------------------------
-| This file contains an array of foreign characters for transliteration
-| conversion used by the Text helper
-|
-*/
-$foreign_characters = array(
-	'/ä|æ|ǽ/' => 'ae',
-	'/ö|œ/' => 'oe',
-	'/ü/' => 'ue',
-	'/Ä/' => 'Ae',
-	'/Ü/' => 'Ue',
-	'/Ö/' => 'Oe',
-	'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ|А/' => 'A',
-	'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ|а/' => 'a',
-	'/Б/' => 'B',
-	'/б/' => 'b',
-	'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
-	'/ç|ć|ĉ|ċ|č/' => 'c',
-	'/Д/' => 'D',
-	'/д/' => 'd',
-	'/Ð|Ď|Đ|Δ/' => 'Dj',
-	'/ð|ď|đ|δ/' => 'dj',
-	'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
-	'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
-	'/Ф/' => 'F',
-	'/ф/' => 'f',
-	'/Ĝ|Ğ|Ġ|Ģ|Γ|Г|Ґ/' => 'G',
-	'/ĝ|ğ|ġ|ģ|γ|г|ґ/' => 'g',
-	'/Ĥ|Ħ/' => 'H',
-	'/ĥ|ħ/' => 'h',
-	'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Ы/' => 'I',
-	'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
-	'/Ĵ/' => 'J',
-	'/ĵ/' => 'j',
-	'/Ķ|Κ|К/' => 'K',
-	'/ķ|κ|к/' => 'k',
-	'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
-	'/ĺ|ļ|ľ|ŀ|ł|λ|л/' => 'l',
-	'/М/' => 'M',
-	'/м/' => 'm',
-	'/Ñ|Ń|Ņ|Ň|Ν|Н/' => 'N',
-	'/ñ|ń|ņ|ň|ʼn|ν|н/' => 'n',
-	'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ|Ỏ|Ọ|Ồ|Ố|Ỗ|Ổ|Ộ|Ờ|Ớ|Ỡ|Ở|Ợ|О/' => 'O',
-	'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ|ỏ|ọ|ồ|ố|ỗ|ổ|ộ|ờ|ớ|ỡ|ở|ợ|о/' => 'o',
-	'/П/' => 'P',
-	'/п/' => 'p',
-	'/Ŕ|Ŗ|Ř|Ρ|Р/' => 'R',
-	'/ŕ|ŗ|ř|ρ|р/' => 'r',
-	'/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
-	'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
-	'/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
-	'/ț|ţ|ť|ŧ|т/' => 't',
-	'/Þ|þ/' => 'th',
-	'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
-	'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
-	'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
-	'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
-	'/В/' => 'V',
-	'/в/' => 'v',
-	'/Ŵ/' => 'W',
-	'/ŵ/' => 'w',
-	'/Ź|Ż|Ž|Ζ|З/' => 'Z',
-	'/ź|ż|ž|ζ|з/' => 'z',
-	'/Æ|Ǽ/' => 'AE',
-	'/ß/' => 'ss',
-	'/IJ/' => 'IJ',
-	'/ij/' => 'ij',
-	'/Œ/' => 'OE',
-	'/ƒ/' => 'f',
-	'/ξ/' => 'ks',
-	'/π/' => 'p',
-	'/β/' => 'v',
-	'/μ/' => 'm',
-	'/ψ/' => 'ps',
-	'/Ё/' => 'Yo',
-	'/ё/' => 'yo',
-	'/Є/' => 'Ye',
-	'/є/' => 'ye',
-	'/Ї/' => 'Yi',
-	'/Ж/' => 'Zh',
-	'/ж/' => 'zh',
-	'/Х/' => 'Kh',
-	'/х/' => 'kh',
-	'/Ц/' => 'Ts',
-	'/ц/' => 'ts',
-	'/Ч/' => 'Ch',
-	'/ч/' => 'ch',
-	'/Ш/' => 'Sh',
-	'/ш/' => 'sh',
-	'/Щ/' => 'Shch',
-	'/щ/' => 'shch',
-	'/Ъ|ъ|Ь|ь/' => '',
-	'/Ю/' => 'Yu',
-	'/ю/' => 'yu',
-	'/Я/' => 'Ya',
-	'/я/' => 'ya'
-);
diff --git a/application/config/memcached.php b/application/config/memcached.php
deleted file mode 100644
index 5c23b39c1..000000000
--- a/application/config/memcached.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------------
-| Memcached settings
-| -------------------------------------------------------------------------
-| Your Memcached servers can be specified below.
-|
-|	See: https://codeigniter.com/user_guide/libraries/caching.html#memcached
-|
-*/
-$config = array(
-	'default' => array(
-		'hostname' => '127.0.0.1',
-		'port'     => '11211',
-		'weight'   => '1',
-	),
-);
diff --git a/application/config/mimes.php b/application/config/mimes.php
deleted file mode 100644
index 8bac87251..000000000
--- a/application/config/mimes.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| MIME TYPES
-| -------------------------------------------------------------------
-| This file contains an array of mime types.  It is used by the
-| Upload class to help identify allowed file types.
-|
-*/
-return array(
-	'hqx'	=>	array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
-	'cpt'	=>	'application/mac-compactpro',
-	'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'),
-	'bin'	=>	array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'),
-	'dms'	=>	'application/octet-stream',
-	'lha'	=>	'application/octet-stream',
-	'lzh'	=>	'application/octet-stream',
-	'exe'	=>	array('application/octet-stream', 'application/x-msdownload'),
-	'class'	=>	'application/octet-stream',
-	'psd'	=>	array('application/x-photoshop', 'image/vnd.adobe.photoshop'),
-	'so'	=>	'application/octet-stream',
-	'sea'	=>	'application/octet-stream',
-	'dll'	=>	'application/octet-stream',
-	'oda'	=>	'application/oda',
-	'pdf'	=>	array('application/pdf', 'application/force-download', 'application/x-download', 'binary/octet-stream'),
-	'ai'	=>	array('application/pdf', 'application/postscript'),
-	'eps'	=>	'application/postscript',
-	'ps'	=>	'application/postscript',
-	'smi'	=>	'application/smil',
-	'smil'	=>	'application/smil',
-	'mif'	=>	'application/vnd.mif',
-	'xls'	=>	array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'),
-	'ppt'	=>	array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office', 'application/msword'),
-	'pptx'	=> 	array('application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/x-zip', 'application/zip'),
-	'wbxml'	=>	'application/wbxml',
-	'wmlc'	=>	'application/wmlc',
-	'dcr'	=>	'application/x-director',
-	'dir'	=>	'application/x-director',
-	'dxr'	=>	'application/x-director',
-	'dvi'	=>	'application/x-dvi',
-	'gtar'	=>	'application/x-gtar',
-	'gz'	=>	'application/x-gzip',
-	'gzip'  =>	'application/x-gzip',
-	'php'	=>	array('application/x-httpd-php', 'application/php', 'application/x-php', 'text/php', 'text/x-php', 'application/x-httpd-php-source'),
-	'php4'	=>	'application/x-httpd-php',
-	'php3'	=>	'application/x-httpd-php',
-	'phtml'	=>	'application/x-httpd-php',
-	'phps'	=>	'application/x-httpd-php-source',
-	'js'	=>	array('application/x-javascript', 'text/plain'),
-	'swf'	=>	'application/x-shockwave-flash',
-	'sit'	=>	'application/x-stuffit',
-	'tar'	=>	'application/x-tar',
-	'tgz'	=>	array('application/x-tar', 'application/x-gzip-compressed'),
-	'z'	=>	'application/x-compress',
-	'xhtml'	=>	'application/xhtml+xml',
-	'xht'	=>	'application/xhtml+xml',
-	'zip'	=>	array('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/s-compressed', 'multipart/x-zip'),
-	'rar'	=>	array('application/x-rar', 'application/rar', 'application/x-rar-compressed'),
-	'mid'	=>	'audio/midi',
-	'midi'	=>	'audio/midi',
-	'mpga'	=>	'audio/mpeg',
-	'mp2'	=>	'audio/mpeg',
-	'mp3'	=>	array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
-	'aif'	=>	array('audio/x-aiff', 'audio/aiff'),
-	'aiff'	=>	array('audio/x-aiff', 'audio/aiff'),
-	'aifc'	=>	'audio/x-aiff',
-	'ram'	=>	'audio/x-pn-realaudio',
-	'rm'	=>	'audio/x-pn-realaudio',
-	'rpm'	=>	'audio/x-pn-realaudio-plugin',
-	'ra'	=>	'audio/x-realaudio',
-	'rv'	=>	'video/vnd.rn-realvideo',
-	'wav'	=>	array('audio/x-wav', 'audio/wave', 'audio/wav'),
-	'bmp'	=>	array('image/bmp', 'image/x-bmp', 'image/x-bitmap', 'image/x-xbitmap', 'image/x-win-bitmap', 'image/x-windows-bmp', 'image/ms-bmp', 'image/x-ms-bmp', 'application/bmp', 'application/x-bmp', 'application/x-win-bitmap'),
-	'gif'	=>	'image/gif',
-	'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
-	'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
-	'jpe'	=>	array('image/jpeg', 'image/pjpeg'),
-	'jp2'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'j2k'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'jpf'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'jpg2'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'jpx'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'jpm'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'mj2'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'mjp2'	=>	array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'),
-	'png'	=>	array('image/png',  'image/x-png'),
-	'tiff'	=>	'image/tiff',
-	'tif'	=>	'image/tiff',
-	'css'	=>	array('text/css', 'text/plain'),
-	'html'	=>	array('text/html', 'text/plain'),
-	'htm'	=>	array('text/html', 'text/plain'),
-	'shtml'	=>	array('text/html', 'text/plain'),
-	'txt'	=>	'text/plain',
-	'text'	=>	'text/plain',
-	'log'	=>	array('text/plain', 'text/x-log'),
-	'rtx'	=>	'text/richtext',
-	'rtf'	=>	'text/rtf',
-	'xml'	=>	array('application/xml', 'text/xml', 'text/plain'),
-	'xsl'	=>	array('application/xml', 'text/xsl', 'text/xml'),
-	'mpeg'	=>	'video/mpeg',
-	'mpg'	=>	'video/mpeg',
-	'mpe'	=>	'video/mpeg',
-	'qt'	=>	'video/quicktime',
-	'mov'	=>	'video/quicktime',
-	'avi'	=>	array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'),
-	'movie'	=>	'video/x-sgi-movie',
-	'doc'	=>	array('application/msword', 'application/vnd.ms-office'),
-	'docx'	=>	array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword', 'application/x-zip'),
-	'dot'	=>	array('application/msword', 'application/vnd.ms-office'),
-	'dotx'	=>	array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'),
-	'xlsx'	=>	array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword', 'application/x-zip'),
-	'word'	=>	array('application/msword', 'application/octet-stream'),
-	'xl'	=>	'application/excel',
-	'eml'	=>	'message/rfc822',
-	'json'  =>	array('application/json', 'text/json'),
-	'pem'   =>	array('application/x-x509-user-cert', 'application/x-pem-file', 'application/octet-stream'),
-	'p10'   =>	array('application/x-pkcs10', 'application/pkcs10'),
-	'p12'   =>	'application/x-pkcs12',
-	'p7a'   =>	'application/x-pkcs7-signature',
-	'p7c'   =>	array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
-	'p7m'   =>	array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
-	'p7r'   =>	'application/x-pkcs7-certreqresp',
-	'p7s'   =>	'application/pkcs7-signature',
-	'crt'   =>	array('application/x-x509-ca-cert', 'application/x-x509-user-cert', 'application/pkix-cert'),
-	'crl'   =>	array('application/pkix-crl', 'application/pkcs-crl'),
-	'der'   =>	'application/x-x509-ca-cert',
-	'kdb'   =>	'application/octet-stream',
-	'pgp'   =>	'application/pgp',
-	'gpg'   =>	'application/gpg-keys',
-	'sst'   =>	'application/octet-stream',
-	'csr'   =>	'application/octet-stream',
-	'rsa'   =>	'application/x-pkcs7',
-	'cer'   =>	array('application/pkix-cert', 'application/x-x509-ca-cert'),
-	'3g2'   =>	'video/3gpp2',
-	'3gp'   =>	array('video/3gp', 'video/3gpp'),
-	'mp4'   =>	'video/mp4',
-	'm4a'   =>	'audio/x-m4a',
-	'f4v'   =>	array('video/mp4', 'video/x-f4v'),
-	'flv'	=>	'video/x-flv',
-	'webm'	=>	'video/webm',
-	'aac'   =>	'audio/x-acc',
-	'm4u'   =>	'application/vnd.mpegurl',
-	'm3u'   =>	'text/plain',
-	'xspf'  =>	'application/xspf+xml',
-	'vlc'   =>	'application/videolan',
-	'wmv'   =>	array('video/x-ms-wmv', 'video/x-ms-asf'),
-	'au'    =>	'audio/x-au',
-	'ac3'   =>	'audio/ac3',
-	'flac'  =>	'audio/x-flac',
-	'ogg'   =>	array('audio/ogg', 'video/ogg', 'application/ogg'),
-	'kmz'	=>	array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'),
-	'kml'	=>	array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'),
-	'ics'	=>	'text/calendar',
-	'ical'	=>	'text/calendar',
-	'zsh'	=>	'text/x-scriptzsh',
-	'7zip'	=>	array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
-	'cdr'	=>	array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
-	'wma'	=>	array('audio/x-ms-wma', 'video/x-ms-asf'),
-	'jar'	=>	array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),
-	'svg'	=>	array('image/svg+xml', 'application/xml', 'text/xml'),
-	'vcf'	=>	'text/x-vcard',
-	'srt'	=>	array('text/srt', 'text/plain'),
-	'vtt'	=>	array('text/vtt', 'text/plain'),
-	'ico'	=>	array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon')
-);
diff --git a/application/config/pagination.php b/application/config/pagination.php
deleted file mode 100644
index f89d195db..000000000
--- a/application/config/pagination.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Bootstrap 3 pagination links styling
-|--------------------------------------------------------------------------
-|
-| Source code from http://stackoverflow.com/questions/20088779/bootstrap-3-pagination-with-codeigniter
-*/
-$config['full_tag_open'] = "<ul class='pagination pagination-sm'>";
-$config['full_tag_close'] ="</ul>";
-$config['num_tag_open'] = '<li>';
-$config['num_tag_close'] = '</li>';
-$config['cur_tag_open'] = "<li class='disabled'><li class='active'><a href='#'>";
-$config['cur_tag_close'] = "<span class='sr-only'></span></a></li>";
-$config['next_tag_open'] = "<li>";
-$config['next_tagl_close'] = "</li>";
-$config['prev_tag_open'] = "<li>";
-$config['prev_tagl_close'] = "</li>";
-$config['first_tag_open'] = "<li>";
-$config['first_tagl_close'] = "</li>";
-$config['last_tag_open'] = "<li>";
-$config['last_tagl_close'] = "</li>";
\ No newline at end of file
diff --git a/application/config/routes.php b/application/config/routes.php
deleted file mode 100644
index d7c9d7b4a..000000000
--- a/application/config/routes.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------------
-| URI ROUTING
-| -------------------------------------------------------------------------
-| This file lets you re-map URI requests to specific controller functions.
-|
-| Typically there is a one-to-one relationship between a URL string
-| and its corresponding controller class/method. The segments in a
-| URL normally follow this pattern:
-|
-|	example.com/class/method/id/
-|
-| In some instances, however, you may want to remap this relationship
-| so that a different class/function is called than the one
-| corresponding to the URL.
-|
-| Please see the user guide for complete details:
-|
-|	https://codeigniter.com/user_guide/general/routing.html
-|
-| -------------------------------------------------------------------------
-| RESERVED ROUTES
-| -------------------------------------------------------------------------
-|
-| There are three reserved routes:
-|
-|	$route['default_controller'] = 'welcome';
-|
-| This route indicates which controller class should be loaded if the
-| URI contains no data. In the above example, the "welcome" class
-| would be loaded.
-|
-|	$route['404_override'] = 'errors/page_missing';
-|
-| This route will tell the Router which controller/method to use if those
-| provided in the URL cannot be matched to a valid route.
-|
-|	$route['translate_uri_dashes'] = FALSE;
-|
-| This is not exactly a route, but allows you to automatically route
-| controller and method names that contain dashes. '-' isn't a valid
-| class or method name character, so it requires translation.
-| When you set this option to TRUE, it will replace ALL dashes in the
-| controller and method URI segments.
-|
-| Examples:	my-controller/index	-> my_controller/index
-|		my-controller/my-method	-> my_controller/my_method
-*/
-
-$route['default_controller'] = 'login';
-$route['no_access/([^/]+)'] = 'no_access/index/$1';
-$route['no_access/([^/]+)/([^/]+)'] = 'no_access/index/$1/$2';
-
-$route['sales/index/([^/]+)'] = 'sales/manage/$1';
-$route['sales/index/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2';
-$route['sales/index/([^/]+)/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2/$3';
-
-$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
-$route['reports/summary_expenses_categories'] = 'reports/date_input_only';
-$route['reports/summary_payments'] = 'reports/date_input_only';
-$route['reports/summary_discounts'] = 'reports/summary_discounts_input';
-$route['reports/summary_:any'] = 'reports/date_input';
-
-$route['reports/(graphical_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
-$route['reports/graphical_summary_expenses_categories'] = 'reports/date_input_only';
-$route['reports/graphical_summary_discounts'] = 'reports/summary_discounts_input';
-$route['reports/graphical_:any'] = 'reports/date_input';
-
-$route['reports/(inventory_:any)/([^/]+)'] = 'reports/$1/$2';
-$route['reports/inventory_summary'] = 'reports/inventory_summary_input';
-$route['reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2';
-
-$route['reports/(detailed_:any)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
-$route['reports/detailed_sales'] = 'reports/date_input_sales';
-$route['reports/detailed_receivings'] = 'reports/date_input_recv';
-
-$route['reports/(specific_:any)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
-$route['reports/specific_customer'] = 'reports/specific_customer_input';
-$route['reports/specific_employee'] = 'reports/specific_employee_input';
-$route['reports/specific_discount'] = 'reports/specific_discount_input';
-$route['reports/specific_supplier'] = 'reports/specific_supplier_input';
-
-$route['404_override'] = '';
-$route['translate_uri_dashes'] = FALSE;
diff --git a/application/config/smileys.php b/application/config/smileys.php
deleted file mode 100644
index abf9a898d..000000000
--- a/application/config/smileys.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| SMILEYS
-| -------------------------------------------------------------------
-| This file contains an array of smileys for use with the emoticon helper.
-| Individual images can be used to replace multiple smileys.  For example:
-| :-) and :) use the same image replacement.
-|
-| Please see user guide for more info:
-| https://codeigniter.com/user_guide/helpers/smiley_helper.html
-|
-*/
-$smileys = array(
-
-//	smiley			image name						width	height	alt
-
-	':-)'			=>	array('grin.gif',			'19',	'19',	'grin'),
-	':lol:'			=>	array('lol.gif',			'19',	'19',	'LOL'),
-	':cheese:'		=>	array('cheese.gif',			'19',	'19',	'cheese'),
-	':)'			=>	array('smile.gif',			'19',	'19',	'smile'),
-	';-)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	';)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	':smirk:'		=>	array('smirk.gif',			'19',	'19',	'smirk'),
-	':roll:'		=>	array('rolleyes.gif',		'19',	'19',	'rolleyes'),
-	':-S'			=>	array('confused.gif',		'19',	'19',	'confused'),
-	':wow:'			=>	array('surprise.gif',		'19',	'19',	'surprised'),
-	':bug:'			=>	array('bigsurprise.gif',	'19',	'19',	'big surprise'),
-	':-P'			=>	array('tongue_laugh.gif',	'19',	'19',	'tongue laugh'),
-	'%-P'			=>	array('tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'),
-	';-P'			=>	array('tongue_wink.gif',	'19',	'19',	'tongue wink'),
-	':P'			=>	array('raspberry.gif',		'19',	'19',	'raspberry'),
-	':blank:'		=>	array('blank.gif',			'19',	'19',	'blank stare'),
-	':long:'		=>	array('longface.gif',		'19',	'19',	'long face'),
-	':ohh:'			=>	array('ohh.gif',			'19',	'19',	'ohh'),
-	':grrr:'		=>	array('grrr.gif',			'19',	'19',	'grrr'),
-	':gulp:'		=>	array('gulp.gif',			'19',	'19',	'gulp'),
-	'8-/'			=>	array('ohoh.gif',			'19',	'19',	'oh oh'),
-	':down:'		=>	array('downer.gif',			'19',	'19',	'downer'),
-	':red:'			=>	array('embarrassed.gif',	'19',	'19',	'red face'),
-	':sick:'		=>	array('sick.gif',			'19',	'19',	'sick'),
-	':shut:'		=>	array('shuteye.gif',		'19',	'19',	'shut eye'),
-	':-/'			=>	array('hmm.gif',			'19',	'19',	'hmmm'),
-	'>:('			=>	array('mad.gif',			'19',	'19',	'mad'),
-	':mad:'			=>	array('mad.gif',			'19',	'19',	'mad'),
-	'>:-('			=>	array('angry.gif',			'19',	'19',	'angry'),
-	':angry:'		=>	array('angry.gif',			'19',	'19',	'angry'),
-	':zip:'			=>	array('zip.gif',			'19',	'19',	'zipper'),
-	':kiss:'		=>	array('kiss.gif',			'19',	'19',	'kiss'),
-	':ahhh:'		=>	array('shock.gif',			'19',	'19',	'shock'),
-	':coolsmile:'	=>	array('shade_smile.gif',	'19',	'19',	'cool smile'),
-	':coolsmirk:'	=>	array('shade_smirk.gif',	'19',	'19',	'cool smirk'),
-	':coolgrin:'	=>	array('shade_grin.gif',		'19',	'19',	'cool grin'),
-	':coolhmm:'		=>	array('shade_hmm.gif',		'19',	'19',	'cool hmm'),
-	':coolmad:'		=>	array('shade_mad.gif',		'19',	'19',	'cool mad'),
-	':coolcheese:'	=>	array('shade_cheese.gif',	'19',	'19',	'cool cheese'),
-	':vampire:'		=>	array('vampire.gif',		'19',	'19',	'vampire'),
-	':snake:'		=>	array('snake.gif',			'19',	'19',	'snake'),
-	':exclaim:'		=>	array('exclaim.gif',		'19',	'19',	'exclaim'),
-	':question:'	=>	array('question.gif',		'19',	'19',	'question')
-
-);
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
deleted file mode 100644
index 798086b65..000000000
--- a/application/config/user_agents.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------
-| USER AGENT TYPES
-| -------------------------------------------------------------------
-| This file contains four arrays of user agent data. It is used by the
-| User Agent Class to help identify browser, platform, robot, and
-| mobile device data. The array keys are used to identify the device
-| and the array values are used to set the actual name of the item.
-*/
-$platforms = array(
-	'windows nt 10.0'	=> 'Windows 10',
-	'windows nt 6.3'	=> 'Windows 8.1',
-	'windows nt 6.2'	=> 'Windows 8',
-	'windows nt 6.1'	=> 'Windows 7',
-	'windows nt 6.0'	=> 'Windows Vista',
-	'windows nt 5.2'	=> 'Windows 2003',
-	'windows nt 5.1'	=> 'Windows XP',
-	'windows nt 5.0'	=> 'Windows 2000',
-	'windows nt 4.0'	=> 'Windows NT 4.0',
-	'winnt4.0'			=> 'Windows NT 4.0',
-	'winnt 4.0'			=> 'Windows NT',
-	'winnt'				=> 'Windows NT',
-	'windows 98'		=> 'Windows 98',
-	'win98'				=> 'Windows 98',
-	'windows 95'		=> 'Windows 95',
-	'win95'				=> 'Windows 95',
-	'windows phone'			=> 'Windows Phone',
-	'windows'			=> 'Unknown Windows OS',
-	'android'			=> 'Android',
-	'blackberry'		=> 'BlackBerry',
-	'iphone'			=> 'iOS',
-	'ipad'				=> 'iOS',
-	'ipod'				=> 'iOS',
-	'os x'				=> 'Mac OS X',
-	'ppc mac'			=> 'Power PC Mac',
-	'freebsd'			=> 'FreeBSD',
-	'ppc'				=> 'Macintosh',
-	'linux'				=> 'Linux',
-	'debian'			=> 'Debian',
-	'sunos'				=> 'Sun Solaris',
-	'beos'				=> 'BeOS',
-	'apachebench'		=> 'ApacheBench',
-	'aix'				=> 'AIX',
-	'irix'				=> 'Irix',
-	'osf'				=> 'DEC OSF',
-	'hp-ux'				=> 'HP-UX',
-	'netbsd'			=> 'NetBSD',
-	'bsdi'				=> 'BSDi',
-	'openbsd'			=> 'OpenBSD',
-	'gnu'				=> 'GNU/Linux',
-	'unix'				=> 'Unknown Unix OS',
-	'symbian' 			=> 'Symbian OS'
-);
-
-
-// The order of this array should NOT be changed. Many browsers return
-// multiple browser types so we want to identify the sub-type first.
-$browsers = array(
-	'OPR'			=> 'Opera',
-	'Flock'			=> 'Flock',
-	'Edge'			=> 'Spartan',
-	'Chrome'		=> 'Chrome',
-	// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
-	'Opera.*?Version'	=> 'Opera',
-	'Opera'			=> 'Opera',
-	'MSIE'			=> 'Internet Explorer',
-	'Internet Explorer'	=> 'Internet Explorer',
-	'Trident.* rv'	=> 'Internet Explorer',
-	'Shiira'		=> 'Shiira',
-	'Firefox'		=> 'Firefox',
-	'Chimera'		=> 'Chimera',
-	'Phoenix'		=> 'Phoenix',
-	'Firebird'		=> 'Firebird',
-	'Camino'		=> 'Camino',
-	'Netscape'		=> 'Netscape',
-	'OmniWeb'		=> 'OmniWeb',
-	'Safari'		=> 'Safari',
-	'Mozilla'		=> 'Mozilla',
-	'Konqueror'		=> 'Konqueror',
-	'icab'			=> 'iCab',
-	'Lynx'			=> 'Lynx',
-	'Links'			=> 'Links',
-	'hotjava'		=> 'HotJava',
-	'amaya'			=> 'Amaya',
-	'IBrowse'		=> 'IBrowse',
-	'Maxthon'		=> 'Maxthon',
-	'Ubuntu'		=> 'Ubuntu Web Browser'
-);
-
-$mobiles = array(
-	// legacy array, old values commented out
-	'mobileexplorer'	=> 'Mobile Explorer',
-//  'openwave'			=> 'Open Wave',
-//	'opera mini'		=> 'Opera Mini',
-//	'operamini'			=> 'Opera Mini',
-//	'elaine'			=> 'Palm',
-	'palmsource'		=> 'Palm',
-//	'digital paths'		=> 'Palm',
-//	'avantgo'			=> 'Avantgo',
-//	'xiino'				=> 'Xiino',
-	'palmscape'			=> 'Palmscape',
-//	'nokia'				=> 'Nokia',
-//	'ericsson'			=> 'Ericsson',
-//	'blackberry'		=> 'BlackBerry',
-//	'motorola'			=> 'Motorola'
-
-	// Phones and Manufacturers
-	'motorola'		=> 'Motorola',
-	'nokia'			=> 'Nokia',
-	'palm'			=> 'Palm',
-	'iphone'		=> 'Apple iPhone',
-	'ipad'			=> 'iPad',
-	'ipod'			=> 'Apple iPod Touch',
-	'sony'			=> 'Sony Ericsson',
-	'ericsson'		=> 'Sony Ericsson',
-	'blackberry'	=> 'BlackBerry',
-	'cocoon'		=> 'O2 Cocoon',
-	'blazer'		=> 'Treo',
-	'lg'			=> 'LG',
-	'amoi'			=> 'Amoi',
-	'xda'			=> 'XDA',
-	'mda'			=> 'MDA',
-	'vario'			=> 'Vario',
-	'htc'			=> 'HTC',
-	'samsung'		=> 'Samsung',
-	'sharp'			=> 'Sharp',
-	'sie-'			=> 'Siemens',
-	'alcatel'		=> 'Alcatel',
-	'benq'			=> 'BenQ',
-	'ipaq'			=> 'HP iPaq',
-	'mot-'			=> 'Motorola',
-	'playstation portable'	=> 'PlayStation Portable',
-	'playstation 3'		=> 'PlayStation 3',
-	'playstation vita'  	=> 'PlayStation Vita',
-	'hiptop'		=> 'Danger Hiptop',
-	'nec-'			=> 'NEC',
-	'panasonic'		=> 'Panasonic',
-	'philips'		=> 'Philips',
-	'sagem'			=> 'Sagem',
-	'sanyo'			=> 'Sanyo',
-	'spv'			=> 'SPV',
-	'zte'			=> 'ZTE',
-	'sendo'			=> 'Sendo',
-	'nintendo dsi'	=> 'Nintendo DSi',
-	'nintendo ds'	=> 'Nintendo DS',
-	'nintendo 3ds'	=> 'Nintendo 3DS',
-	'wii'			=> 'Nintendo Wii',
-	'open web'		=> 'Open Web',
-	'openweb'		=> 'OpenWeb',
-
-	// Operating Systems
-	'android'		=> 'Android',
-	'symbian'		=> 'Symbian',
-	'SymbianOS'		=> 'SymbianOS',
-	'elaine'		=> 'Palm',
-	'series60'		=> 'Symbian S60',
-	'windows ce'	=> 'Windows CE',
-
-	// Browsers
-	'obigo'			=> 'Obigo',
-	'netfront'		=> 'Netfront Browser',
-	'openwave'		=> 'Openwave Browser',
-	'mobilexplorer'	=> 'Mobile Explorer',
-	'operamini'		=> 'Opera Mini',
-	'opera mini'	=> 'Opera Mini',
-	'opera mobi'	=> 'Opera Mobile',
-	'fennec'		=> 'Firefox Mobile',
-
-	// Other
-	'digital paths'	=> 'Digital Paths',
-	'avantgo'		=> 'AvantGo',
-	'xiino'			=> 'Xiino',
-	'novarra'		=> 'Novarra Transcoder',
-	'vodafone'		=> 'Vodafone',
-	'docomo'		=> 'NTT DoCoMo',
-	'o2'			=> 'O2',
-
-	// Fallback
-	'mobile'		=> 'Generic Mobile',
-	'wireless'		=> 'Generic Mobile',
-	'j2me'			=> 'Generic Mobile',
-	'midp'			=> 'Generic Mobile',
-	'cldc'			=> 'Generic Mobile',
-	'up.link'		=> 'Generic Mobile',
-	'up.browser'	=> 'Generic Mobile',
-	'smartphone'	=> 'Generic Mobile',
-	'cellphone'		=> 'Generic Mobile'
-);
-
-// There are hundreds of bots but these are the most common.
-$robots = array(
-	'googlebot'		=> 'Googlebot',
-	'msnbot'		=> 'MSNBot',
-	'baiduspider'		=> 'Baiduspider',
-	'bingbot'		=> 'Bing',
-	'slurp'			=> 'Inktomi Slurp',
-	'yahoo'			=> 'Yahoo',
-	'ask jeeves'		=> 'Ask Jeeves',
-	'fastcrawler'		=> 'FastCrawler',
-	'infoseek'		=> 'InfoSeek Robot 1.0',
-	'lycos'			=> 'Lycos',
-	'yandex'		=> 'YandexBot',
-	'mediapartners-google'	=> 'MediaPartners Google',
-	'CRAZYWEBCRAWLER'	=> 'Crazy Webcrawler',
-	'adsbot-google'		=> 'AdsBot Google',
-	'feedfetcher-google'	=> 'Feedfetcher Google',
-	'curious george'	=> 'Curious George',
-	'ia_archiver'		=> 'Alexa Crawler',
-	'MJ12bot'		=> 'Majestic-12',
-	'Uptimebot'		=> 'Uptimebot'
-);
diff --git a/application/core/MY_Lang.php b/application/core/MY_Lang.php
deleted file mode 100644
index d1fc59973..000000000
--- a/application/core/MY_Lang.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class MY_Lang extends CI_Lang
-{
-    public function switch_to($idiom)
-    {
-        $CI =& get_instance();
-        if(is_string($idiom))
-        {
-            $CI->config->set_item('language', $idiom);
-            $loaded = $this->is_loaded;
-            $this->is_loaded = array();
-
-            foreach($loaded as $file)
-            {
-                $filename = strtr($file, '', '_lang.php');
-                $this->load($filename, 'english');
-                $array = $this->load($filename, $idiom, TRUE);
-                foreach($array as $lang_key => $lang_value) {
-                    if ($lang_value != '') {
-                        $this->language[$lang_key] = $lang_value;
-                    }
-                }
-            }
-        }
-    }
-    
-	/**
-     * Fetch a single line of text from the language array. Takes variable number
-     * of arguments and supports wildcards in the form of '%1', '%2', etc.
-     * Overloaded function.
-     *
-     * @access public
-     * @return mixed false if not found or the language string
-     */
-	public function line($line = '', $log_errors = TRUE)
-    {
-        //get the arguments passed to the function
-        $args = func_get_args();
-        
-        //count the number of arguments
-        $c = count($args);
-        
-        //if one or more arguments, perform the necessary processing
-        if($c)
-        {
-            //first argument should be the actual language line key
-            //so remove it from the array (pop from front)
-            $line = array_shift($args);
-            
-            //check to make sure the key is valid and load the line
-            if($line == '')
-            {
-            	$line = FALSE;
-            }
-            else 
-            {
-            	if(isset($this->language[$line]) && $this->language[$line] != '')
-            	{
-            		$line = $this->language[$line];
-            		//if the line exists and more function arguments remain
-            		//perform wildcard replacements
-            		if($args)
-            		{
-            			$i = 1;
-            			foreach($args as $arg)
-            			{
-            				$line = preg_replace('/\%'.$i.'/', $arg, $line);
-            				++$i;
-            			}
-            		}
-            	}
-            	else
-            	{
-            		// just return label name (with TBD)
-            		$line = $this->line_tbd($line);
-            		log_message('error', 'Could not find the language line "'.$line.'"');
-            	}
-            }
-        }
-        else
-        {
-            //if no arguments given, no language line available
-            $line = FALSE;
-        }
-        
-        return $line;
-    }
-    
-    public function line_tbd($line = '')
-    {
-    	return $line . ' (TBD)';
-    }
-}
-
-?>
diff --git a/application/core/MY_Security.php b/application/core/MY_Security.php
deleted file mode 100644
index f962c6f73..000000000
--- a/application/core/MY_Security.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-defined('BASEPATH') or exit('No direct script access allowed');
-
-class MY_Security extends CI_Security
-{
-    /**
-     * CSRF Set Cookie with samesite
-     *
-     * @codeCoverageIgnore
-     * @return  CI_Security
-     */
-    public function csrf_set_cookie()
-    {
-        $expire = time() + $this->_csrf_expire;
-        $secure_cookie = (bool)config_item('cookie_secure');
-
-        if ($secure_cookie && !is_https())
-        {
-            return FALSE;
-        }
-
-        $path = config_item('cookie_path');
-
-        if (PHP_VERSION_ID < 70300) {
-
-            if (is_https())
-            {
-                $path .= '; samesite=strict';
-            }
-
-            setcookie($this->_csrf_cookie_name,
-                $this->_csrf_hash, $expire,
-                $path,
-                config_item('cookie_domain'),
-                $secure_cookie,
-                FALSE);
-        }
-        else
-        {
-            $samesite = is_https() ? 'None' : 'Strict';
-
-            setcookie($this->_csrf_cookie_name,
-                $this->_csrf_hash,
-                ['samesite' => $samesite,
-                    'secure' => $secure_cookie,
-                    'expires' => $expire,
-                    'path' => config_item('cookie_path'),
-                    'domain' => config_item('cookie_domain'),
-                    'httponly' => FALSE]);
-        }
-
-
-        log_message('info', 'CSRF cookie sent');
-
-        return $this;
-    }
-}
diff --git a/application/hooks/index.html b/application/hooks/index.html
deleted file mode 100644
index b702fbc39..000000000
--- a/application/hooks/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/index.html b/application/index.html
deleted file mode 100644
index b702fbc39..000000000
--- a/application/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/language/.htaccess b/application/language/.htaccess
deleted file mode 100644
index 14249c50b..000000000
--- a/application/language/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/application/logs/index.html b/application/logs/index.html
deleted file mode 100644
index b702fbc39..000000000
--- a/application/logs/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/third_party/index.html b/application/third_party/index.html
deleted file mode 100644
index b702fbc39..000000000
--- a/application/third_party/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/bin/check-diff.sh b/bin/check-diff.sh
deleted file mode 100755
index 4a3873b73..000000000
--- a/bin/check-diff.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-## Part of CodeIgniter Composer Installer
-##
-## @author     Kenji Suzuki <https://github.com/kenjis>
-## @license    MIT License
-## @copyright  2015 Kenji Suzuki
-## @link       https://github.com/kenjis/codeigniter-composer-installer
-
-cd `dirname $0`
-cd ..
-
-diff -urN vendor/codeigniter/framework/application application
-diff -u vendor/codeigniter/framework/index.php public/index.php
diff --git a/bin/devinstall.sh b/bin/devinstall.sh
deleted file mode 100644
index af867909b..000000000
--- a/bin/devinstall.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-npm install --only=dev
-composer install
-php bin/install.php translations develop
-bower install
-bin/gendocs.sh
-
diff --git a/bin/gendocs.sh b/bin/gendocs.sh
deleted file mode 100644
index 7d43f081f..000000000
--- a/bin/gendocs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-composer require --dev apigen/apigen
-grunt gendocs
-composer remove --dev apigen/apigen
-composer clearcache
-
-
diff --git a/bin/install.php b/bin/install.php
deleted file mode 100755
index 3829325b6..000000000
--- a/bin/install.php
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$installer = new Installer();
-
-if ($argc === 3) {
-    $package = $argv[1];
-    $version = $argv[2];
-    echo $installer->install($package, $version);
-} else {
-    echo $installer->usage($argv[0]);
-}
-
-
-class Installer
-{
-    protected $tmp_dir;
-    protected $packages = array();
-
-    public function __construct() {
-        $this->tmp_dir = __DIR__ . '/tmp';
-        @mkdir($this->tmp_dir);
-        
-        $this->packages = array(
-            'translations' => array(
-                'site'  => 'github',
-                'user'  => 'bcit-ci',
-                'repos' => 'codeigniter3-translations',
-                'name'  => 'Translations for CodeIgniter System Messages',
-                'dir'   => 'language',
-                'dst'   => 'system',
-                'example_branch' => '3.0.0',
-             ),
-            'restserver' => array(
-                'site'  => 'github',
-                'user'  => 'chriskacerguis',
-                'repos' => 'codeigniter-restserver',
-                'name'  => 'CodeIgniter Rest Server',
-                'dir'   => array('config', 'controllers', 'language', 'libraries', 'views'),
-                'pre'   => 'application/',
-                'msg'   => 'See https://github.com/chriskacerguis/codeigniter-restserver',
-                'example_branch' => '2.7.2',
-            ),
-            'matches-cli' => array(
-                'site'  => 'github',
-                'user'  => 'avenirer',
-                'repos' => 'codeigniter-matches-cli',
-                'name'  => 'Codeigniter Matches CLI',
-                'dir'   => array('config', 'controllers', 'views'),
-                'msg'   => 'See http://avenirer.github.io/codeigniter-matches-cli/',
-                'example_branch' => 'master',
-            ),
-            'hmvc-modules' => array(
-                'site'  => 'github',
-                'user'  => 'jenssegers',
-                'repos' => 'codeigniter-hmvc-modules',
-                'name'  => 'CodeIgniter HMVC Modules (jenssegers)',
-                'dir'   => array('core', 'third_party'),
-                'msg'   => 'See https://github.com/jenssegers/codeigniter-hmvc-modules#installation',
-                'example_branch' => 'master',
-            ),
-            'modular-extensions-hmvc' => array(
-                'site'  => 'bitbucket',
-                'user'  => 'wiredesignz',
-                'repos' => 'codeigniter-modular-extensions-hmvc',
-                'name'  => 'Modular Extensions - HMVC (wiredesignz)',
-                'dir'   => array('core', 'third_party'),
-                'msg'   => 'See https://bitbucket.org/wiredesignz/codeigniter-modular-extensions-hmvc',
-                'example_branch' => 'codeigniter-3.x',
-            ),
-            'ion-auth' => array(
-                'site'  => 'github',
-                'user'  => 'benedmunds',
-                'repos' => 'CodeIgniter-Ion-Auth',
-                'name'  => 'Codeigniter Ion Auth',
-                'dir'   => array(
-                    'config', 'controllers', 'language', 'libraries',
-                    'migrations', 'models', 'sql', 'views'
-                ),
-                'msg'   => 'See http://benedmunds.com/ion_auth/',
-                'example_branch' => '2',
-            ),
-            'filename-checker' => array(
-                'site'  => 'github',
-                'user'  => 'kenjis',
-                'repos' => 'codeigniter3-filename-checker',
-                'name'  => 'CodeIgniter3 Filename Checker',
-                'dir'   => 'controllers',
-                'msg'   => 'See https://github.com/kenjis/codeigniter3-filename-checker',
-                'example_branch' => 'master',
-            ),
-        );
-    }
-
-    public function usage($self)
-    {
-        $msg = 'You can install:' . PHP_EOL;
-        
-        foreach ($this->packages as $key => $value) {
-            $msg .= '  ' . $value['name'] . ' (' . $key . ')' . PHP_EOL;
-        }
-        
-        $msg .= PHP_EOL;
-        $msg .= 'Usage:' . PHP_EOL;
-        $msg .= '  php install.php <package> <version/branch>'  . PHP_EOL;
-        $msg .= PHP_EOL;
-        $msg .= 'Examples:' . PHP_EOL;
-
-        foreach ($this->packages as $key => $value) {
-            $msg .= "  php $self $key " . $value['example_branch'] . PHP_EOL;
-        }
-
-        return $msg;
-    }
-
-    public function install($package, $version)
-    {
-        if (! isset($this->packages[$package]))
-        {
-            return 'Error! no such package: ' . $package . PHP_EOL;
-        }
-
-        // github
-        if ($this->packages[$package]['site'] === 'github') {
-            $method = 'downloadFromGithub';
-        } elseif ($this->packages[$package]['site'] === 'bitbucket') {
-            $method = 'downloadFromBitbucket';
-        } else {
-            throw new LogicException(
-                'Error! no such repos type: ' . $this->packages[$package]['site']
-            );
-        }
-        
-        list($src, $dst) = $this->$method($package, $version);
-
-        $this->recursiveCopy($src, $dst);
-        $this->recursiveUnlink($this->tmp_dir);
-
-        $msg = 'Installed: ' . $package .PHP_EOL;
-        if (isset($this->packages[$package]['msg'])) {
-            $msg .= $this->packages[$package]['msg'] . PHP_EOL;
-        }
-        return $msg;
-    }
-
-    private function downloadFromGithub($package, $version)
-    {
-        $user = $this->packages[$package]['user'];
-        $repos = $this->packages[$package]['repos'];
-        $url = "https://github.com/$user/$repos/archive/$version.zip";
-        $filepath = $this->download($url);
-        $this->unzip($filepath);
-
-        $dir = $this->packages[$package]['dir'];
-        $pre = isset($this->packages[$package]['pre']) ? $this->packages[$package]['pre'] : '';
-        
-        if (is_string($dir)) {
-            $src = realpath(dirname($filepath) . "/$repos-$version/$pre$dir");
-            $dstfolder = empty($this->packages[$package]['dst']) ? 'application' : 'vendor/codeigniter/framework/system';
-            $dst = realpath(__DIR__ . "/../$dstfolder/$dir");
-            return array($src, $dst);
-        }
-        
-        foreach ($dir as $directory) {
-            $src[] = realpath(dirname($filepath) . "/$repos-$version/$pre$directory");
-            @mkdir(__DIR__ . "/../application/$directory");
-            $dst[] = realpath(__DIR__ . "/../application/$directory");
-        }
-        return array($src, $dst);
-    }
-
-    private function downloadFromBitbucket($package, $version)
-    {
-        $user = $this->packages[$package]['user'];
-        $repos = $this->packages[$package]['repos'];
-        // https://bitbucket.org/wiredesignz/codeigniter-modular-extensions-hmvc/get/codeigniter-3.x.zip
-        $url = "https://bitbucket.org/$user/$repos/get/$version.zip";
-        $filepath = $this->download($url);
-        $dirname = $this->unzip($filepath);
-
-        $dir = $this->packages[$package]['dir'];
-        
-        if (is_string($dir)) {
-            $src = realpath(dirname($filepath) . "/$dirname/$dir");
-            $dst = realpath(__DIR__ . "/../application/$dir");
-            return array($src, $dst);
-        }
-        
-        foreach ($dir as $directory) {
-            $src[] = realpath(dirname($filepath) . "/$dirname/$directory");
-            @mkdir(__DIR__ . "/../application/$directory");
-            $dst[] = realpath(__DIR__ . "/../application/$directory");
-        }
-        return array($src, $dst);
-    }
-
-    private function download($url)
-    {
-        $file = file_get_contents($url);
-        if ($file === false) {
-            throw new RuntimeException("Can't download: $url");
-        }
-        echo 'Downloaded: ' . $url . PHP_EOL;
-        
-        $urls = parse_url($url);
-        $filepath = $this->tmp_dir . '/' . basename($urls['path']);
-        file_put_contents($filepath, $file);
-        
-        return $filepath;
-    }
-
-    private function unzip($filepath)
-    {
-        $zip = new ZipArchive();
-        if ($zip->open($filepath) === TRUE) {
-            $tmp = explode('/', $zip->getNameIndex(0));
-            $dirname = $tmp[0];
-            $zip->extractTo($this->tmp_dir . '/');
-            $zip->close();
-        } else {
-            throw new RuntimeException('Failed to unzip: ' . $filepath);
-        }
-        
-        return $dirname;
-    }
-
-    /**
-     * Recursive Copy
-     *
-     * @param string $src
-     * @param string $dst
-     */
-    private function recursiveCopy($src, $dst)
-    {
-        if ($src === false) {
-            return;
-        }
-
-        if (is_array($src)) {
-            foreach ($src as $key => $source) {
-                $this->recursiveCopy($source, $dst[$key]);
-            }
-            
-            return;
-        }
-
-        @mkdir($dst, 0755, TRUE);
-        
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
-        
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName(), 0775, TRUE);
-            } else {
-
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
-                if ($success) {
-                    echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
-                }
-            }
-        }
-    }
-
-    /**
-     * Recursive Unlink
-     *
-     * @param string $dir
-     */
-    private function recursiveUnlink($dir)
-    {
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
-        
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                rmdir($file);
-            } else {
-                unlink($file);
-            }
-        }
-        
-        rmdir($dir);
-    }
-}
diff --git a/bin/my-codeigniter.sh b/bin/my-codeigniter.sh
deleted file mode 100755
index 0c3b38a20..000000000
--- a/bin/my-codeigniter.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-cd `dirname $0`
-cd ..
-
-# Install translations
-php bin/install.php translations develop
-
-# Install Roave Security Advisories
-composer require roave/security-advisories:dev-master
-
-# Install CodeIgniter Simple and Secure Twig
-composer require kenjis/codeigniter-ss-twig:1.0.x@dev
-php vendor/kenjis/codeigniter-ss-twig/install.php
-
-# Install Codeigniter Matches CLI
-php bin/install.php matches-cli master
-
-# Install Cli for CodeIgniter
-composer require kenjis/codeigniter-cli --dev
-php vendor/kenjis/codeigniter-cli/install.php
-
-# Install CI PHPUnit Test
-composer require kenjis/ci-phpunit-test --dev
-php vendor/kenjis/ci-phpunit-test/install.php
-
-# Install CodeIgniter Deployer
-composer require kenjis/codeigniter-deployer:1.0.x@dev --dev
-php vendor/kenjis/codeigniter-deployer/install.php
diff --git a/bin/router.php b/bin/router.php
deleted file mode 100644
index 5b481643a..000000000
--- a/bin/router.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Part of CodeIgniter Composer Installer
- *
- * @author     Kenji Suzuki <https://github.com/kenjis>
- * @license    MIT License
- * @copyright  2015 Kenji Suzuki
- * @link       https://github.com/kenjis/codeigniter-composer-installer
- */
-
-/**
- * Router script for PHP built-in server
- */
-$_SERVER = array_merge($_SERVER, $_ENV);
-
-$file = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['SCRIPT_NAME'];
-//echo $file, PHP_EOL;
-
-if (is_file($file)) {
-    return false;
-}
-
-$_SERVER['SCRIPT_NAME'] = '/index.php';
-$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . '/index.php';
-//echo $_SERVER['SCRIPT_FILENAME'], PHP_EOL;
-
-chdir($_SERVER['DOCUMENT_ROOT']);
-require $_SERVER['SCRIPT_FILENAME'];
diff --git a/bin/server.sh b/bin/server.sh
deleted file mode 100755
index b3d9c4879..000000000
--- a/bin/server.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-## Part of CodeIgniter Composer Installer
-##
-## @author     Kenji Suzuki <https://github.com/kenjis>
-## @license    MIT License
-## @copyright  2015 Kenji Suzuki
-## @link       https://github.com/kenjis/codeigniter-composer-installer
-
-cd `dirname $0`
-cd ..
-
-php -S 127.0.0.1:8000 -t public/ bin/router.php
diff --git a/composer.json b/composer.json
index 6c83a4400..62f9eb9d8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,19 @@
 {
 	"name": "opensourcepos/opensourcepos",
-	"description": "Open Source Point of Sale is a web-based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
+	"description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
 	"license": "MIT",
 	"authors": [
 		{
-		    "name": "jekkos"
+			"name": "jekkos"
 		},
 		{
-		    "name": "FrancescoUK"
+			"name": "FrancescoUK"
+		},
+		{
+			"name": "objecttothis"
+		},
+		{
+			"name": "steveireland"
 		}
 	],
 	"type": "project",
@@ -17,16 +23,20 @@
 	],
 	"homepage": "https://github.com/opensourcepos/opensourcepos",
 	"require": {
-		"php": "^7.2",
-		"codeigniter/framework": "^3.1.11",
-		"dompdf/dompdf": "^2.0.2",
+		"php": "^7.3 || ^8.0",
+		"codeigniter4/framework": "^4.1.3",
+		"dompdf/dompdf": "^2.0.1",
 		"tamtamchik/namecase": "^1.0",
 		"paragonie/random_compat": "^2.0",
-		"vlucas/phpdotenv": "^2.4"
+		"vlucas/phpdotenv": "^2.4",
+		"picqer/php-barcode-generator": "*"
 	},
 	"require-dev": {
-		"mikey179/vfsstream": "1.1.*",
-		"phpunit/phpunit": "7.5.6",
+        "roave/security-advisories": "dev-latest",
+		"codeigniter4/devkit": "v1.1.0",
+		"fakerphp/faker": "^1.9",
+		"mikey179/vfsstream": "^1.6",
+		"phpunit/phpunit": "^9.1",
 		"kenjis/ci-phpunit-test": "0.18.0"
 	}
 }
diff --git a/composer.lock b/composer.lock
index 593d15e77..4e6766402 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,60 +4,93 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "caa4d5dc1f090ae103f2bcf8bc6cfe5a",
+    "content-hash": "1dcc34e700cc778d4c82cc40d2275da2",
     "packages": [
         {
-            "name": "codeigniter/framework",
-            "version": "3.1.11",
+            "name": "codeigniter4/framework",
+            "version": "v4.2.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/bcit-ci/CodeIgniter.git",
-                "reference": "b73eb19aed66190c10c9cad476da7c36c271d6dc"
+                "url": "https://github.com/codeigniter4/framework.git",
+                "reference": "34373dfc580b4a95375f911853060b5a0eea169a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/b73eb19aed66190c10c9cad476da7c36c271d6dc",
-                "reference": "b73eb19aed66190c10c9cad476da7c36c271d6dc",
+                "url": "https://api.github.com/repos/codeigniter4/framework/zipball/34373dfc580b4a95375f911853060b5a0eea169a",
+                "reference": "34373dfc580b4a95375f911853060b5a0eea169a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.7"
+                "ext-curl": "*",
+                "ext-intl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "kint-php/kint": "^4.2",
+                "laminas/laminas-escaper": "^2.9",
+                "php": "^7.4 || ^8.0",
+                "psr/log": "^1.1"
             },
             "require-dev": {
-                "mikey179/vfsstream": "1.1.*",
-                "phpunit/phpunit": "4.* || 5.*"
+                "codeigniter/coding-standard": "^1.5",
+                "fakerphp/faker": "^1.9",
+                "friendsofphp/php-cs-fixer": "~3.12.0",
+                "mikey179/vfsstream": "^1.6",
+                "nexusphp/cs-config": "^3.6",
+                "phpunit/phpunit": "^9.1",
+                "predis/predis": "^1.1 || ^2.0"
             },
             "suggest": {
-                "paragonie/random_compat": "Provides better randomness in PHP 5.x"
+                "ext-dom": "If you use TestResponse",
+                "ext-exif": "If you run Image class tests",
+                "ext-fileinfo": "Improves mime type detection for files",
+                "ext-gd": "If you use Image class GDHandler",
+                "ext-imagick": "If you use Image class ImageMagickHandler",
+                "ext-libxml": "If you use TestResponse",
+                "ext-memcache": "If you use Cache class MemcachedHandler with Memcache",
+                "ext-memcached": "If you use Cache class MemcachedHandler with Memcached",
+                "ext-mysqli": "If you use MySQL",
+                "ext-oci8": "If you use Oracle Database",
+                "ext-pgsql": "If you use PostgreSQL",
+                "ext-readline": "Improves CLI::input() usability",
+                "ext-redis": "If you use Cache class RedisHandler",
+                "ext-simplexml": "If you format XML",
+                "ext-sqlite3": "If you use SQLite3",
+                "ext-sqlsrv": "If you use SQL Server"
             },
             "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "CodeIgniter\\": "system/"
+                },
+                "exclude-from-classmap": [
+                    "**/Database/Migrations/**"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "The CodeIgniter framework",
+            "description": "The CodeIgniter framework v4",
             "homepage": "https://codeigniter.com",
             "support": {
                 "forum": "http://forum.codeigniter.com/",
-                "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
                 "slack": "https://codeigniterchat.slack.com",
-                "source": "https://github.com/bcit-ci/CodeIgniter",
-                "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki"
+                "source": "https://github.com/codeigniter4/CodeIgniter4"
             },
-            "time": "2019-09-19T12:08:45+00:00"
+            "time": "2022-10-31T00:46:08+00:00"
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.3",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85"
+                "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85",
-                "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085",
+                "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085",
                 "shasum": ""
             },
             "require": {
@@ -104,9 +137,136 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.3"
+                "source": "https://github.com/dompdf/dompdf/tree/v2.0.1"
             },
-            "time": "2023-02-07T12:51:48+00:00"
+            "time": "2022-09-22T13:43:41+00:00"
+        },
+        {
+            "name": "kint-php/kint",
+            "version": "4.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kint-php/kint.git",
+                "reference": "7601bfd95ccc50a1b903c2764b31d00919e8edd9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kint-php/kint/zipball/7601bfd95ccc50a1b903c2764b31d00919e8edd9",
+                "reference": "7601bfd95ccc50a1b903c2764b31d00919e8edd9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "phpspec/prophecy-phpunit": "^2",
+                "phpunit/phpunit": "^9.0",
+                "seld/phar-utils": "^1.0",
+                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
+                "vimeo/psalm": "^4.0"
+            },
+            "suggest": {
+                "kint-php/kint-helpers": "Provides extra helper functions",
+                "kint-php/kint-twig": "Provides d() and s() functions in twig templates"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "init.php"
+                ],
+                "psr-4": {
+                    "Kint\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonathan Vollebregt",
+                    "homepage": "https://github.com/jnvsor"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/kint-php/kint/graphs/contributors"
+                }
+            ],
+            "description": "Kint - debugging tool for PHP developers",
+            "homepage": "https://kint-php.github.io/kint/",
+            "keywords": [
+                "debug",
+                "kint",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/kint-php/kint/issues",
+                "source": "https://github.com/kint-php/kint/tree/4.2.3"
+            },
+            "time": "2022-10-01T20:16:33+00:00"
+        },
+        {
+            "name": "laminas/laminas-escaper",
+            "version": "2.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-escaper.git",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-mbstring": "*",
+                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+            },
+            "conflict": {
+                "zendframework/zend-escaper": "*"
+            },
+            "require-dev": {
+                "infection/infection": "^0.26.6",
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "maglnet/composer-require-checker": "^3.8.0",
+                "phpunit/phpunit": "^9.5.18",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "vimeo/psalm": "^4.22.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Escaper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "escaper",
+                "laminas"
+            ],
+            "support": {
+                "chat": "https://laminas.dev/chat",
+                "docs": "https://docs.laminas.dev/laminas-escaper/",
+                "forum": "https://discourse.laminas.dev",
+                "issues": "https://github.com/laminas/laminas-escaper/issues",
+                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
+                "source": "https://github.com/laminas/laminas-escaper"
+            },
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2022-10-10T10:11:09+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -179,23 +339,23 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.20",
+            "version": "v2.0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a"
+                "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
-                "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/96c132c7f2f7bc3230723b66e89f8f150b29d5ae",
+                "reference": "96c132c7f2f7bc3230723b66e89f8f150b29d5ae",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
+                "phpunit/phpunit": "*"
             },
             "suggest": {
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
@@ -229,7 +389,7 @@
                 "issues": "https://github.com/paragonie/random_compat/issues",
                 "source": "https://github.com/paragonie/random_compat"
             },
-            "time": "2021-04-17T09:33:01+00:00"
+            "time": "2022-02-16T17:07:03+00:00"
         },
         {
             "name": "phenx/php-font-lib",
@@ -321,6 +481,142 @@
             },
             "time": "2022-09-06T12:16:56+00:00"
         },
+        {
+            "name": "picqer/php-barcode-generator",
+            "version": "v2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/picqer/php-barcode-generator.git",
+                "reference": "b98f110cc5a79f723688fb17fd90b9325300d844"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/picqer/php-barcode-generator/zipball/b98f110cc5a79f723688fb17fd90b9325300d844",
+                "reference": "b98f110cc5a79f723688fb17fd90b9325300d844",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "suggest": {
+                "ext-bcmath": "Barcode IMB (Intelligent Mail Barcode) needs bcmath extension",
+                "ext-gd": "For JPG and PNG generators, GD or Imagick is required",
+                "ext-imagick": "For JPG and PNG generators, GD or Imagick is required"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Picqer\\Barcode\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Nicola Asuni",
+                    "email": "info@tecnick.com",
+                    "homepage": "http://nicolaasuni.tecnick.com"
+                },
+                {
+                    "name": "Casper Bakker",
+                    "email": "info@picqer.com",
+                    "homepage": "https://picqer.com"
+                }
+            ],
+            "description": "An easy to use, non-bloated, barcode generator in PHP. Creates SVG, PNG, JPG and HTML images from the most used 1D barcode standards.",
+            "homepage": "https://github.com/picqer/php-barcode-generator",
+            "keywords": [
+                "CODABAR",
+                "Code11",
+                "Code93",
+                "EAN13",
+                "KIX",
+                "KIXCODE",
+                "MSI",
+                "POSTNET",
+                "Pharma",
+                "Standard 2 of 5",
+                "barcode",
+                "barcode generator",
+                "code128",
+                "code39",
+                "ean",
+                "html",
+                "jpeg",
+                "jpg",
+                "php",
+                "png",
+                "svg",
+                "upc"
+            ],
+            "support": {
+                "issues": "https://github.com/picqer/php-barcode-generator/issues",
+                "source": "https://github.com/picqer/php-barcode-generator/tree/v2.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/casperbakker",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-07-01T08:27:26+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
+        },
         {
             "name": "sabberworm/php-css-parser",
             "version": "8.4.0",
@@ -376,28 +672,31 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -405,12 +704,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -435,7 +734,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -451,7 +750,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "tamtamchik/namecase",
@@ -483,12 +782,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Tamtamchik\\NameCase\\": "src"
-                },
                 "files": [
                     "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Tamtamchik\\NameCase\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -518,16 +817,16 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.8",
+            "version": "v2.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "f1e2a35e53abe9322f0ab9ada689967e30055d40"
+                "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/f1e2a35e53abe9322f0ab9ada689967e30055d40",
-                "reference": "f1e2a35e53abe9322f0ab9ada689967e30055d40",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141",
+                "reference": "2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141",
                 "shasum": ""
             },
             "require": {
@@ -561,11 +860,13 @@
             "authors": [
                 {
                     "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk"
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
                 },
                 {
                     "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com"
+                    "email": "vance@vancelucas.com",
+                    "homepage": "https://github.com/vlucas"
                 }
             ],
             "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
@@ -576,7 +877,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.8"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v2.6.9"
             },
             "funding": [
                 {
@@ -588,35 +889,720 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-02T19:02:17+00:00"
+            "time": "2021-12-12T22:59:22+00:00"
         }
     ],
     "packages-dev": [
         {
-            "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "name": "amphp/amp",
+            "version": "v2.6.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "url": "https://github.com/amphp/amp.git",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1",
+                "ext-json": "*",
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "psalm/phar": "^3.11@dev",
+                "react/promise": "^2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/functions.php",
+                    "lib/Internal/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A non-blocking concurrency framework for PHP applications.",
+            "homepage": "https://amphp.org/amp",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "awaitable",
+                "concurrency",
+                "event",
+                "event-loop",
+                "future",
+                "non-blocking",
+                "promise"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/amphp",
+                "issues": "https://github.com/amphp/amp/issues",
+                "source": "https://github.com/amphp/amp/tree/v2.6.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-20T17:52:18+00:00"
+        },
+        {
+            "name": "amphp/byte-stream",
+            "version": "v1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/byte-stream.git",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1.4",
+                "friendsofphp/php-cs-fixer": "^2.3",
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^6 || ^7 || ^8",
+                "psalm/phar": "^3.11.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\ByteStream\\": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "A stream abstraction to make working with non-blocking I/O simple.",
+            "homepage": "http://amphp.org/byte-stream",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "io",
+                "non-blocking",
+                "stream"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/amphp",
+                "issues": "https://github.com/amphp/byte-stream/issues",
+                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-30T17:13:30+00:00"
+        },
+        {
+            "name": "codeigniter/coding-standard",
+            "version": "v1.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CodeIgniter/coding-standard.git",
+                "reference": "644b3edd1dc5ad21849c4aded4a3c6e39d0e2eaf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CodeIgniter/coding-standard/zipball/644b3edd1dc5ad21849c4aded4a3c6e39d0e2eaf",
+                "reference": "644b3edd1dc5ad21849c4aded4a3c6e39d0e2eaf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "friendsofphp/php-cs-fixer": "^3.12",
+                "nexusphp/cs-config": "^3.6",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "nexusphp/tachycardia": "^1.3",
+                "phpstan/phpstan": "^1.0",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "CodeIgniter\\CodingStandard\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Paul E. Balandan, CPA",
+                    "email": "paulbalandan@gmail.com"
+                }
+            ],
+            "description": "Official Coding Standards for CodeIgniter based on PHP CS Fixer",
+            "keywords": [
+                "phpcs",
+                "static analysis"
+            ],
+            "support": {
+                "forum": "http://forum.codeigniter.com/",
+                "issues": "https://github.com/CodeIgniter/coding-standard/issues",
+                "slack": "https://codeigniterchat.slack.com",
+                "source": "https://github.com/CodeIgniter/coding-standard"
+            },
+            "time": "2022-10-30T12:18:04+00:00"
+        },
+        {
+            "name": "codeigniter4/devkit",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/codeigniter4/devkit.git",
+                "reference": "c0f4c537a4db36f97a2aea85551c5cd6e00caca4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/codeigniter4/devkit/zipball/c0f4c537a4db36f97a2aea85551c5cd6e00caca4",
+                "reference": "c0f4c537a4db36f97a2aea85551c5cd6e00caca4",
+                "shasum": ""
+            },
+            "require": {
+                "codeigniter/coding-standard": "^1.1",
+                "fakerphp/faker": "^1.9",
+                "mikey179/vfsstream": "^1.6",
+                "nexusphp/cs-config": "^3.1",
+                "nexusphp/tachycardia": "^1.0",
+                "php": "^7.4 || ^8.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.3",
+                "roave/security-advisories": "dev-latest",
+                "vimeo/psalm": "^4.22"
+            },
+            "require-dev": {
+                "codeigniter4/framework": "^4.1",
+                "icanhazstring/composer-unused": "^0.8.2",
+                "rector/rector": "0.14.0"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Gatner",
+                    "email": "mgatner@tattersoftware.com",
+                    "homepage": "https://tattersoftware.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Development toolkit for CodeIgniter libraries and projects",
+            "homepage": "https://github.com/codeigniter4/devkit",
+            "keywords": [
+                "codeigniter",
+                "codeigniter4",
+                "development",
+                "devkit",
+                "toolkit",
+                "tools"
+            ],
+            "support": {
+                "issues": "https://github.com/codeigniter4/devkit/issues",
+                "source": "https://github.com/codeigniter4/devkit/tree/v1.1.0"
+            },
+            "time": "2022-08-27T18:52:21+00:00"
+        },
+        {
+            "name": "composer/package-versions-deprecated",
+            "version": "1.11.99.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/package-versions-deprecated.git",
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d",
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.1.0 || ^2.0",
+                "php": "^7 || ^8"
+            },
+            "replace": {
+                "ocramius/package-versions": "1.11.99"
+            },
+            "require-dev": {
+                "composer/composer": "^1.9.3 || ^2.0@dev",
+                "ext-zip": "^1.13",
+                "phpunit/phpunit": "^6.5 || ^7"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PackageVersions\\Installer",
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PackageVersions\\": "src/PackageVersions"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+            "support": {
+                "issues": "https://github.com/composer/package-versions-deprecated/issues",
+                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-17T14:14:24+00:00"
+        },
+        {
+            "name": "composer/pcre",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-25T20:21:48+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.4",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T19:23:25+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-25T21:32:43+00:00"
+        },
+        {
+            "name": "dnoegel/php-xdg-base-dir",
+            "version": "v0.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "XdgBaseDir\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "implementation of xdg base directory specification for php",
+            "support": {
+                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+            },
+            "time": "2019-12-04T15:06:13+00:00"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "1.13.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
+                "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "ext-tokenizer": "*",
+                "php": "^7.1 || ^8.0",
+                "psr/cache": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "doctrine/cache": "^1.11 || ^2.0",
+                "doctrine/coding-standard": "^6.0 || ^8.1",
+                "phpstan/phpstan": "^1.4.10 || ^1.8.0",
+                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
+                "symfony/cache": "^4.4 || ^5.2",
+                "vimeo/psalm": "^4.10"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/annotations/issues",
+                "source": "https://github.com/doctrine/annotations/tree/1.13.3"
+            },
+            "time": "2022-07-02T10:48:51+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -643,7 +1629,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
             },
             "funding": [
                 {
@@ -659,7 +1645,340 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-28T11:07:21+00:00"
+        },
+        {
+            "name": "fakerphp/faker",
+            "version": "v1.20.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FakerPHP/Faker.git",
+                "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b",
+                "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "conflict": {
+                "fzaninotto/faker": "*"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "doctrine/persistence": "^1.3 || ^2.0",
+                "ext-intl": "*",
+                "symfony/phpunit-bridge": "^4.4 || ^5.2"
+            },
+            "suggest": {
+                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
+                "ext-curl": "Required by Faker\\Provider\\Image to download images.",
+                "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
+                "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
+                "ext-mbstring": "Required for multibyte Unicode string functionality."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "v1.20-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "support": {
+                "issues": "https://github.com/FakerPHP/Faker/issues",
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0"
+            },
+            "time": "2022-07-20T13:12:54+00:00"
+        },
+        {
+            "name": "felixfbecker/advanced-json-rpc",
+            "version": "v3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "shasum": ""
+            },
+            "require": {
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "php": "^7.1 || ^8.0",
+                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AdvancedJsonRpc\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                }
+            ],
+            "description": "A more advanced JSONRPC implementation",
+            "support": {
+                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
+                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
+            },
+            "time": "2021-06-11T22:34:44+00:00"
+        },
+        {
+            "name": "felixfbecker/language-server-protocol",
+            "version": "v1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "*",
+                "squizlabs/php_codesniffer": "^3.1",
+                "vimeo/psalm": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "LanguageServerProtocol\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                }
+            ],
+            "description": "PHP classes for the Language Server Protocol",
+            "keywords": [
+                "language",
+                "microsoft",
+                "php",
+                "server"
+            ],
+            "support": {
+                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
+            },
+            "time": "2022-03-02T22:36:06+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a6232229a8309e8811dc751c28b91cb34b2943e1",
+                "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^3.2",
+                "composer/xdebug-handler": "^3.0.3",
+                "doctrine/annotations": "^1.13",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0",
+                "sebastian/diff": "^4.0",
+                "symfony/console": "^5.4 || ^6.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0",
+                "symfony/filesystem": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/options-resolver": "^5.4 || ^6.0",
+                "symfony/polyfill-mbstring": "^1.23",
+                "symfony/polyfill-php80": "^1.25",
+                "symfony/polyfill-php81": "^1.25",
+                "symfony/process": "^5.4 || ^6.0",
+                "symfony/stopwatch": "^5.4 || ^6.0"
+            },
+            "require-dev": {
+                "justinrainbow/json-schema": "^5.2",
+                "keradus/cli-executor": "^2.0",
+                "mikey179/vfsstream": "^1.6.10",
+                "php-coveralls/php-coveralls": "^2.5.2",
+                "php-cs-fixer/accessible-object": "^1.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
+                "phpspec/prophecy": "^1.15",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "phpunitgoodpractices/polyfill": "^1.6",
+                "phpunitgoodpractices/traits": "^1.9.2",
+                "symfony/phpunit-bridge": "^6.0",
+                "symfony/yaml": "^5.4 || ^6.0"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "support": {
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-10-31T19:28:50+00:00"
         },
         {
             "name": "kenjis/ci-phpunit-test",
@@ -713,71 +2032,89 @@
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.1.0",
+            "version": "v1.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e"
+                "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
-                "reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
+                "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5|^5.0"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
-                    "org\\bovigo\\vfs": "src/main/php"
+                    "org\\bovigo\\vfs\\": "src/main/php"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
+            "authors": [
+                {
+                    "name": "Frank Kleine",
+                    "homepage": "http://frankkleine.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Virtual file system to mock the real file system in unit tests.",
             "homepage": "http://vfs.bovigo.org/",
             "support": {
                 "issues": "https://github.com/bovigo/vfsStream/issues",
-                "source": "https://github.com/bovigo/vfsStream/tree/v1.1.0"
+                "source": "https://github.com/bovigo/vfsStream/tree/master",
+                "wiki": "https://github.com/bovigo/vfsStream/wiki"
             },
-            "time": "2012-08-25T12:49:29+00:00"
+            "time": "2022-02-23T02:02:42+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -793,7 +2130,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -801,20 +2138,200 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
-            "name": "nikic/php-parser",
-            "version": "v4.13.0",
+            "name": "netresearch/jsonmapper",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
+                "url": "https://github.com/cweiske/jsonmapper.git",
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+                "squizlabs/php_codesniffer": "~3.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonMapper": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Weiske",
+                    "email": "cweiske@cweiske.de",
+                    "homepage": "http://github.com/cweiske/jsonmapper/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Map nested JSON structures onto PHP classes",
+            "support": {
+                "email": "cweiske@cweiske.de",
+                "issues": "https://github.com/cweiske/jsonmapper/issues",
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0"
+            },
+            "time": "2020-12-01T19:48:11+00:00"
+        },
+        {
+            "name": "nexusphp/cs-config",
+            "version": "v3.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/NexusPHP/cs-config.git",
+                "reference": "ed3070c3335986da842dea1222835946c19b2894"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/NexusPHP/cs-config/zipball/ed3070c3335986da842dea1222835946c19b2894",
+                "reference": "ed3070c3335986da842dea1222835946c19b2894",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "friendsofphp/php-cs-fixer": "^3.12",
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "liaison/cs-config": "*"
+            },
+            "require-dev": {
+                "nexusphp/tachycardia": "^1.3",
+                "phpstan/phpstan": "^1.8",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Nexus\\CsConfig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Paul E. Balandan, CPA",
+                    "email": "paulbalandan@gmail.com"
+                }
+            ],
+            "description": "A factory for custom rulesets for PHP CS Fixer.",
+            "support": {
+                "issues": "https://github.com/NexusPHP/cs-config/issues",
+                "slack": "https://nexusphp.slack.com",
+                "source": "https://github.com/NexusPHP/cs-config.git"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/paulbalandan",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/paulbalandan",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-10-15T16:12:57+00:00"
+        },
+        {
+            "name": "nexusphp/tachycardia",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/NexusPHP/tachycardia.git",
+                "reference": "a9a0335e36fa297d6df0174ef090890618bce3fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/NexusPHP/tachycardia/zipball/a9a0335e36fa297d6df0174ef090890618bce3fe",
+                "reference": "a9a0335e36fa297d6df0174ef090890618bce3fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0",
+                "phpunit/php-timer": "^5.0",
+                "phpunit/phpunit": "^9.5"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "nexusphp/cs-config": "^3.2",
+                "phpstan/phpstan": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Nexus\\PHPUnit\\Extension\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Paul E. Balandan, CPA",
+                    "email": "paulbalandan@gmail.com"
+                }
+            ],
+            "description": "Detects slow running tests in your PHPUnit-driven test suites.",
+            "support": {
+                "issues": "https://github.com/NexusPHP/tachycardia/issues",
+                "slack": "https://nexusphp.slack.com",
+                "source": "https://github.com/NexusPHP/tachycardia.git"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/paulbalandan",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/paulbalandan",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-10-14T05:24:06+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.15.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -855,34 +2372,88 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
             },
-            "time": "2021-09-20T12:20:58+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
-            "name": "phar-io/manifest",
-            "version": "1.0.3",
+            "name": "openlss/lib-array2xml",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+                "url": "https://github.com/nullivex/lib-array2xml.git",
+                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "LSS": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Bryan Tong",
+                    "email": "bryan@nullivex.com",
+                    "homepage": "https://www.nullivex.com"
+                },
+                {
+                    "name": "Tony Butler",
+                    "email": "spudz76@gmail.com",
+                    "homepage": "https://www.nullivex.com"
+                }
+            ],
+            "description": "Array2XML conversion library credit to lalit.org",
+            "homepage": "https://www.nullivex.com",
+            "keywords": [
+                "array",
+                "array conversion",
+                "xml",
+                "xml conversion"
+            ],
+            "support": {
+                "issues": "https://github.com/nullivex/lib-array2xml/issues",
+                "source": "https://github.com/nullivex/lib-array2xml/tree/master"
+            },
+            "time": "2019-03-29T20:06:56+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -914,26 +2485,26 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2018-07-08T19:23:20+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "2.0.1",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -965,9 +2536,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/master"
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2018-07-08T19:19:57+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -1081,25 +2652,30 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.5.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
             },
             "type": "library",
             "extra": {
@@ -1125,113 +2701,255 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
             },
-            "time": "2021-10-02T14:08:47+00:00"
+            "time": "2022-10-14T12:47:21+00:00"
         },
         {
-            "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "name": "phpstan/extension-installer",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "url": "https://github.com/phpstan/extension-installer.git",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+                "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
+                "composer-plugin-api": "^2.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.8.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
+                "composer/composer": "^2.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
             },
-            "type": "library",
+            "type": "composer-plugin",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
+                "class": "PHPStan\\ExtensionInstaller\\Plugin"
             },
             "autoload": {
                 "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
+                    "PHPStan\\ExtensionInstaller\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
+            "description": "Composer plugin for automatic installation of PHPStan extensions",
             "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "issues": "https://github.com/phpstan/extension-installer/issues",
+                "source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2022-10-17T12:59:16+00:00"
         },
         {
-            "name": "phpunit/php-code-coverage",
-            "version": "6.1.4",
+            "name": "phpstan/phpstan",
+            "version": "1.8.11",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "46e223dd68a620da18855c23046ddb00940b4014"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014",
+                "reference": "46e223dd68a620da18855c23046ddb00940b4014",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.11"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-24T15:45:13+00:00"
+        },
+        {
+            "name": "phpstan/phpstan-deprecation-rules",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
+                "reference": "e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682",
+                "reference": "e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "phpstan/phpstan": "^1.0"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
+                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.0.0"
+            },
+            "time": "2021-09-23T11:02:21+00:00"
+        },
+        {
+            "name": "phpstan/phpstan-phpunit",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan-phpunit.git",
+                "reference": "dea1f87344c6964c607d9076dee42d891f3923f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/dea1f87344c6964c607d9076dee42d891f3923f0",
+                "reference": "dea1f87344c6964c607d9076dee42d891f3923f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpstan": "^1.8.11"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<7.0"
+            },
+            "require-dev": {
+                "nikic/php-parser": "^4.13.0",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon",
+                        "rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPUnit extensions and rules for PHPStan",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.2.2"
+            },
+            "time": "2022-10-28T10:23:07+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^2.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1 || ^4.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
+                "nikic/php-parser": "^4.14",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.6.0"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.1-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -1259,34 +2977,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18"
             },
-            "time": "2018-10-31T16:06:48+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-10-27T13:35:33+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.4",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05",
-                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -1313,7 +3037,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -1321,26 +3045,97 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-19T06:46:01+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1364,34 +3159,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1417,7 +3218,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -1425,117 +3226,54 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "3.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "abandoned": true,
-            "time": "2021-07-26T12:15:06+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.6",
+            "version": "9.5.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9"
+                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
-                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
+                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.1",
+                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.2",
-                "phar-io/version": "^2.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.7",
-                "phpunit/php-file-iterator": "^2.0.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.0",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^4.0",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpunit/phpunit-mock-objects": "*"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.8",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.5",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.2",
+                "sebastian/version": "^3.0.2"
             },
             "suggest": {
                 "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -1543,10 +3281,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.5-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -1571,29 +3312,40 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
             },
-            "time": "2019-02-18T09:24:50+00:00"
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-28T06:00:21+00:00"
         },
         {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "name": "psr/cache",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
@@ -1601,6 +3353,805 @@
                     "dev-master": "1.0.x-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
+            "time": "2016-08-06T20:24:11+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "roave/security-advisories",
+            "version": "dev-latest",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Roave/SecurityAdvisories.git",
+                "reference": "6ca121cb3bf9f5d33016bfd4a175b0732cf174c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6ca121cb3bf9f5d33016bfd4a175b0732cf174c4",
+                "reference": "6ca121cb3bf9f5d33016bfd4a175b0732cf174c4",
+                "shasum": ""
+            },
+            "conflict": {
+                "3f/pygmentize": "<1.2",
+                "admidio/admidio": "<4.1.9",
+                "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
+                "aheinze/cockpit": "<=2.2.1",
+                "akaunting/akaunting": "<2.1.13",
+                "alextselegidis/easyappointments": "<=1.4.3",
+                "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1",
+                "amazing/media2click": ">=1,<1.3.3",
+                "amphp/artax": "<1.0.6|>=2,<2.0.6",
+                "amphp/http": "<1.0.1",
+                "amphp/http-client": ">=4,<4.4",
+                "anchorcms/anchor-cms": "<=0.12.7",
+                "andreapollastri/cipi": "<=3.1.15",
+                "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6",
+                "appwrite/server-ce": "<0.11.1|>=0.12,<0.12.2",
+                "area17/twill": "<1.2.5|>=2,<2.5.3",
+                "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
+                "awesome-support/awesome-support": "<=6.0.7",
+                "aws/aws-sdk-php": ">=3,<3.2.1",
+                "badaso/core": "<2.6.1",
+                "bagisto/bagisto": "<0.1.5",
+                "barrelstrength/sprout-base-email": "<1.2.7",
+                "barrelstrength/sprout-forms": "<3.9",
+                "barryvdh/laravel-translation-manager": "<0.6.2",
+                "baserproject/basercms": "<4.5.4",
+                "billz/raspap-webgui": "<=2.6.6",
+                "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
+                "bmarshall511/wordpress_zero_spam": "<5.2.13",
+                "bolt/bolt": "<3.7.2",
+                "bolt/core": "<=4.2",
+                "bottelet/flarepoint": "<2.2.1",
+                "brightlocal/phpwhois": "<=4.2.5",
+                "brotkrueml/codehighlight": "<2.7",
+                "brotkrueml/schema": "<1.13.1|>=2,<2.5.1",
+                "brotkrueml/typo3-matomo-integration": "<1.3.2",
+                "buddypress/buddypress": "<7.2.1",
+                "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
+                "bytefury/crater": "<6.0.2",
+                "cachethq/cachet": "<2.5.1",
+                "cakephp/cakephp": "<3.10.3|>=4,<4.0.6",
+                "cardgate/magento2": "<2.0.33",
+                "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
+                "cartalyst/sentry": "<=2.1.6",
+                "catfan/medoo": "<1.7.5",
+                "centreon/centreon": "<21.4.16|>=21.10,<21.10.8|>=22,<22.4.1",
+                "cesnet/simplesamlphp-module-proxystatistics": "<3.1",
+                "codeception/codeception": "<3.1.3|>=4,<4.1.22",
+                "codeigniter/framework": "<=3.0.6",
+                "codeigniter4/framework": "<4.2.7",
+                "codeigniter4/shield": "= 1.0.0-beta",
+                "codiad/codiad": "<=2.8.4",
+                "composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5",
+                "concrete5/concrete5": "<9",
+                "concrete5/core": "<8.5.8|>=9,<9.1",
+                "contao-components/mediaelement": ">=2.14.2,<2.21.1",
+                "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3",
+                "contao/core": ">=2,<3.5.39",
+                "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0",
+                "contao/listing-bundle": ">=4,<4.4.8",
+                "contao/managed-edition": "<=1.5",
+                "craftcms/cms": "<3.7.55.2|>= 4.0.0-RC1, < 4.2.1",
+                "croogo/croogo": "<3.0.7",
+                "cuyz/valinor": "<0.12",
+                "czproject/git-php": "<4.0.3",
+                "darylldoyle/safe-svg": "<1.9.10",
+                "datadog/dd-trace": ">=0.30,<0.30.2",
+                "david-garcia/phpwhois": "<=4.3.1",
+                "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1",
+                "directmailteam/direct-mail": "<5.2.4",
+                "doctrine/annotations": ">=1,<1.2.7",
+                "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2",
+                "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1",
+                "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4",
+                "doctrine/doctrine-bundle": "<1.5.2",
+                "doctrine/doctrine-module": "<=0.7.1",
+                "doctrine/mongodb-odm": ">=1,<1.0.2",
+                "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
+                "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
+                "dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2",
+                "dompdf/dompdf": "<2.0.1",
+                "drupal/core": ">=7,<7.91|>=8,<9.3.19|>=9.4,<9.4.3",
+                "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
+                "dweeves/magmi": "<=0.7.24",
+                "ecodev/newsletter": "<=4",
+                "ectouch/ectouch": "<=2.7.2",
+                "elefant/cms": "<1.3.13",
+                "elgg/elgg": "<3.3.24|>=4,<4.0.5",
+                "endroid/qr-code-bundle": "<3.4.2",
+                "enshrined/svg-sanitize": "<0.15",
+                "erusev/parsedown": "<1.7.2",
+                "ether/logs": "<3.0.4",
+                "exceedone/exment": "<4.4.3|>=5,<5.0.3",
+                "exceedone/laravel-admin": "= 3.0.0|<2.2.3",
+                "ezsystems/demobundle": ">=5.4,<5.4.6.1",
+                "ezsystems/ez-support-tools": ">=2.2,<2.2.3",
+                "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1",
+                "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1",
+                "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24",
+                "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.27",
+                "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1",
+                "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<1.3.19",
+                "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8",
+                "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7",
+                "ezsystems/ezplatform-user": ">=1,<1.0.1",
+                "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.29",
+                "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1",
+                "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
+                "ezsystems/repository-forms": ">=2.3,<2.3.2.1",
+                "ezyang/htmlpurifier": "<4.1.1",
+                "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2",
+                "facturascripts/facturascripts": "<=2022.8",
+                "feehi/cms": "<=2.1.1",
+                "feehi/feehicms": "<=2.0.1.1",
+                "fenom/fenom": "<=2.12.1",
+                "filegator/filegator": "<7.8",
+                "firebase/php-jwt": "<2",
+                "flarum/core": ">=1,<=1.0.1",
+                "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15",
+                "flarum/tags": "<=0.1-beta.13",
+                "fluidtypo3/vhs": "<5.1.1",
+                "fof/byobu": ">=0.3-beta.2,<1.1.7",
+                "fof/upload": "<1.2.3",
+                "fooman/tcpdf": "<6.2.22",
+                "forkcms/forkcms": "<5.11.1",
+                "fossar/tcpdf-parser": "<6.2.22",
+                "francoisjacquet/rosariosis": "<10.1",
+                "friendsofsymfony/oauth2-php": "<1.3",
+                "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
+                "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
+                "friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
+                "froala/wysiwyg-editor": "<3.2.7",
+                "froxlor/froxlor": "<0.10.38",
+                "fuel/core": "<1.8.1",
+                "gaoming13/wechat-php-sdk": "<=1.10.2",
+                "genix/cms": "<=1.1.11",
+                "getgrav/grav": "<1.7.34",
+                "getkirby/cms": "= 3.8.0|<3.5.8.2|>=3.6,<3.6.6.2|>=3.7,<3.7.5.1",
+                "getkirby/panel": "<2.5.14",
+                "getkirby/starterkit": "<=3.7.0.2",
+                "gilacms/gila": "<=1.11.4",
+                "globalpayments/php-sdk": "<2",
+                "google/protobuf": "<3.15",
+                "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
+                "gree/jose": "<=2.2",
+                "gregwar/rst": "<1.0.3",
+                "grumpydictator/firefly-iii": "<5.6.5",
+                "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
+                "guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1",
+                "helloxz/imgurl": "= 2.31|<=2.31",
+                "hillelcoren/invoice-ninja": "<5.3.35",
+                "hjue/justwriting": "<=1",
+                "hov/jobfair": "<1.0.13|>=2,<2.0.2",
+                "hyn/multi-tenant": ">=5.6,<5.7.2",
+                "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4",
+                "ibexa/post-install": "<=1.0.4",
+                "icecoder/icecoder": "<=8.1",
+                "idno/known": "<=1.3.1",
+                "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
+                "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
+                "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
+                "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
+                "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
+                "impresscms/impresscms": "<=1.4.3",
+                "in2code/femanager": "<5.5.1|>=6,<6.3.1",
+                "in2code/lux": "<17.6.1|>=18,<24.0.2",
+                "intelliants/subrion": "<=4.2.1",
+                "islandora/islandora": ">=2,<2.4.1",
+                "ivankristianto/phpwhois": "<=4.3",
+                "jackalope/jackalope-doctrine-dbal": "<1.7.4",
+                "james-heinrich/getid3": "<1.9.21",
+                "joomla/archive": "<1.1.12|>=2,<2.0.1",
+                "joomla/filesystem": "<1.6.2|>=2,<2.0.1",
+                "joomla/filter": "<1.4.4|>=2,<2.0.1",
+                "joomla/input": ">=2,<2.0.2",
+                "joomla/session": "<1.3.1",
+                "joyqi/hyper-down": "<=2.4.27",
+                "jsdecena/laracom": "<2.0.9",
+                "jsmitty12/phpwhois": "<5.1",
+                "kazist/phpwhois": "<=4.2.6",
+                "kevinpapst/kimai2": "<1.16.7",
+                "kitodo/presentation": "<3.1.2",
+                "klaviyo/magento2-extension": ">=1,<3",
+                "krayin/laravel-crm": "<1.2.2",
+                "kreait/firebase-php": ">=3.2,<3.8.1",
+                "la-haute-societe/tcpdf": "<6.2.22",
+                "laminas/laminas-diactoros": "<2.11.1",
+                "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
+                "laminas/laminas-http": "<2.14.2",
+                "laravel/fortify": "<1.11.1",
+                "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
+                "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
+                "latte/latte": "<2.10.8",
+                "lavalite/cms": "<=5.8",
+                "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5",
+                "league/commonmark": "<0.18.3",
+                "league/flysystem": "<1.1.4|>=2,<2.1.1",
+                "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
+                "librenms/librenms": "<=22.8",
+                "limesurvey/limesurvey": "<3.27.19",
+                "livehelperchat/livehelperchat": "<=3.91",
+                "livewire/livewire": ">2.2.4,<2.2.6",
+                "lms/routes": "<2.1.1",
+                "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
+                "luyadev/yii-helpers": "<1.2.1",
+                "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3",
+                "magento/magento1ce": "<1.9.4.3",
+                "magento/magento1ee": ">=1,<1.14.4.3",
+                "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2",
+                "marcwillmann/turn": "<0.3.3",
+                "matyhtf/framework": "<3.0.6",
+                "mautic/core": "<4.3|= 2.13.1",
+                "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35",
+                "melisplatform/melis-asset-manager": "<5.0.1",
+                "melisplatform/melis-cms": "<5.0.1",
+                "melisplatform/melis-front": "<5.0.1",
+                "mezzio/mezzio-swoole": "<3.7|>=4,<4.3",
+                "microweber/microweber": "<=1.3.1",
+                "miniorange/miniorange-saml": "<1.4.3",
+                "mittwald/typo3_forum": "<1.2.1",
+                "modx/revolution": "<= 2.8.3-pl|<2.8",
+                "mojo42/jirafeau": "<4.4",
+                "monolog/monolog": ">=1.8,<1.12",
+                "moodle/moodle": "<4.0.1",
+                "mustache/mustache": ">=2,<2.14.1",
+                "namshi/jose": "<2.2",
+                "neoan3-apps/template": "<1.1.1",
+                "neorazorx/facturascripts": "<2022.4",
+                "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
+                "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3",
+                "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
+                "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
+                "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
+                "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
+                "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
+                "nilsteampassnet/teampass": "<=2.1.27.36",
+                "notrinos/notrinos-erp": "<=0.7",
+                "noumo/easyii": "<=0.9",
+                "nukeviet/nukeviet": "<4.5.2",
+                "nystudio107/craft-seomatic": "<3.4.12",
+                "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
+                "october/backend": "<1.1.2",
+                "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469",
+                "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12",
+                "october/rain": "<1.0.472|>=1.1,<1.1.2",
+                "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.0.66",
+                "onelogin/php-saml": "<2.10.4",
+                "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5",
+                "open-web-analytics/open-web-analytics": "<1.7.4",
+                "opencart/opencart": "<=3.0.3.2",
+                "openid/php-openid": "<2.3",
+                "openmage/magento-lts": "<19.4.15|>=20,<20.0.13",
+                "orchid/platform": ">=9,<9.4.4",
+                "oro/commerce": ">=4.1,<5.0.6",
+                "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
+                "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8",
+                "packbackbooks/lti-1-3-php-library": "<5",
+                "padraic/humbug_get_contents": "<1.1.2",
+                "pagarme/pagarme-php": ">=0,<3",
+                "pagekit/pagekit": "<=1.0.18",
+                "paragonie/random_compat": "<2",
+                "passbolt/passbolt_api": "<2.11",
+                "paypal/merchant-sdk-php": "<3.12",
+                "pear/archive_tar": "<1.4.14",
+                "pear/crypt_gpg": "<1.6.7",
+                "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1",
+                "personnummer/personnummer": "<3.0.2",
+                "phanan/koel": "<5.1.4",
+                "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
+                "phpmailer/phpmailer": "<6.5",
+                "phpmussel/phpmussel": ">=1,<1.6",
+                "phpmyadmin/phpmyadmin": "<5.1.3",
+                "phpmyfaq/phpmyfaq": "<=3.1.7",
+                "phpoffice/phpexcel": "<1.8",
+                "phpoffice/phpspreadsheet": "<1.16",
+                "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7",
+                "phpservermon/phpservermon": "<=3.5.2",
+                "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3",
+                "phpwhois/phpwhois": "<=4.2.5",
+                "phpxmlrpc/extras": "<0.6.1",
+                "pimcore/data-hub": "<1.2.4",
+                "pimcore/pimcore": "<10.5.9",
+                "pocketmine/bedrock-protocol": "<8.0.2",
+                "pocketmine/pocketmine-mp": "<4.7.2|>= 4.0.0-BETA5, < 4.4.2",
+                "pressbooks/pressbooks": "<5.18",
+                "prestashop/autoupgrade": ">=4,<4.10.1",
+                "prestashop/blockwishlist": ">=2,<2.1.1",
+                "prestashop/contactform": ">=1.0.1,<4.3",
+                "prestashop/gamification": "<2.3.2",
+                "prestashop/prestashop": ">=1.6.0.10,<1.7.8.7",
+                "prestashop/productcomments": "<5.0.2",
+                "prestashop/ps_emailsubscription": "<2.6.1",
+                "prestashop/ps_facetedsearch": "<3.4.1",
+                "prestashop/ps_linklist": "<3.1",
+                "privatebin/privatebin": "<1.4",
+                "propel/propel": ">=2-alpha.1,<=2-alpha.7",
+                "propel/propel1": ">=1,<=1.7.1",
+                "pterodactyl/panel": "<1.7",
+                "ptrofimov/beanstalk_console": "<1.7.14",
+                "pusher/pusher-php-server": "<2.2.1",
+                "pwweb/laravel-core": "<=0.3.6-beta",
+                "rainlab/debugbar-plugin": "<3.1",
+                "rankmath/seo-by-rank-math": "<=1.0.95",
+                "react/http": ">=0.7,<1.7",
+                "remdex/livehelperchat": "<3.99",
+                "rmccue/requests": ">=1.6,<1.8",
+                "robrichards/xmlseclibs": "<3.0.4",
+                "rudloff/alltube": "<3.0.3",
+                "s-cart/core": "<6.9",
+                "s-cart/s-cart": "<6.9",
+                "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1",
+                "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9",
+                "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
+                "sensiolabs/connect": "<4.2.3",
+                "serluck/phpwhois": "<=4.2.6",
+                "shopware/core": "<=6.4.9",
+                "shopware/platform": "<=6.4.9",
+                "shopware/production": "<=6.3.5.2",
+                "shopware/shopware": "<=5.7.14",
+                "shopware/storefront": "<=6.4.8.1",
+                "shopxo/shopxo": "<2.2.6",
+                "showdoc/showdoc": "<2.10.4",
+                "silverstripe/admin": ">=1,<1.8.1",
+                "silverstripe/assets": ">=1,<1.10.1",
+                "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4",
+                "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1",
+                "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
+                "silverstripe/framework": "<4.10.9",
+                "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|= 4.0.0-alpha1",
+                "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1",
+                "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
+                "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4",
+                "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1",
+                "silverstripe/subsites": ">=2,<2.1.1",
+                "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1",
+                "silverstripe/userforms": "<3",
+                "simple-updates/phpwhois": "<=1",
+                "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4",
+                "simplesamlphp/simplesamlphp": "<1.18.6",
+                "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
+                "simplito/elliptic-php": "<1.0.6",
+                "slim/slim": "<2.6",
+                "smarty/smarty": "<3.1.47|>=4,<4.2.1",
+                "snipe/snipe-it": "<6.0.11|>= 6.0.0-RC-1, <= 6.0.0-RC-5",
+                "socalnick/scn-social-auth": "<1.15.2",
+                "socialiteproviders/steam": "<1.1",
+                "spipu/html2pdf": "<5.2.4",
+                "spoonity/tcpdf": "<6.2.22",
+                "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
+                "ssddanbrown/bookstack": "<22.2.3",
+                "statamic/cms": "<3.2.39|>=3.3,<3.3.2",
+                "stormpath/sdk": ">=0,<9.9.99",
+                "studio-42/elfinder": "<2.1.59",
+                "subrion/cms": "<=4.2.1",
+                "sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8",
+                "swiftmailer/swiftmailer": ">=4,<5.4.5",
+                "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
+                "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
+                "sylius/grid-bundle": "<1.10.1",
+                "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1",
+                "sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
+                "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2",
+                "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
+                "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
+                "symbiote/silverstripe-versionedfiles": "<=2.0.3",
+                "symfont/process": ">=0,<4",
+                "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
+                "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
+                "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4",
+                "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1",
+                "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3|= 6.0.3|= 5.4.3|= 5.3.14",
+                "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7",
+                "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5|>=5.2,<5.3.12",
+                "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
+                "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1",
+                "symfony/mime": ">=4.3,<4.3.8",
+                "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
+                "symfony/polyfill": ">=1,<1.10",
+                "symfony/polyfill-php55": ">=1,<1.10",
+                "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
+                "symfony/routing": ">=2,<2.0.19",
+                "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8",
+                "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11|>=5.3,<5.3.12",
+                "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9",
+                "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
+                "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8",
+                "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2",
+                "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12",
+                "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3",
+                "symfony/translation": ">=2,<2.0.17",
+                "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
+                "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8",
+                "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
+                "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
+                "t3/dce": ">=2.2,<2.6.2",
+                "t3g/svg-sanitizer": "<1.0.3",
+                "tastyigniter/tastyigniter": "<3.3",
+                "tecnickcom/tcpdf": "<6.2.22",
+                "terminal42/contao-tablelookupwizard": "<3.3.5",
+                "thelia/backoffice-default-template": ">=2.1,<2.1.2",
+                "thelia/thelia": ">=2.1-beta.1,<2.1.3",
+                "theonedemon/phpwhois": "<=4.2.5",
+                "thinkcmf/thinkcmf": "<=5.1.7",
+                "thorsten/phpmyfaq": "<3.1.8",
+                "tinymce/tinymce": "<5.10",
+                "titon/framework": ">=0,<9.9.99",
+                "topthink/framework": "<=6.0.13",
+                "topthink/think": "<=6.0.9",
+                "topthink/thinkphp": "<=3.2.3",
+                "tribalsystems/zenario": "<9.2.55826",
+                "truckersmp/phpwhois": "<=4.3.1",
+                "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
+                "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.32|>=11,<11.5.16",
+                "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
+                "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.58|>=8,<8.7.48|>=9,<9.5.37|>=10,<10.4.32|>=11,<11.5.16",
+                "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
+                "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
+                "typo3/html-sanitizer": ">=1,<1.0.7|>=2,<2.0.16",
+                "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3",
+                "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1",
+                "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
+                "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10",
+                "ua-parser/uap-php": "<3.8",
+                "unisharp/laravel-filemanager": "<=2.5.1",
+                "userfrosting/userfrosting": ">=0.3.1,<4.6.3",
+                "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
+                "vanilla/safecurl": "<0.9.2",
+                "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4",
+                "vrana/adminer": "<4.8.1",
+                "wallabag/tcpdf": "<6.2.22",
+                "wanglelecc/laracms": "<=1.0.3",
+                "web-auth/webauthn-framework": ">=3.3,<3.3.4",
+                "webcoast/deferred-image-processing": "<1.0.2",
+                "wikimedia/parsoid": "<0.12.2",
+                "willdurand/js-translation-bundle": "<2.1.1",
+                "wintercms/winter": "<1.0.475|>=1.1,<1.1.10|>=1.2,<1.2.1",
+                "woocommerce/woocommerce": "<6.6",
+                "wp-cli/wp-cli": "<2.5",
+                "wp-graphql/wp-graphql": "<0.3.5",
+                "wpanel/wpanel4-cms": "<=4.3.1",
+                "wwbn/avideo": "<=11.6",
+                "yeswiki/yeswiki": "<4.1",
+                "yetiforce/yetiforce-crm": "<=6.4",
+                "yidashi/yii2cmf": "<=2",
+                "yii2mod/yii2-cms": "<1.9.2",
+                "yiisoft/yii": ">=1.1.14,<1.1.15",
+                "yiisoft/yii2": "<2.0.38",
+                "yiisoft/yii2-bootstrap": "<2.0.4",
+                "yiisoft/yii2-dev": "<2.0.43",
+                "yiisoft/yii2-elasticsearch": "<2.0.5",
+                "yiisoft/yii2-gii": "<2.0.4",
+                "yiisoft/yii2-jui": "<2.0.4",
+                "yiisoft/yii2-redis": "<2.0.8",
+                "yoast-seo-for-typo3/yoast_seo": "<7.2.3",
+                "yourls/yourls": "<=1.8.2",
+                "zendesk/zendesk_api_client_php": "<2.2.11",
+                "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3",
+                "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2",
+                "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
+                "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5",
+                "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3",
+                "zendframework/zend-diactoros": "<1.8.4",
+                "zendframework/zend-feed": "<2.10.3",
+                "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1",
+                "zendframework/zend-http": "<2.8.1",
+                "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6",
+                "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3",
+                "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2",
+                "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1",
+                "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4",
+                "zendframework/zend-validator": ">=2.3,<2.3.6",
+                "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1",
+                "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6",
+                "zendframework/zendframework": "<=3",
+                "zendframework/zendframework1": "<1.12.20",
+                "zendframework/zendopenid": ">=2,<2.0.2",
+                "zendframework/zendxml": ">=1,<1.0.1",
+                "zetacomponents/mail": "<1.8.2",
+                "zf-commons/zfc-user": "<1.2.2",
+                "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
+                "zfr/zfr-oauth2-server-module": "<0.1.2",
+                "zoujingli/thinkadmin": "<6.0.22"
+            },
+            "default-branch": true,
+            "type": "metapackage",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "role": "maintainer"
+                },
+                {
+                    "name": "Ilya Tribusean",
+                    "email": "slash3b@gmail.com",
+                    "role": "maintainer"
+                }
+            ],
+            "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
+            "support": {
+                "issues": "https://github.com/Roave/SecurityAdvisories/issues",
+                "source": "https://github.com/Roave/SecurityAdvisories/tree/latest"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Ocramius",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-31T20:04:42+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1620,7 +4171,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1628,34 +4179,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1694,7 +4245,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -1702,33 +4253,90 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
-            "name": "sebastian/diff",
-            "version": "3.0.3",
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1760,7 +4368,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -1768,27 +4376,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.4",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -1796,7 +4404,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -1823,7 +4431,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -1831,34 +4439,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.3",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
-                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1893,14 +4501,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
             },
             "funding": [
                 {
@@ -1908,27 +4516,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:47:53+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "2.0.0",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1936,7 +4547,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1961,36 +4572,99 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
-            "time": "2017-04-27T15:39:26+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2012,7 +4686,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2020,32 +4694,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -2067,7 +4741,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -2075,32 +4749,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2130,7 +4804,7 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2138,29 +4812,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2182,7 +4859,7 @@
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
             },
             "funding": [
                 {
@@ -2190,30 +4867,85 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
-            "name": "sebastian/version",
-            "version": "2.0.1",
+            "name": "sebastian/type",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-12T14:47:03+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2236,9 +4968,1301 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v5.4.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669",
+                "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
+            },
+            "conflict": {
+                "psr/log": ">=3",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
+                "symfony/event-dispatcher": "<4.4",
+                "symfony/lock": "<4.4",
+                "symfony/process": "<4.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v5.4.15"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-26T21:41:52+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v5.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/event-dispatcher-contracts": "^2|^3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<4.4"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/stopwatch": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-05T16:45:39+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/event-dispatcher": "^1"
+            },
+            "suggest": {
+                "symfony/event-dispatcher-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v5.4.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.13"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-21T19:53:16+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v5.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-29T07:37:50+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v5.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-20T13:00:38+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php73",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-10T07:21:04+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v5.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1",
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-27T16:58:25+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0",
+                "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "suggest": {
+                "psr/container": "",
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v1.1.2"
+            },
+            "time": "2019-05-28T07:50:59+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v5.4.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69",
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/service-contracts": "^1|^2|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to profile code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.13"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-28T13:19:49+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v5.4.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
+                "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.4.15"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-05T15:16:54+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -2291,22 +6315,130 @@
             "time": "2021-07-28T10:34:58+00:00"
         },
         {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
+            "name": "vimeo/psalm",
+            "version": "4.29.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+                "url": "https://github.com/vimeo/psalm.git",
+                "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
+                "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "amphp/amp": "^2.4.2",
+                "amphp/byte-stream": "^1.5",
+                "composer/package-versions-deprecated": "^1.8.0",
+                "composer/semver": "^1.4 || ^2.0 || ^3.0",
+                "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0",
+                "dnoegel/php-xdg-base-dir": "^0.1.1",
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "felixfbecker/advanced-json-rpc": "^3.0.3",
+                "felixfbecker/language-server-protocol": "^1.5",
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "nikic/php-parser": "^4.13",
+                "openlss/lib-array2xml": "^1.0",
+                "php": "^7.1|^8",
+                "sebastian/diff": "^3.0 || ^4.0",
+                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
+                "symfony/polyfill-php80": "^1.25",
+                "webmozart/path-util": "^2.3"
+            },
+            "provide": {
+                "psalm/psalm": "self.version"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.2",
+                "brianium/paratest": "^4.0||^6.0",
+                "ext-curl": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpdocumentor/reflection-docblock": "^5",
+                "phpmyadmin/sql-parser": "5.1.0||dev-master",
+                "phpspec/prophecy": ">=1.9.0",
+                "phpstan/phpdoc-parser": "1.2.* || 1.6.4",
+                "phpunit/phpunit": "^9.0",
+                "psalm/plugin-phpunit": "^0.16",
+                "slevomat/coding-standard": "^7.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/process": "^4.3 || ^5.0 || ^6.0",
+                "weirdan/prophecy-shim": "^1.0 || ^2.0"
+            },
+            "suggest": {
+                "ext-curl": "In order to send data to shepherd",
+                "ext-igbinary": "^2.0.5 is required, used to serialize caching data"
+            },
+            "bin": [
+                "psalm",
+                "psalm-language-server",
+                "psalm-plugin",
+                "psalm-refactor",
+                "psalter"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev",
+                    "dev-3.x": "3.x-dev",
+                    "dev-2.x": "2.x-dev",
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php",
+                    "src/spl_object_id.php"
+                ],
+                "psr-4": {
+                    "Psalm\\": "src/Psalm/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Brown"
+                }
+            ],
+            "description": "A static analysis tool for finding errors in PHP applications",
+            "keywords": [
+                "code",
+                "inspection",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/vimeo/psalm/issues",
+                "source": "https://github.com/vimeo/psalm/tree/4.29.0"
+            },
+            "time": "2022-10-11T17:09:17+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
@@ -2344,19 +6476,72 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
             },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2022-06-03T18:03:27+00:00"
+        },
+        {
+            "name": "webmozart/path-util",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/path-util.git",
+                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "webmozart/assert": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\PathUtil\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
+            "support": {
+                "issues": "https://github.com/webmozart/path-util/issues",
+                "source": "https://github.com/webmozart/path-util/tree/2.3.0"
+            },
+            "abandoned": "symfony/filesystem",
+            "time": "2015-12-17T08:42:14+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "roave/security-advisories": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2"
+        "php": "^7.3 || ^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 22772df21..6b86a04c6 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -15,7 +15,7 @@ services:
           - MYSQL_DATABASE=ospos
           - MYSQL_USERNAME=admin
           - MYSQL_PASSWORD=pointofsale
-        command: ["/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/phpunit/phpunit/phpunit"]
+        command: ["/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/bin/phpunit", "/app/app/tests"]
         ports:
           - "80:80"
 
diff --git a/package.json b/package.json
index 343d87a07..b3e504247 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,7 @@
 {
-  "name": "@opensourcepos/opensourcepos",
-  "version": "3.3.9",
-  "description": "Open Source Point of Sale is a web-based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/opensourcepos/opensourcepos"
-  },
+  "name": "opensourcepos",
+  "version": "3.4.0",
+  "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
   "main": "index.php",
   "license": "MIT",
   "authors": [
@@ -38,18 +34,18 @@
     "grunt-contrib-compress": "^1.4.1",
     "grunt-contrib-concat": "~0.5.1",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-jshint": "~0.6.3",
+    "grunt-contrib-cssmin": "^4.0.0",
+    "grunt-contrib-jshint": "^3.0.0",
     "grunt-contrib-uglify": "~5.0.1",
-    "grunt-contrib-watch": "~1.1.0",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-license-bower": "~1.0.1",
     "grunt-script-link-tags": "https://github.com/jekkos/grunt-script-link-tags.git#master",
     "grunt-wiredep": "^3.0.1",
-    "load-grunt-tasks": "^3.4.0",
-    "npm": "^9.4.1"
+    "load-grunt-tasks": "^3.4.0"
   },
   "dependencies": {
-    "bootstrap": "^5.1.3",
-    "bootswatch": "^5.1.3"
+    "bootstrap-5": "npm:bootstrap@^5.1.3",
+    "bootswatch-5": "npm:bootswatch@^5.1.3",
+    "npm": "^6.14.15"
   }
 }
diff --git a/public/css/invoice.css b/public/css/invoice.css
index 72dfc6863..6cad7b6c2 100644
--- a/public/css/invoice.css
+++ b/public/css/invoice.css
@@ -8,7 +8,7 @@
 /*body { font: 14px/1.4 Georgia, serif; }*/
 #page-wrap { width: 100%; margin: 0 auto; max-width: 800px; }
 
-#page-wrap textarea { border: 0; font-size: 14px; overflow: hidden; resize: none; }
+#page-wrap textarea { border: none; font-size: 14px; overflow: hidden; resize: none; }
 #page-wrap table { border-collapse: collapse; }
 #page-wrap table td, #page-wrap table th { border: 1px solid black; padding: 5px; }
 #page-wrap table td { padding: 5px; }
@@ -40,7 +40,7 @@
 #items { clear: both; width: 100%; margin: 30px 0 0 0; border: 1px solid black; }
 #items th { background: #eee; text-align: center; }
 #items textarea { width: 80px; height: 20px; }
-#items tr.item-row td { border: 0; vertical-align: top; }
+#items tr.item-row td { border: none; vertical-align: top; }
 #items td.description { width: 300px; }
 #items td.item-name { width: 175px; }
 #items td.item-description textarea { height: auto; width: 100%; }
@@ -50,7 +50,7 @@
 #items td.total-value textarea { height: 20px; background: none; }
 #items td.total-line textarea { height: 20px; width:150px; background: none; }
 #items td.balance { background: #eee; }
-#items td.blank { border: 0; }
+#items td.blank { border: none; }
 #items td.blank-bottom { border: 1px; }
 
 #terms { text-align: center; margin: 20px 0 0 0; }
diff --git a/public/css/invoice_email.css b/public/css/invoice_email.css
index 02de3aee2..8e01a6b4d 100644
--- a/public/css/invoice_email.css
+++ b/public/css/invoice_email.css
@@ -38,7 +38,7 @@ pre { font-family: DejaVu Sans, Helvetica, Sans-Serif; font-size: 13px; }
 #meta-content { width: 300px; }
 #items { width: 100%;  border: 1px solid black; }
 #items th { background: #eee; }
-#items tr.item-row td { border: 0; vertical-align: top; }
+#items tr.item-row td { border: none; vertical-align: top; }
 #items td { font-family: DejaVu Sans, Helvetica, Sans-Serif; }
 #items td.description { width: 300px; }
 #items td.item-name { width: 175px; }
@@ -46,7 +46,7 @@ pre { font-family: DejaVu Sans, Helvetica, Sans-Serif; font-size: 13px; }
 #items td.total-value { text-align: right; border-width: 1px 0px 1px 0; border-style: solid; }
 #items td.centered-value { text-align: center; }
 #items td.balance { background: #eeeeee; }
-#items td.blank { border: 0; }
+#items td.blank { border: none; }
 
 #terms { text-align: center; margin: 20px 0; }
 #terms h5 { border-bottom: 1px solid black; font: 13px DejaVu Sans, Helvetica, Sans-Serif; padding: 8px 0; margin: 8px 0; line-height: 1.3em; }
diff --git a/public/index.php b/public/index.php
index 3f9fbbe7e..ca47c3161 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,315 +1,37 @@
 <?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2016, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	https://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+
+// Path to the front controller (this file)
+const FCPATH = __DIR__ . DIRECTORY_SEPARATOR;
 
 /*
  *---------------------------------------------------------------
- * APPLICATION ENVIRONMENT
+ * BOOTSTRAP THE APPLICATION
  *---------------------------------------------------------------
- *
- * You can load different configurations depending on your
- * current environment. Setting the environment also influences
- * things like logging and error reporting.
- *
- * This can be set to anything, but default usage is:
- *
- *     development
- *     testing
- *     production
- *
- * NOTE: If you change these, also change the error_reporting() code below
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
  */
-	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'production');
+
+// Ensure the current directory is pointing to the front controller's directory
+chdir(__DIR__);
+
+// Load our paths config file
+// This is the line that might need to be changed, depending on your folder structure.
+$pathsConfig = FCPATH . '../app/Config/Paths.php';
+// ^^^ Change this if you move your application folder
+require realpath($pathsConfig) ?: $pathsConfig;
+
+$paths = new Config\Paths();
+
+// Location of the framework bootstrap file.
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
 
 /*
  *---------------------------------------------------------------
- * ERROR REPORTING
+ * LAUNCH THE APPLICATION
  *---------------------------------------------------------------
- *
- * Different environments will require different levels of error reporting.
- * By default development will show errors but testing and live will hide them.
+ * Now that everything is setup, it's time to actually fire
+ * up the engines and make this app do its thang.
  */
-switch (ENVIRONMENT)
-{
-	case 'development':
-		error_reporting(-1);
-		ini_set('display_errors', 1);
-	break;
-
-	case 'testing':
-	case 'production':
-		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-		}
-	break;
-
-	default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'The application environment is not set correctly.';
-		exit(1); // EXIT_ERROR
-}
-
-/*
- *---------------------------------------------------------------
- * SYSTEM DIRECTORY NAME
- *---------------------------------------------------------------
- *
- * This variable must contain the name of your "system" directory.
- * Set the path if it is not in the same directory as this file.
- */
-	$system_path = '../vendor/codeigniter/framework/system';
-
-/*
- *---------------------------------------------------------------
- * APPLICATION DIRECTORY NAME
- *---------------------------------------------------------------
- *
- * If you want this front controller to use a different "application"
- * directory than the default one you can set its name here. The directory
- * can also be renamed or relocated anywhere on your server. If you do,
- * use an absolute (full) server path.
- * For more info please see the user guide:
- *
- * https://codeigniter.com/user_guide/general/managing_apps.html
- *
- * NO TRAILING SLASH!
- */
-	$application_folder = '../application';
-
-/*
- *---------------------------------------------------------------
- * VIEW DIRECTORY NAME
- *---------------------------------------------------------------
- *
- * If you want to move the view directory out of the application
- * directory, set the path to it here. The directory can be renamed
- * and relocated anywhere on your server. If blank, it will default
- * to the standard location inside your application directory.
- * If you do move this, use an absolute (full) server path.
- *
- * NO TRAILING SLASH!
- */
-	$view_folder = '';
-
-
-/*
- * --------------------------------------------------------------------
- * DEFAULT CONTROLLER
- * --------------------------------------------------------------------
- *
- * Normally you will set your default controller in the routes.php file.
- * You can, however, force a custom routing by hard-coding a
- * specific controller class/function here. For most applications, you
- * WILL NOT set your routing here, but it's an option for those
- * special instances where you might want to override the standard
- * routing in a specific front controller that shares a common CI installation.
- *
- * IMPORTANT: If you set the routing here, NO OTHER controller will be
- * callable. In essence, this preference limits your application to ONE
- * specific controller. Leave the function name blank if you need
- * to call functions dynamically via the URI.
- *
- * Un-comment the $routing array below to use this feature
- */
-	// The directory name, relative to the "controllers" directory.  Leave blank
-	// if your controller is not in a sub-directory within the "controllers" one
-	// $routing['directory'] = '';
-
-	// The controller class file name.  Example:  mycontroller
-	// $routing['controller'] = '';
-
-	// The controller function you wish to be called.
-	// $routing['function']	= '';
-
-
-/*
- * -------------------------------------------------------------------
- *  CUSTOM CONFIG VALUES
- * -------------------------------------------------------------------
- *
- * The $assign_to_config array below will be passed dynamically to the
- * config class when initialized. This allows you to set custom config
- * items or override any default config values found in the config.php file.
- * This can be handy as it permits you to share one application between
- * multiple front controller files, with each file containing different
- * config values.
- *
- * Un-comment the $assign_to_config array below to use this feature
- */
-	// $assign_to_config['name_of_config_item'] = 'value of config item';
-
-
-
-// --------------------------------------------------------------------
-// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
-// --------------------------------------------------------------------
-
-/*
- * ---------------------------------------------------------------
- *  Resolve the system path for increased reliability
- * ---------------------------------------------------------------
- */
-
-	// Set the current directory correctly for CLI requests
-	if (defined('STDIN'))
-	{
-		chdir(dirname(__FILE__));
-	}
-
-	if (($_temp = realpath($system_path)) !== FALSE)
-	{
-		$system_path = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
-	{
-		// Ensure there's a trailing slash
-		$system_path = strtr(
-			rtrim($system_path, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		).DIRECTORY_SEPARATOR;
-	}
-
-	// Is the system path correct?
-	if ( ! is_dir($system_path))
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
-		exit(3); // EXIT_CONFIG
-	}
-
-/*
- * -------------------------------------------------------------------
- *  Now that we know the path, set the main path constants
- * -------------------------------------------------------------------
- */
-	// The name of THIS file
-	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
-
-	// Path to the system directory
-	define('BASEPATH', $system_path);
-
-	// Path to the front controller (this file) directory
-	define('FCPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
-
-	// Name of the "system" directory
-	define('SYSDIR', basename(BASEPATH));
-
-	// The path to the "application" directory
-	if (is_dir($application_folder))
-	{
-		if (($_temp = realpath($application_folder)) !== FALSE)
-		{
-			$application_folder = $_temp;
-		}
-		else
-		{
-			$application_folder = strtr(
-				rtrim($application_folder, '/\\'),
-				'/\\',
-				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-			);
-		}
-	}
-	elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-	{
-		$application_folder = BASEPATH.strtr(
-			trim($application_folder, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		);
-	}
-	else
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
-		exit(3); // EXIT_CONFIG
-	}
-
-	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
-
-	// The path to the "views" directory
-	if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
-	{
-		$view_folder = APPPATH.'views';
-	}
-	elseif (is_dir($view_folder))
-	{
-		if (($_temp = realpath($view_folder)) !== FALSE)
-		{
-			$view_folder = $_temp;
-		}
-		else
-		{
-			$view_folder = strtr(
-				rtrim($view_folder, '/\\'),
-				'/\\',
-				DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-			);
-		}
-	}
-	elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-	{
-		$view_folder = APPPATH.strtr(
-			trim($view_folder, '/\\'),
-			'/\\',
-			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-		);
-	}
-	else
-	{
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
-		exit(3); // EXIT_CONFIG
-	}
-
-	define('VIEWPATH', $view_folder.DIRECTORY_SEPARATOR);
-
-/*
- * --------------------------------------------------------------------
- * LOAD THE BOOTSTRAP FILE
- * --------------------------------------------------------------------
- *
- * And away we go...
- */
-require_once BASEPATH.'core/CodeIgniter.php';
+$app->run();
diff --git a/public/license/composer.LICENSES b/public/license/composer.LICENSES
index 258691228..663edc0d9 100644
--- a/public/license/composer.LICENSES
+++ b/public/license/composer.LICENSES
@@ -6,7 +6,7 @@
     ],
     "dependencies": {
         "codeigniter/framework": {
-            "version": "3.1.11",
+            "version": "4.1.3",
             "license": [
                 "MIT"
             ]
diff --git a/public/uploads/.gitignore b/public/uploads/.gitignore
deleted file mode 100755
index 0c87e40b8..000000000
--- a/public/uploads/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ignore everything in this directory
-*
-!item_pics
-# Except this file
-!.gitignore
diff --git a/spark b/spark
new file mode 100644
index 000000000..bd57ca014
--- /dev/null
+++ b/spark
@@ -0,0 +1,67 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * --------------------------------------------------------------------
+ * CodeIgniter command-line tools
+ * --------------------------------------------------------------------
+ * The main entry point into the CLI system and allows you to run
+ * commands and perform maintenance on your application.
+ *
+ * Because CodeIgniter can handle CLI requests as just another web request
+ * this class mainly acts as a passthru to the framework itself.
+ */
+
+const SPARKED = true;
+
+/*
+ *---------------------------------------------------------------
+ * BOOTSTRAP THE APPLICATION
+ *---------------------------------------------------------------
+ * This process sets up the path constants, loads and registers
+ * our autoloader, along with Composer's, loads our constants
+ * and fires up an environment-specific bootstrapping.
+ */
+
+// Refuse to run when called from php-cgi
+if (strpos(PHP_SAPI, 'cgi') === 0) {
+    exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
+}
+
+// Path to the front controller
+const FCPATH = __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR;
+
+// Load our paths config file
+$pathsConfig = 'app/Config/Paths.php';
+// ^^^ Change this line if you move your application folder
+require realpath($pathsConfig) ?: $pathsConfig;
+
+$paths = new Config\Paths();
+
+// Ensure the current directory is pointing to the front controller's directory
+chdir(FCPATH);
+
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
+
+// Grab our Console
+$console = new CodeIgniter\CLI\Console($app);
+
+// We want errors to be shown when using it from the CLI.
+error_reporting(-1);
+ini_set('display_errors', '1');
+
+// Show basic information before we do anything else.
+if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
+    unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
+    $suppress = true;
+}
+
+$console->showHeader($suppress);
+
+// fire off the command in the main framework.
+$response = $console->run();
+
+if ($response->getStatusCode() >= 300) {
+    exit($response->getStatusCode());
+}
diff --git a/writable/.htaccess b/writable/.htaccess
new file mode 100644
index 000000000..f24db0acc
--- /dev/null
+++ b/writable/.htaccess
@@ -0,0 +1,6 @@
+<IfModule authz_core_module>
+    Require all denied
+</IfModule>
+<IfModule !authz_core_module>
+    Deny from all
+</IfModule>
diff --git a/application/cache/.htaccess b/writable/cache/.htaccess
similarity index 100%
rename from application/cache/.htaccess
rename to writable/cache/.htaccess
diff --git a/application/core/index.html b/writable/cache/index.html
similarity index 87%
rename from application/core/index.html
rename to writable/cache/index.html
index b702fbc39..bcb7cae34 100644
--- a/application/core/index.html
+++ b/writable/cache/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 	<title>403 Forbidden</title>
 </head>
diff --git a/writable/debugbar/.gitkeep b/writable/debugbar/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/writable/logs/index.html b/writable/logs/index.html
new file mode 100644
index 000000000..bcb7cae34
--- /dev/null
+++ b/writable/logs/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/session/index.html b/writable/session/index.html
new file mode 100644
index 000000000..bcb7cae34
--- /dev/null
+++ b/writable/session/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/writable/uploads/index.html b/writable/uploads/index.html
new file mode 100644
index 000000000..bcb7cae34
--- /dev/null
+++ b/writable/uploads/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/public/uploads/item_pics/.gitignore b/writable/uploads/item_pics/.gitignore
old mode 100755
new mode 100644
similarity index 86%
rename from public/uploads/item_pics/.gitignore
rename to writable/uploads/item_pics/.gitignore
index 5e7d2734c..28db78b71
--- a/public/uploads/item_pics/.gitignore
+++ b/writable/uploads/item_pics/.gitignore
@@ -1,4 +1,4 @@
 # Ignore everything in this directory
-*
+.gitignore
 # Except this file
 !.gitignore