Blind sql injection fixes (#3284)

Currently translated at 10.2% (12 of 117 strings)

Translation: opensourcepos/items
Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/items/ro/

.dockerignore

@@ -1,7 +1,6 @@
 node_modules
 tmp
 application/config/email.php
-application/config/database.php
 *.patch
 patches/
 .idea/

.gitattributes

@@ -1,5 +1,3 @@
 dist/ merge=ours
 application/language/**/*.php merge=ours
 text=auto
-application/config/config.php ident
-application/views/partial/footer.php ident

.github/ISSUE_TEMPLATE.md

@@ -1,37 +1,29 @@
-### IMPORTANT IMPORTANT IMPORTANT
+### Background information
 
-Chose what you want to report: New Feature or Bug.
-If you remove the template when submitting a Bug your issue will be closed as we cannot help without basic information.
+__IMPORTANT: If you choose to ignore this issue report template, your issue will be closed as we cannot help without the requested information.__
 
+Please make sure you tick (add an x between the square brackets with no spaces) the following check boxes:
 
-### New Feature / Enhacement
-
-For New Features or Enhacements please remove all the template text and clearly write your proposal.
-It's important to state whether you expect the community to implement it or you will contribute the work.
-Please bear in mind that we will implement new features only on the current code, there is no support for old versions.
-
-
-### Issue / Question / Bug
-
-Before submitting an issue please make sure you remove the first section of the template and you tick (add a x between the square brakets) and agree with all the following check boxes:
-
-- [] Checked the current issues database and no similar issue was already discussed
-- [] Read the README, WHATS_NEW and UPGRADE
-- [] Read the FAQ (https://github.com/jekkos/opensourcepos#faq) for any known install and/or upgrade gotchas (in specific PHP has php5-gd, php-intl and sockets installed)
 - [] Reporting an issue of an unmodified OSPOS installation
-- [] PHP version is at least 5.5 and not 7.x
-- [] MySQL version is 5.5 or 5.6 and not 5.7
-- [] Ran any database upgrade scripts (e.g. database/2.4_to_3.0.sql)
-- [] Know the version of OSPOS and git commit hash (check the footer of your OSPOS) and will add to my issue report
-- [] Know the name and version of OS, Web server and MySQL and will add to my issue report
+- [] Checked [open and closed issues](https://github.com/opensourcepos/opensourcepos/issues?utf8=%E2%9C%93&q=is%3Aissue) and no similar issue was already reported (please make sure you searched!)
+- [] Read [README](https://github.com/opensourcepos/opensourcepos/blob/master/README.md), [WHATS_NEW](https://github.com/opensourcepos/opensourcepos/blob/master/WHATS_NEW.txt), [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) and [UPGRADE](https://github.com/opensourcepos/opensourcepos/blob/master/UPGRADE.txt)
+- [] Read the [FAQ](https://github.com/opensourcepos/opensourcepos#faq) for any known install and/or upgrade gotchas (in specific PHP extensions installed)
+- [] Read the [wiki](https://github.com/opensourcepos/opensourcepos/wiki)
+- [] Executed any database upgrade scripts if an upgrade pre 3.0.0 (e.g. database/2.4_to_3.0.sql)
+- [] Aware the installation code is in [bintray](https://bintray.com/jekkos/opensourcepos/opensourcepos/view/files?sort=updated&order=asc#files) (see README), and [GitHub master](https://github.com/opensourcepos/opensourcepos/tree/master) is for [developers only](https://github.com/opensourcepos/opensourcepos/wiki/Development-setup) and therefore not complete nor stable
 
 ### Installation information
 
+- OSPOS version is: 
+- OSPOS git commit hash is: 
+- PHP version is: 
+- MySQL or MariaDB version is: 
+- OS and version is: 
+- WebServer is: 
+- Selected language is: 
+- (If applicable) Docker installation: 
+- (If applicable) Installation package for the LAMP/LEMP stack is: 
 
-### Expected behaviour
+### Issue / Bug  / Question / New Feature
 
-
-### Actual behaviour
-
-
-### Steps to reproduce the issue
+Please write your issue here. If a bug, please make sure to provide as much information as possible including configuration settings (e.g. Decimals set, Tax mode), language and steps to reproduce the bug.

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - enhancement
+  - needsowner
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 12 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -1,14 +1,22 @@
 node_modules
 tmp
+database/database.sql
+database/migrate_phppos_dist.sql
 application/config/email.php
-application/config/database.php
 application/sessions/*
 application/logs/*
 application/uploads/*
 public/license/.licenses
+public/license/bower.LICENSES
+public/dist
+generate_langauges.php
+dist/
+docs/
 public/bower_components
+npm_modules
 *.patch
 patches/
+translations/
 .idea/
 git-svn-diff.py
 *.bash
@@ -16,9 +24,17 @@ git-svn-diff.py
 .buildpath
 .project
 .settings/*
+vendor/
 *.swp
 *.rej
 *.orig
 *~
 *.~
 *.log
+.env
+package-lock.json
+auth.json
+!/docker/.env
+/docker/data/database/db/*
+/docker/data/certbot/conf/*
+/docker/data/ospos/app/*

.htaccess

@@ -1,6 +1,14 @@
+# redirect to public page
+  <IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} !^public$
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
+    RewriteRule "^(.*)$" "/public/" [R=301,L]
+  </IfModule>
+
 # disable directory browsing
 # For security reasons, Option all cannot be overridden.
-Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
+Options +SymLinksIfOwnerMatch -Indexes
 
 # prevent folder listing
 IndexIgnore *

.travis.yml

@@ -1,19 +1,55 @@
-sudo: true                  # Required to install packages
+sudo: required
+if: tag IS blank
 
 branches:
-    except:
-        - weblate
-
-services: 
-    - docker
+  except:
+    - weblate
+services:
+  - docker
 before_install:
-    - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
-    - chmod +x docker-compose
-    - sudo mv docker-compose /usr/local/bin
-script:
-    - docker-compose build
-env: 
-    - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
-after_success:
-    - '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php "jekkos/opensourcepos:$TAG" && docker tag opensourcepos_sqlscript jekkos/opensourcepos:sqlscript && docker push "jekkos/opensourcepos:$TAG" &&  docker push jekkos/opensourcepos:sqlscript'
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - docker --version
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+
+script:
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  - docker run --rm -v $(pwd):/app jekkos/composer composer install
+  - docker run --rm -v $(pwd):/app jekkos/composer php bin/install.php translations develop
+  - sed -i "s/'\(dev\)'/'$rev'/g" application/config/config.php
+  - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower
+    sh -c "npm install && bower install && grunt package"
+  - docker build . --target ospos -t ospos
+  - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
+env:
+  global:
+  - DOCKER_COMPOSE_VERSION=1.29.1
+  - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
+after_success:
+  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
+    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"
+before_deploy:
+  - version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
+  - TRAVIS_TAG=$(echo $branch.$version)
+  - git tag -f "$branch.$version"
+  - sudo mv dist/opensourcepos.zip "dist/opensourcepos.$branch.$version.zip"
+deploy:
+  provider: releases
+  file: "dist/opensourcepos.$branch.$version.zip"
+  name: "OpensourcePos $version"
+  release_notes_file: WHATS_NEW.txt
+  prerelease: true
+  skip_cleanup: true
+
+  user: jekkos
+  overwrite: true
+  api_key:
+    secure: Ax25mMRDfHVf/HjRwqxYJe2oMnWC4sc2aKIiUxAOviVJJSCl4GMWhcFlUNnFsDcKIg2ofEGMVD6b9cTBuOwPDvymUDFnLNCCgDWve+vRDdWaTkTipn77Qk4c9UO9VvuzlPSKopChefPHlQ0n1rEmAMiKIXuqjUlNGqybW4FLP4E=
+  on:
+    all_branches: true
 

Dockerfile

@@ -1,24 +1,41 @@
-FROM php:5-apache
+FROM php:7.4-apache AS ospos
 MAINTAINER jekkos
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    php5-apcu \
     libicu-dev \
     libgd-dev \
-    libmcrypt-dev
+    openssl
+
 
 RUN a2enmod rewrite
-RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets mbstring mcrypt
+RUN docker-php-ext-install mysqli bcmath intl gd
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
-RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/hosts
 
 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 755 /app/public/uploads && chown -R www-data:www-data /app/public/uploads
+RUN chmod -R 750 /app/public/uploads /app/application/logs && chown -R www-data:www-data /app/public /app/application
+
+FROM ospos AS ospos_test
+ 
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+ 
+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
+ 
+CMD ["/app/vendor/phpunit/phpunit/phpunit"]
+
+FROM ospos AS ospos_dev
+
+RUN mkdir -p /app/bower_components && ln -s /app/bower_components /var/www/html/bower_components
+RUN yes | pecl install xdebug \
+    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
 
-RUN cp application/config/database.php.tmpl application/config/database.php && \
-    sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \
-    sed -i -e "s/\(user.*\?=.\).*\(.\)$/\1getenv('MYSQL_USERNAME')\2/g" application/config/database.php && \
-    sed -i -e "s/\(password.*\?=.\).*\(.\)$/\1getenv('MYSQL_PASSWORD')\2/g" application/config/database.php && \
-    sed -i -e "s/\(database.*\?=.\).*\(.\)$/\1getenv('MYSQL_DB_NAME')\2/g" application/config/database.php && \
-    sed -i -e "s/\(hostname.*\?=.\).*\(.\)$/\1getenv('MYSQL_HOST_NAME')\2/g" application/config/database.php

Dockerfile.dev

@@ -1,9 +0,0 @@
-FROM jekkos/opensourcepos:master
-MAINTAINER jekkos
-
-RUN mkdir -p /app/bower_components && ln -s /app/bower_components /var/www/html/bower_components
-RUN yes | pecl install xdebug \
-    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
-    && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
-    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
-

Dockerfile.test

@@ -1,11 +0,0 @@
-FROM digitallyseamless/nodejs-bower-grunt:5
-MAINTAINER jekkos
-
-# apt-get install curl
-
-COPY Gruntfile.js .
-COPY package.json .
-COPY test .
-RUN npm install
-
-CMD ['while ! curl web/index.php | grep username; do sleep 1; done; grunt mochaWebdriver:test']

FUNDING.yml

@@ -0,0 +1,2 @@
+github: jekkos
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8"]

Gruntfile.js

@@ -1,6 +1,6 @@
 module.exports = function(grunt) {
 
-    grunt.initConfig({
+	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
 		wiredep: {
 			task: {
@@ -11,7 +11,15 @@ module.exports = function(grunt) {
 		bower_concat: {
 			all: {
 				mainFiles: {
-					'bootstrap-table': [ "src/bootstrap-table.js", "src/bootstrap-table.css", "dist/extensions/export/bootstrap-table-export.js", "dist/extensions/mobile/bootstrap-table-mobile.js"]
+					'bootstrap-table': [ 
+						"dist/bootstrap-table.min.js", 
+						"dist/bootstrap-table.css", 
+						"dist/extensions/export/bootstrap-table-export.min.js", 
+						"dist/extensions/mobile/bootstrap-table-mobile.min.js", 
+						"dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js", 
+						"dist/extensions/sticky-header/bootstrap-table-sticky-header.css"
+					],
+					'chartist-plugin-axistitle': [ "./dist/chartist-plugin-axistitle.min.js"]
 				},
 				dest: {
 					'js': 'tmp/opensourcepos_bower.js',
@@ -23,27 +31,22 @@ module.exports = function(grunt) {
 			options: {
 				report: false
 			},
+			targetdistjqueryui: {
+				options: {
+					srcPrefix: 'public/bower_components/jquery-ui',
+					destPrefix: 'public/dist'
+				},
+				files: {
+					'jquery-ui': 'themes/base/jquery-ui.min.css'
+				}
+			},
 			targetdistbootswatch: {
 				options: {
 					srcPrefix: 'public/bower_components/bootswatch',
-					destPrefix: 'public/dist/bootswatch'
+					destPrefix: 'public/dist'
 				},
 				files: {
-					'cerulean/bootstrap.min.css': 'cerulean/bootstrap.min.css',
-					'cosmo/bootstrap.min.css': 'cosmo/bootstrap.min.css',
-					'cyborg/bootstrap.min.css': 'cyborg/bootstrap.min.css',
-					'darkly/bootstrap.min.css': 'darkly/bootstrap.min.css',
-					'flatly/bootstrap.min.css': 'flatly/bootstrap.min.css',
-					'journal/bootstrap.min.css': 'journal/bootstrap.min.css',
-					'paper/bootstrap.min.css': 'paper/bootstrap.min.css',
-					'readable/bootstrap.min.css': 'readable/bootstrap.min.css',
-					'sandstone/bootstrap.min.css': 'sandstone/bootstrap.min.css',
-					'slate/bootstrap.min.css': 'slate/bootstrap.min.css',
-					'spacelab/bootstrap.min.css': 'spacelab/bootstrap.min.css',
-					'superhero/bootstrap.min.css': 'superhero/bootstrap.min.css',
-					'united/bootstrap.min.css': 'united/bootstrap.min.css',
-					'yeti/bootstrap.min.css': 'yeti/bootstrap.min.css',
-					'fonts': 'fonts'
+					bootswatch: '*/'
 				}
 			},
 			targetlicense: {
@@ -53,12 +56,57 @@ module.exports = function(grunt) {
 				files: {
 					'public/license': 'LICENSE'
 				}
+			}
+		},
+		copy: {
+			themes: {
+				files: [
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5/dist/css',
+						src: ['bootstrap.css', 'bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/bootstrap/',
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5/dist',
+						src: ['**/bootstrap.css', '**/bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/',
+						filter: 'isFile'
+					}
+				],
+			},
+			licenses: {
+				files: [{
+					expand: true,
+					src: 'LICENSE',
+					dest: 'public/license/',
+					filter: 'isFile',},
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootstrap-5.license'); },
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootswatch-5.license'); },
+						filter: 'isFile'
+					},
+				],
 			},
 		},
 		cssmin: {
 			target: {
 				files: {
-					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/style.css']
+					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
+					'public/css/login.min.css': ['public/css/login.css']
 				}
 			}
 		},
@@ -68,7 +116,7 @@ module.exports = function(grunt) {
 					separator: ';'
 				},
 				files: {
-					'tmp/<%= pkg.name %>.js': ['tmp/opensourcepos_bower.js', 'public/js/jquery*', 'public/js/*.js']
+					'tmp/<%= pkg.name %>.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']
 				}
 			},
 			sql: {
@@ -111,7 +159,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end css template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css'],
+				src: ['public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
 				dest: 'application/views/partial/header.php',
 			},
 			mincss_header: {
@@ -121,7 +169,8 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end mincss template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/dist/*.css', '!public/dist/login.css', '!public/dist/invoice_email.css', '!public/dist/barcode_font.css'],
+				// jquery-ui must be first or at least before opensourcepos.min.css
+				src: ['public/dist/jquery-ui/*.css', 'public/dist/*.css'],
 				dest: 'application/views/partial/header.php',
 			},
 			css_login: {
@@ -129,9 +178,9 @@ module.exports = function(grunt) {
 					scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
 					openTag: '<!-- start css template tags -->',
 					closeTag: '<!-- end css template tags -->',
-                    ignorePath: '../../public/'
+					ignorePath: '../../public/'
 				},
-				src: ['public/dist/login.css'],
+				src: 'public/css/login.min.css',
 				dest: 'application/views/login.php'
 			},
 			js: {
@@ -141,7 +190,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end js template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/js/jquery*', 'public/js/*.js'],
+				src: ['public/dist/bootstrap/js/*.min.js', 'public/js/jquery*', 'public/js/*.js'],
 				dest: 'application/views/partial/header.php'
 			},
 			minjs: {
@@ -149,24 +198,12 @@ module.exports = function(grunt) {
 					scriptTemplate: '<script type="text/javascript" src="{{ path }}"></script>',
 					openTag: '<!-- start minjs template tags -->',
 					closeTag: '<!-- end minjs template tags -->',
-                    ignorePath: '../../../public/'
+					ignorePath: '../../../public/'
 				},
 				src: ['public/dist/*min.js'],
 				dest: 'application/views/partial/header.php'
 			}
 		},
-		mochaWebdriver: {
-			options: {
-				timeout: 1000 * 60 * 3
-			},
-			test : {
-				options: {
-					usePhantom: true,
-					usePromises: true
-				},
-				src: ['test/**/*.js']
-			}
-		},
 		watch: {
 			files: ['<%= jshint.files %>'],
 			tasks: ['jshint']
@@ -195,8 +232,8 @@ module.exports = function(grunt) {
 					// Target-specific options go here. 
 					directory: 'public/bower_components',
 					output: 'public/license/bower.LICENSES'
-				},
-			},
+				}
+			}
 		},
 		'bower-licensechecker': {
 			options: {
@@ -217,13 +254,49 @@ module.exports = function(grunt) {
 					noGood: true,
 				}
 			}
+		},
+		compress: {
+			main: {
+				options: {
+					mode: 'zip',
+					archive: 'dist/opensourcepos.zip'
+				},
+				files: [
+					{
+						src: [
+							'public/**',
+							'vendor/**',
+							'application/**',
+							'!/application/tests',
+							'!/public/images/menubar/png/',
+							'!/public/dist/bootswatch/',
+							'/public/dist/bootswatch/*/*.css',
+							'!/public/dist/bootswatch-5/',
+							'/public/dist/bootswatch-5/*/*.css',
+							'database/**',
+							'*.txt',
+							'*.md',
+							'LICENSE',
+							'docker*',
+							'docker/**',
+							'Dockerfile',
+							'**/.htaccess',
+							'*.csv'
+						]
+					}
+				]
+			}
 		}
-    });
+	});
 
-    require('load-grunt-tasks')(grunt);
-    grunt.loadNpmTasks('grunt-mocha-webdriver');
+	require('load-grunt-tasks')(grunt);
+	grunt.loadNpmTasks('grunt-composer');
+	grunt.loadNpmTasks('grunt-contrib-compress');
 
-    grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
-    grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
+	grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'copy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
+	grunt.registerTask('update', ['composer:update', 'bower:update']);
+	grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
+	grunt.registerTask('package', ['default', 'compress']);
+	grunt.registerTask('packages', ['composer:update']);
 
 };

INSTALL.md

@@ -0,0 +1,81 @@
+Server Requirements
+-------------------
+
+* PHP version 7.2 to 7.4 are supported, PHP version 5.6 and 8.0 are NOT supported. Please note that PHP needs to have `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring` and `php-curl` installed and enabled.
+
+* MySQL 5.5, 5.6 and 5.7 are supported, also MariaDB replacement 10.x is supported and apparently offering better performance.
+
+* Apache 2.2 and 2.4 are supported. Also Nginx has been proven to work fine, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP).
+
+* Raspberry PI based installations proved to work, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Installing-on-Raspberry-PI---Orange-PI-(Headless-OSPOS)).
+
+* For Windows based installations please read [the wiki](https://github.com/opensourcepos/opensourcepos/wiki) and also existing closed issues as this topic has been covered well in all the variants and issues.
+
+
+Local install
+-------------
+
+First of all, if you're seeing the message **'system folder missing'** after launching your browser, then that means you have cloned the repository and have not built the project properly.
+
+1. Dowload the latest stable or prerelease for a specific branch [from github](https://github.com/opensourcepos/opensourcepos/releases). A regular repository clone will not work unless you are brave enough to build the whole project!
+2. Create/locate a new mysql database to install open source point of sale into
+3. Execute the file database/database.sql to create the tables needed
+4. unzip and upload Open Source Point of Sale files to web server
+5. Modify application/config/database.php and modify credentials if needed to connect to your database
+6. Modify application/config/config.php encryption key with your own
+7. Go to your point of sale install public dir via the browser
+8. LOGIN using
+  * username: admin 
+  * password: pointofsale
+9. Enjoy
+10. Oops an issue? Please make sure you read the FAQ, wiki page and you checked open and closed issue on GitHub. PHP display_errors is disabled by default. Create an application/config/.env file from the .env.example to enable it in a development environment. 
+
+
+Local install using Docker
+--------------------------
+
+From now onwards OSPOS can be deployed using Docker on Linux and Mac, locally or on a host (server).
+This setup dramatically reduces the number of possible issues as all setup is now done in a Dockerfile.
+Docker runs natively on Mac and Linux. Please refer to the docker documentation for instructions on how to set it up on your platform.
+
+***Be aware that this setup is not suited for production usage. Change the default passwords in the compose file before exposing the containers publicly.***
+
+Start the containers using following command
+
+```
+    docker-compose up
+```
+
+
+Nginx install using Docker
+-------------------------
+
+Since OSPOS version 3.3.0 the docker installation offers a reverse proxy based on nginx with a Letsencrypt TLS certificate termination (aka HTTPS connection).
+Letsencrypt is a free certificate issuer, requiring a special installation that this docker installation would take care for you.
+Any Letsencrypt TLS certificate renewal will be managed automatically for you, therefore there is no need to worry about those details.
+
+Before starting your installation, you would need to edit docker/.env file and configure it to contain the correct MySQL/MariaDB and phpMyAdmin passwords (don't use the defaults!).
+You will also need to register to Letsencrypt and configure your host domain name, Letsencrypt email address in docker/.env file.
+The variable STAGING needs to be set to 0 when you are confident your configuration is correct so that Letsencrypt will issue a final proper TLS certificate.
+
+Follow local install steps, but instead of 
+
+```
+    docker/install-nginx.sh
+```
+
+Do not use 
+
+```
+    docker/uninstall.sh
+```
+
+on live deployments unless you want to tear down everything because all your disk content will be wiped out!
+
+
+Cloud install
+-------------
+
+If you choose *DigitalOcean*:
+[Through this link](https://m.do.co/c/ac38c262507b), you will get a *$100 credit* for a first month. [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/Getting-Started-installations) for further instructions on how to install the necessary components.
+

LICENSE

@@ -1,36 +1,69 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2014 pappastech
-Copyright (c) 2012 Alain
+Copyright (c) 2013-2021 jekkos
+Copyright (c) 2015-2021 FrancescoUK (aka daN4cat)
+Copyright (c) 2017-2021 Steve Ireland
+Copyright (c) 2017-2021 objecttothis
+Copyright (c) 2017-2021 odiea
+Copyright (c) 2017-2021 WebShells
+Copyright (c) 2020-2021 Andriux1990
+Copyright (c) 2019 Loyd Jayme (aka loydjayme25)
+Copyright (c) 2018 Erasto Marroquin (aka Erastus)
+Copyright (c) 2018 Nathan Sas (aka nathanzky)
+Copyright (c) 2018 Emilio Silva (aka emi-silva)
+Copyright (c) 2017 Jesus Guerrero Botella (aka i92guboj)
+Copyright (c) 2017 Deep Shah (aka deepshah)
+Copyright (c) 2017 Joshua Fernandez (aka joshua1234511)
+Copyright (c) 2017 asadjaved63
+Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal)
+Copyright (c) 2016-2017 Jorge Colmenarez (aka jlctmaster), frontuari.com
+Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
+Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
+Copyright (c) 2015 Toni Haryanto (aka yllumi)
 Copyright (c) 2013 Rob Garrison
 Copyright (c) 2013 Parq
 Copyright (c) 2013 Ramel
-Copyright (c) 2014-2016 jekkos
-Copyright (c) 2015-2016 FrancescoUK (aka daN4cat)
-Copyright (c) 2015 Aamir Shahzad (aka asakpke), RoshanTech.com
-Copyright (c) 2015 Toni Haryanto (aka yllumi)
-Copyright (c) 2016 Ramkrishna Mondal (aka RamkrishnaMondal)
-Copyright (c) 2016 Rinaldy@dbarber (aka rnld26)
+Copyright (c) 2012-2014 pappastech
+Copyright (c) 2012 Alain
 
-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:
+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.
 
 You cannot claim copyright or ownership of the Software.
 
-Footer signatures "You are using Open Source Point Of Sale" and/or "Open Source Point Of Sale"
+Versions ≥ 3.3.2:
+
+Footer signatures "© 2010 - 2021 · opensourcepos.org · 3.3.3 - 6909c8"
+In the format of: "© 2010 - Current Year · opensourcepos.org · Version - Commit"
+
+and/or 
+
+"· opensourcepos.org ·"
+with version, hash and URL link to the official website of the project MUST BE RETAINED, 
+MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
+
+Versions < 3.3.2:
+
+Footer signatures "You are using Open Source Point Of Sale" 
+
+and/or 
+
+"Open Source Point Of Sale"
+
 with version, hash and URL link to the original distribution of the code MUST BE RETAINED, 
 MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
 
-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.
+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.

README.md

@@ -1,35 +1,65 @@
-[![Build Status](https://travis-ci.org/jekkos/opensourcepos.svg?branch=master)](https://travis-ci.org/jekkos/opensourcepos)
-[![Join the chat at https://gitter.im/jekkos/opensourcepos](https://badges.gitter.im/jekkos/opensourcepos.svg)](https://gitter.im/jekkos/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![devDependency Status](https://david-dm.org/jekkos/opensourcepos/dev-status.svg)](https://david-dm.org/jekkos/opensourcepos#info=devDependencie)
-[![Dependency Status](https://gemnasium.com/badges/github.com/jekkos/opensourcepos.svg)](https://gemnasium.com/github.com/jekkos/opensourcepos)
+[![Build Status](https://travis-ci.com/opensourcepos/opensourcepos.svg?branch=master)](https://travis-ci.org/opensourcepos/opensourcepos)
+[![Join the chat at https://gitter.im/opensourcepos](https://badges.gitter.im/jekkos/opensourcepos.svg)](https://gitter.im/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![GitHub version](https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg)](https://badge.fury.io/gh/jekkos%2Fopensourcepos)
-[![Translation status](http://weblate.jpeelaer.net/widgets/ospos/-/svg-badge.svg)](http://weblate.jpeelaer.net/engage/ospos/?utm_source=widget)
+[![Translation status](http://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg)](http://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget)
+
 
 Introduction
 ------------
 
 Open Source Point of Sale is a web based point of sale system.
 The main features are:
-* Stock management
+* Stock management (Items and Kits with extensible list of Attributes)
+* VAT, GST, customer and multi tiers taxation
 * Sale register with transactions logging
-* Receipt and invoice printing and emailing
+* Quotation and invoicing
+* Expenses logging
+* Cashup
+* Receipt and invoice printing and/or emailing
+* Barcode generation and printing
 * Suppliers and Customers database
 * Multiuser with permission control
-* Reporting
-* Gift card
+* Reporting on sales, orders, expenses, inventory status
 * Receivings
-* Barcode generation and printing
-* Messaging
+* Giftcard
+* Rewards
+* Restaurant tables
+* Messaging (SMS)
 * Multilanguage
-* Different UI themes
+* Selectable Boostrap (Bootswatch) based UI theme
+* Mailchimp integration
+* reCAPTCHA to protect login page from brute force attacks
+* GDPR ready
 
-The software is written in PHP language, it uses MySQL or MariaDB as data storage back-end and has a simple but intuitive user interface.
+The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface.
 
-The latest version 3.0.2 is a complete overhaul of the original software.
-It is now based on Bootstrap 3.x using Bootswatch themes, and still uses CodeIgniter 3.x as framework.
+The latest 3.x version is a complete overhaul of the original software.
+It is now based on Bootstrap 3 using Bootswatch themes, and uses CodeIgniter version 3 as framework.
 It also has improved functionality and security.
 
-Deployed to a Cloud it can be defined as a SaaS (Software as as Service) type of solution.
+DEMO / DEV
+----------
+
+A demo version of the latest master version can be found on our [Demo server](https://demo.opensourcepos.org). This is a containerized install which will be reinitialized when new functionality is added to the code repository.
+
+LOGIN using
+* username: admin
+* password: pointofsale
+
+Beside this we also have a [Dev server](https://dev.opensourcepos.org) that runs the build that was triggered with the last repository's commit.
+
+In case of any issues, check our status page at [status.opensourcepos.org](https://status.opensourcepos.org) to confirm whether there is a sever outage.
+
+Installation
+------------
+
+Please **refrain from creating issues** about installation problems **before having read the FAQ and went through existing github issues**. We have a build pipeline that checks the sanity of our latest repository commit and in case the application itself is broken then our build will be as well.
+
+This application **can be setup in many different ways** and we only **support the ones described in the INSTALL file linked below**.
+
+Read the [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) in our repository.
+
+[Check our wiki](https://github.com/opensourcepos/opensourcepos/wiki/Supported-hardware-datasheet) for info and recommendations on supported receipt printers and barcode scanners.
 
 License
 -------
@@ -45,7 +75,7 @@ Also worth noting:
 _The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software._
 
-For more details please read the file __LICENSE__.
+For more details please read the file [LICENSE](https://github.com/opensourcepos/opensourcepos/blob/master/LICENSE).
 
 It's important to understand that althought you are free to use the software the copyright stays and the license agreement applies in all cases.
 Therefore any actions like:
@@ -56,89 +86,47 @@ Therefore any actions like:
 
 In short you are free to use the software but you cannot claim any property on it.
 
-Any person or company found breaching the license agreement will be chased up.
+Any person or company found breaching the license agreement will have a bunch of monkeys at the door ready to destroy their servers.
+
 
 Keep the Machine Running
 ------------------------
-If you like the project, and you are making money out of it on a daily basis, then consider buying me a coffee so I can keep adding features.
+
+If you like the project, and you are making money out of it in some form, then consider buying us a coffee so we can keep adding features.
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8)
 
-Server Requirements
--------------------
-PHP version 5.5 or newer is recommended but PHP 7.x is not fully supported yet.
+If you choose to deploy OSPOS in the cloud, you can contribute to the project by using our referral link. [You will get an initial $100 credits](https://m.do.co/c/ac38c262507b) for running OSPOS on a cloud instance with DigitalOcean. 
 
-PHP needs to have `php-gd`, `php-bcmath`, `php-intl`, `php-sockets` and `php-mcrypt` installed and enabled.
+Language Translations
+---------------------
 
-MySQL 5.5 or 5.6 are fine but MySQL 5.7 is not supported yet.
+To help us with OSPOS translations please use [Weblate website here](http://translate.opensourcepos.org) and sign up. After registering you can subscribe to different languages and you will be notified once a new translation is added.
 
-Apache 2.2 and 2.4 are working both fine.
+Please also read the [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Adding-translations) to find our Translations Guideline.
 
-Local install
--------------
-1. Create/locate a new mysql database to install open source point of sale into
-2. Execute the file database/database.sql to create the tables needed
-3. unzip and upload Open Source Point of Sale files to web server
-4. Copy application/config/database.php.tmpl to application/config/database.php
-5. Modify application/config/database.php to connect to your database
-6. Modify application/config/config.php encryption key with your own
-7. Go to your point of sale install public dir via the browser
-8. LOGIN using
-  * username: admin 
-  * password: pointofsale
-9. Enjoy
-10. Oops an issue? Please read the FAQ first thing :-)
+Only with the help of the community we can keep language translations up to date.
 
-P.S.: For more info about a local install based on Raspberry PI please read our wiki
-
-Local install using Docker
---------------------------
-From now on ospos can be deployed using Docker on Linux, Mac or Windows. This setup dramatically reduces the number of possible issues as all setup is now done in a Dockerfile. Docker runs natively on mac and linux, but will require more overhead on windows. Please refer to the docker documentation for instructions on how to set it up on your platform.
-
-To build and run the image, issue following commands in a terminal with docker installed
-
-    docker-compose build
-    docker-compose up 
-
-Cloud install
--------------
-A quick option would be to install directly to [Digitalocean](https://m.do.co/c/ac38c262507b) using their preconfigured LAMP stack. 
-Create a DO account first, add a droplet with preconfigured LAMP and follow the instructions for Local Install below. You will be running a provisioned VPS within minutes.
-
-Cloud install using Docker
---------------------------
-If you want to run a quick demo of ospos or run it permanently in the cloud, then we
-suggest using Docker cloud together with the DigitalOcean hosting platform. This way all the
-configuration is done automatically and the install will just work. 
-
-If you choose *DigitalOcean* [through this link](https://m.do.co/c/ac38c262507b), you will get a *$10 credit* for a first
-month of uptime on the platform. A full setup will only take about 2 minutes by following steps below.
-
-1. Create a [Digitalocean account](https://m.do.co/c/ac38c262507b)
-2. Create a [docker cloud account](https://cloud.docker.com)
-3. Login to docker cloud
-4. Associate your docker cloud account with your previously created digital ocean account under settings
-5. Create a new node on DigitalOcean through the `Infrastructure > Nodes` tab. Fill in a name (ospos) and choose a region near to you. We recommend to choose a node with minimum 1G RAM for the whole stack
-6. Click [![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/jekkos/opensourcepos) 
-7. Othewise create a new stack under `Applications > Stacks` and paste the [contents of docker-cloud.yml](https://github.com/jekkos/opensourcepos/blob/master/docker-cloud.yml) from the source repository in the text field and hit `Create and deploy` 
-8. Find your website url under `Infrastructure > Nodes > <yournode> > Endpoints > web`
-9. Login with default username/password admin/pointofsale
-10. DNS name for this server can be easily configured in the DigitalOcean control panel
-
-More info [on maintaining a docker](https://github.com/jekkos/opensourcepos/wiki/Docker-cloud-maintenance) install can be found on the wiki
 
 Reporting Bugs
 --------------
-If you are taking a release candidate code please make sure you always run the latest database upgrade script and you took the latest code from master.
-Please DO NOT post issues if you have not done those step.
 
-Bug reports must follow this schema:
+If you are taking a release candidate code please make sure you always run the latest database upgrade script and you took the latest code from master.
+Please DO NOT post issues if you have not completed this step.
+
+- Versions **≥ 3.3.0**:
+
+Please **Copy** the info under **System Info tab in configuration section** in order to give us the required details.
+
+- Versions **< 3.2.3**:
+
+Bug reports must follow the below schema:
 
 1. Ospos **version string with git commit hash** (see ospos footer)
-2. OS name and version running your Web Server (e.g. Linux Ubuntu 15.0)
-3. Web Server name and version (e.g. Apache 2.4)
-4. Database name and version (e.g. =< MySQL 5.6)
-5. PHP version (e.g. PHP 5.5)
+2. OS name and version running your Web Server (e.g. CentOS 6.9, Ubuntu 20, Windows 10)
+3. Web Server name and version (e.g. Apache 2.4, Nginx 1.12, Nginx 1.13)
+4. Database name and version (e.g. MySQL 5.6, MySQL 5.7, MariaDB 10.2, MariaDB 10.3)
+5. PHP version (e.g. 7.2, 7.3, 7.4)
 6. Language selected in OSPOS (e.g. English, Spanish)
 7. Any configuration of OSPOS that you changed
 8. Exact steps to reproduce the issue (test case)
@@ -147,22 +135,31 @@ Bug reports must follow this schema:
 If above information is not provided in full, your issue will be tagged as pending.
 If missing information is not provided within a week we will close your issue.
 
+
 FAQ
 ---
-* If a blank page (HTTP status 500) shows after search completion or receipt generation, then double check `php5-gd` presence in your php installation. On windows check in php.ini whether the lib is installed. On Ubuntu issue `sudo apt-get install php5-gd`. Also have a look at the Dockerfile for a complete list of recommended packages.
 
-* If sales and receiving views don't show properly, please make sure BCMath lib (`php-bcmath`) is installed. On windows check php.ini and make sure php_bcmath extension is not commented out
+* If you are seeing the message **system folder missing**, then you have cloned the source using git and you need to run a build *first*. Check [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md) for instructions or download latest zip file from [PLACEHOLDER](https://NEWURL) instead.
 
-* If the following error is seen in sales module `Message: Class 'NumberFormatter' not found` then you don't have `php5-intl` extension installed. Please check the [wiki](https://github.com/jekkos/opensourcepos/wiki/Localisation-support#php5-intl-extension-installation) to resolve this issue on your platform. If you use WAMP, please read [issue #949](https://github.com/jekkos/opensourcepos/issues/949)
+* If at login time you read "The installation is not correct, check your php.ini file.", please check the error_log in public folder to understand what's wrong and make sure you read the [INSTALL.md](https://github.com/opensourcepos/opensourcepos/blob/master/INSTALL.md). To know how to enable error_log, please read the comment in [issue 1770](https://github.com/opensourcepos/opensourcepos/issues/1770#issuecomment-355177943).
 
-* If you are getting the error `Message: Can't use method return value in write context` that means that you are probably using PHP7 which is not completely supported yet. Check your hosting configuration to verify whether you have a supported PHP version installed
+* If you installed your OSPOS under a web server subdir, please edit public/.htaccess and go to the lines with comment `if in web root` and `if in subdir comment above line, uncomment below one and replace <OSPOS path> with your path` and follow the instruction on the second comment line. If you face more issues please read [issue #920](https://github.com/opensourcepos/opensourcepos/issues/920) for more help.
 
-* If you read errors containing messages with Socket word in it, please make sure you have installed PHP Sockets support (e.g. go to PHP.ini and make sure all the needed modules are not commented out. This means `php5-gd`, `php-intl` and `php-sockets`. Restart the web server)
+* Apache server configurations are SysAdmin issues and not strictly related to OSPOS. Please make sure you first can show a "hello world" html page before pointing to OSPOS public directory. Make sure .htaccess is correctly configured.
 
-* If you get various errors at item creation, opening views or reports, or having issues at login please make sure you are not using MySQL 5.7 as it's not supported yet
+* If the avatar pictures are not shown in Items or at Item save time you get an error, please make sure your public and subdirs are assigned to the correct owner and the access permission is set to 750.
 
-* If you installed your OSPOS under a web server subdir, please edit public/.htaccess and go to the lines with comment `if in web root` and `if in subdir comment above line, uncomment below one and replace <OSPOS path> with your path` and follow the instruction on the second comment line. If you face more issues please read [issue #920](https://github.com/jekkos/opensourcepos/issues/920) for more help
+* If you install ospos in docker behind a proxy that performs ssloffloading, you can enable the url generated to be https instead of http, by activating the environment variable FORCE_HTTPS = 1.
 
-* If the avatar pictures are not shown in Items or at Item save time you get an error, please make sure your public and subdirs are assigned to the correct owner and the access permission is set to 755
+* If you have suhosin installed and face an issue with CSRF, please make sure you read [issue #1492](https://github.com/opensourcepos/opensourcepos/issues/1492).
 
-* If you have problems with the encryption support or you get an error please make sure `php5-mcrypt` is installed
+* PHP 8.0 is not currently supported, see [issue #3051](https://github.com/opensourcepos/opensourcepos/issues/3051).
+
+* PHP 5.5 and 5.6 are no longer supported due to the fact that they have been deprecated and not safe to use from security point of view.
+
+Credits
+-------
+|JetBrains|Travis CI|
+|:-:|:-:|
+|![IntelliJ IDEA](https://raw.githubusercontent.com/wiki/j-easy/easy-batch/images/logo/intellijidea-logo.png)|[Travis CI](https://travis-ci.com/images/logos/TravisCI-Full-Color.png)|
+|Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS|Many thanks to [Travis CI](https://travis-ci.org) for providing a free continuous integration service for open source projects.|

SECURITY.md

@@ -0,0 +1,27 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [Security Policy](#security-policy)
+  - [Supported Versions](#supported-versions)
+  - [Reporting a Vulnerability](#reporting-a-vulnerability)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Security Policy
+
+## Supported Versions
+
+We release patches for security vulnerabilities. Which versions are eligible
+receiving such patches depend on the CVSS v3.0 Rating:
+
+| CVSS v3.0 | Supported Versions                                 |
+| --------- | -------------------------------------------------- |
+| 7.3       | 3.5.5                                              |
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities to
+**[jekkos](mailto:jekkos@opensourcepos.org)**. You will receive a response from
+us within 48 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity but historically within a few days.

UPGRADE.txt

@@ -4,12 +4,13 @@ How to Upgrade
 2. Make sure you have a copy of application/config/config.php and application/config/database.php
 3. Remove all directories
 4. Install the new OSPOS
-5. Run the database upgrade scripts from database/ dir (check which ones you need according to the version you are upgrading from)
+5. (Only applicable if upgrading from pre 3.0.0) Run the database upgrade scripts from database/ dir (check which ones you need according to the version you are upgrading from)
 6. Take the saved old config.php and upgrade the new config.php with any additional changes you made in the old.
    Take time to understand if new config rules require some changes (e.g. encryption keys)
-7. Copy application/config/database.php.tmpl to application/config/database.php
-8. Take the saved old database.php and change the new database.php to contain all the configuration you had in the old setup.
+7. Take the saved old database.php and change the new database.php to contain all the configuration you had in the old setup.
    Please try not to use the old layout, use the new one and just copy the content of the config variables
-9. Restore the content of the old uploads/ folder into public/uploads/ one
-10. Once new code is in place, database is updated and config files are sorted you are good to start the new OSPOS
-11. If any issue please check FAQ and/or GitHub issues as somebody else might have had your problem already or post a question
+8. Restore the content of the old uploads/ folder into public/uploads/ one
+9. Once the new code is in place, database is manually updated and config files are sorted you are good to start the new OSPOS
+10. The first login will take longer because OSPOS post 3.0.0 will upgrade automatically to the latest version
+11. Now you can use OSPOS
+12. If any issue please check README, FAQ and GitHub issues as somebody else might have had your problem already before creating a new issue

WHATS_NEW.txt

@@ -1,5 +1,156 @@
+Version 3.3.5
+-------------
++ Translation updates (Romanian, Ukranian, Vietnamese, Thai, Polish, Swedish, Portugese, Arabic, French, Chinese, Dutch, Tamil, Turkish, Spanish)
++ New login page restyle
++ Partial BS5 upgrade
++ Username verification fix on employee insert/update
++ Minor report fixes
++ Attribute encoding fix
++ Grunt/CI updates
++ Database and performance optimizations
++ CSV item import improvements
++ Fix decimal render
++ Translation fallback in other languages than english
++ Fixes for docker to make it run on Windows
+
+Version 3.3.4
+-------------
++ Translation updates (Hungarian, Indonesian, Bosnian, Ukranian, Vietnamese, Spanish)
++ Prevent data wipeout when calling GET directly on save endpoint
++ Cleanup .htaccess
++ Docker compose usability improvements
++ Cookie secure flag fix for Chrome (you can enable csrf protection again now)
++ Use longblob for session storage. This should fix issues preventing a user from adding a large number of items to register
++ Cashrounding bugfixes
++ Fix daily overview cash sale totals
++ Show sale count in transaction report
++ Button disable to prevent double submission
++ Add barcode field to item kits
++ Fix discount register parsing in some specific locales
+
+Version 3.3.3
+-------------
++ PHP 7.4 support
++ Set PHP 7.2 to be the minimum level due to older version deprecations
++ Added email CC and BCC (see config/email.php)
++ Cash rounding to nearest 5 cents
++ Updated composer packages and js plugins
++ Improved security (CSRF protection)
++ Various small improvements and bug fixes
+
+Version 3.3.2
+-------------
++ Fixed `only_full_group_by` issue with MySQL/MariaDB
++ Fixed POS transaction return failure if items are deleted
++ Various bug fixes
+
+Version 3.3.1
+-------------
++ Various bug fixes (please disable `only_full_group_by` option from MySQL/MariaDB to avoid issues)
+
+Version 3.3.0
+-------------
++ New logo
++ Code Igniter 3.1.11 upgrade
++ PHP 7.3 support
++ Attributes feature (allows extensibility of Items replacing old custom fields)
++ India GST Tax support + various Tax support improvements
++ Cashup feature
++ Temporary items feature
++ Fixed Sales Discount
++ Supplier category feature
++ Improved Items import and csv file generation (to contain additional attributes)
++ Improved Docker installation with nginx reverse proxy using Let's encrypt TLS certificate
++ Database performance improvements
++ Added and Updated translations
++ Fixed various reports issues
++ Fixed rounding issues
++ Fixed CSRF issues
++ Fixed database upgrade script issues
++ Various bug fixes
+
+Version 3.2.3
+-------------
++ Further revert of CSRF change causing regression
++ Code Igniter 3.1.9 upgrade
+
+Version 3.2.2
+-------------
++ Revert CSRF change causing regression
+
+Version 3.2.1
+-------------
++ Support for GDPR
++ CSRF simplifications
++ Translation upgrades
++ Various bug fixes
+
+Version 3.2.0
+-------------
++ Code Igniter 3.1.8 upgrade
++ PHP 7.2 support (use OpenSSL and not MCrypt)
++ Automatic database upgrades from vs 3.0.0 at first login (no more sql scripts)
++ Home and (back) Office menu switch (top menu can be organised in two views)
++ Expenses feature
++ Quote, Work Order features
++ Improved Invoice support
++ Sale suspend, soft delete, complete as state not as different tables or hard delete
++ Restore deleted Sales
++ Improved Items Kits
++ Export tables all records and export to pdf
++ Table sticky header (headers visible during scrolling)
++ Allow duplicate barcodes (Config option)
++ Search suggestion formatting (Config option)
++ Define print and email checkboxes behaviour (Config option)
++ Edit customer from sale register
++ Added and Updated translations
++ Various Jquery plugins upgrade
++ Fixed permission issues (e.g. password change)
++ Fixed various reports issues and renamed Sales to Transactions
++ Various bug fixes (e.g. Tax, Rounding, Library circular dependency)
+
+Version 3.1.1
+-------------
++ Updated en-US and en-GB translations, better grammar and consistency
++ Fixed database migration issue with VAT tax included
++ Fixed database backup bug
++ Fixed Gift card error
++ Fixed database upgrade to 3.1.x script (now it's to 3.1.1 and there is no 3.1.0 anymore)
++ Fixed old database upgrade scripts for people upgrading from 2.x versions
++ Fixed .htaccess file in opensourcepos root dir (it was not forwarding to public subdir)
++ Fixed few jQuery 2.0 upgrade issues
+
+Version 3.1.0
+-------------
++ MySQL 5.7 and PHP 7.x support
++ Advanced Tax support with customer tax categories and etc,
++ Better HORECA use case support with Dinner Table sale tagging
++ Customer Rewards support
++ Added quote support and better invoice support
++ Added integration with Mailchimp to connect Customer list with Mailchimp list
++ Prevent inserting two customers with same email address
++ Customer total spending and stats
++ Added reCAPTCHA to Login page to increase protection from Brute Force attacks
++ Added due payment for credit sale support
++ Gifcard numbering with two options: Series and Random
++ Extended Item Kits functionality
++ Employee allowed to change their own password clicking their name on top bar
++ Cash rounding support, extended decimals
++ Reworked Item Pictures and file name and storing
++ Financial year start date and selection from date range pickers
++ Date time range filters can be date & time or date only
++ Added two new Bootswatch themes
++ Receipts font size support
++ Fix automatically people's name first capital letter, emails in lower case only
++ Fixes to Receiving
++ Various amendments to database script updates from older versions
++ Added dotenv support
++ Updates to language translations (split English to American English and British English)
++ Various Dockers support improvements
++ Minor bugfixes
+
 Version 3.0.2
------------
+-------------
 + Fixed error when performing scans multiple times in a row
 + Fixed summary reports
 + Protect Employee privacy printing just the first letter of the family name
@@ -8,7 +159,7 @@ Version 3.0.2
 + Minor bugfixes
 
 Version 3.0.1
------------
+-------------
 + *CodeIgniter 3.1.2 Upgrade*
 + *Substantial database performance improvements*
 + *Improved security: email and sms passwords encryption, removed phpinfo.php*
@@ -23,7 +174,7 @@ Version 3.0.1
 + Minor bugfixes and some general code clean up
 
 Version 3.0.0
------------
+-------------
 + *CodeIgniter 3.1 Upgrade*
 + Major UI overhaul based on *Boostrap 3.0 and Bootswatch Themes*
 + New tabular views with advanced filtering using *Bootstrap Tables*
@@ -41,8 +192,8 @@ Version 3.0.0
 + About 280 closed issues under 3.0.0 release label, too many to produce a meaningful list
 + Various code cleanup, refactoring, optimisation and etc.
 
-Version 2.4
------------
+Version 2.4.0
+-------------
 + *CodeIgniter 3.0.5* Upgrade (please read UPGRADE.txt)
 + Fix for spurious logouts
 + Apache .htaccess mod_expiry caching and security optimizations
@@ -115,7 +266,6 @@ Version 2.3.2
 
 Version 2.3.1
 -------------
-
 + Extra report permissions (this includes a refactoring of the database model - new grants table)
 + Tax inclusive/exclusive pricing
 + Receivings amount multiplication (can be configured in items section)
@@ -124,8 +274,8 @@ Version 2.3.1
 + Fix item import through csv
 + Bug fixes for reports
 
-Version 2.3
------------
+Version 2.3.0
+-------------
 + Support for multiple stock locations
 
 Version 2.2.2
@@ -137,7 +287,7 @@ Version 2.2.2
 + Fix duplicated session cookies in http headers (this broke the application when running on nginx)
 
 Version 2.1.1
--------------
+---------------
 + Barcodes on the order receipt weren't generated correctly
 + Sales edit screen for detailed sales reports is now available with thickbox as in the rest of the application
 + Indonesian language files updated (Oktafianus)

application/config/.env.example

@@ -0,0 +1,8 @@
+CI_ENV="development"
+#CI_ENV="production"
+
+#Database Settings
+MYSQL_HOST_NAME="localhost"
+MYSQL_USERNAME="admin"
+MYSQL_PASSWORD="pointofsale"
+MYSQL_DB_NAME="ospos"

application/config/autoload.php

@@ -89,7 +89,7 @@ $autoload['drivers'] = array();
 |
 |	$autoload['helper'] = array('url', 'file');
 */
-$autoload['helper'] = array('form', 'url', 'table', 'text', 'locale', 'html', 'download', 'directory');
+$autoload['helper'] = array('form', 'url', 'tabular', 'text', 'locale', 'html', 'download', 'directory', 'migration', 'importfile');
 
 /*
 | -------------------------------------------------------------------
@@ -132,4 +132,32 @@ $autoload['language'] = array();
 |
 |	$autoload['model'] = array('first_model' => 'first');
 */
-$autoload['model'] = array('Appconfig', 'Person', 'Customer', 'Employee', 'Module', 'Item', 'Item_taxes', 'Sale', 'Sale_suspended', 'Supplier', 'Inventory', 'Receiving', 'Giftcard', 'Item_kit', 'Item_kit_items', 'Stock_location', 'Item_quantity');
+$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'
+);

application/config/config.php

@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.0.2';
+$config['application_version'] = '3.3.5';
 
 /* 
 |-------------------------------------------------------------------------- 
@@ -19,7 +19,7 @@ $config['application_version'] = '3.0.2';
 | 
 | 
 */ 
-$config['commit_sha1'] = '$Id$';
+$config['commit_sha1'] = 'dev';
  
 /* 
 |-------------------------------------------------------------------------- 
@@ -65,8 +65,9 @@ $config['db_log_enabled'] = FALSE;
 | a PHP script and you can easily do that on your own.
 |
 */
-$config['base_url'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
-$config['base_url'] .= '://' . $_SERVER['HTTP_HOST'];
+$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']);
 
 /*
@@ -294,7 +295,7 @@ $config['log_file_extension'] = '';
 | IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
 |            integer notation (i.e. 0700, 0644, etc.)
 */
-$config['log_file_permissions'] = 0644;
+$config['log_file_permissions'] = 0640;
 
 /*
 |--------------------------------------------------------------------------
@@ -358,7 +359,7 @@ $config['cache_query_string'] = FALSE;
 | https://codeigniter.com/user_guide/libraries/encryption.html
 |
 */
-$config['encryption_key'] = '';
+$config['encryption_key'] = getenv('ENCRYPTION_KEY') ? getenv('ENCRYPTION_KEY') : '';
 
 /*
 |--------------------------------------------------------------------------
@@ -437,8 +438,8 @@ $config['sess_regenerate_destroy'] = FALSE;
 $config['cookie_prefix'] = '';
 $config['cookie_domain'] = '';
 $config['cookie_path'] = '/';
-$config['cookie_secure'] = FALSE;
-$config['cookie_httponly'] = FALSE;
+$config['cookie_secure'] = $config['https_on'];
+$config['cookie_httponly'] = TRUE;
 
 /*
 |--------------------------------------------------------------------------
@@ -487,7 +488,7 @@ $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();
+$config['csrf_exclude_uris'] = array('login');
 
 /*
 |--------------------------------------------------------------------------
@@ -511,6 +512,7 @@ $config['csrf_exclude_uris'] = array();
 */
 $config['compress_output'] = FALSE;
 
+
 /*
 |--------------------------------------------------------------------------
 | Master Time Reference
@@ -554,4 +556,4 @@ $config['rewrite_short_tags'] = FALSE;
 | 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'] = '';
+$config['proxy_ips'] = '';

application/config/constants.php

@@ -83,3 +83,75 @@ defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user
 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);

application/config/database.php

@@ -75,12 +75,12 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-	'hostname' => 'localhost',
-	'username' => '',
-	'password' => '',
-	'database' => '',
+	'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' => '',
+	'dbprefix' => 'ospos_',
 	'pconnect' => FALSE,
 	'db_debug' => (ENVIRONMENT !== 'production'),
 	'cache_on' => FALSE,
@@ -93,4 +93,4 @@ $db['default'] = array(
 	'stricton' => FALSE,
 	'failover' => array(),
 	'save_queries' => TRUE
-);
+);

application/config/database.php.tmpl

@@ -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' => 'localhost',
-	'username' => '',
-	'password' => '',
-	'database' => '',
-	'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
-);

application/config/email.php

@@ -0,0 +1,10 @@
+<?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;
+

application/config/hooks.php

@@ -18,17 +18,28 @@ $hook['post_controller_constructor'][] = array(
                                     'filepath' => 'hooks'
                                 );
 
-$hook['post_controller_constructor'][] = array(
-                                    'class'    => '',
-                                    'function' => 'load_stats',
-                                    'filename' => 'load_stats.php',
-                                    'filepath' => 'hooks'
-                                );
-
 // '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'
-                                );
+                                );
+
+$hook['pre_controller'][] = array(
+    'class'    => '',
+    'function' => 'validate_save',
+    'filename' => 'save_hook.php',
+    'filepath' => 'hooks'
+);
+
+
+$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
+	}
+};

application/config/migration.php

@@ -11,7 +11,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | and disable it back when you're done.
 |
 */
-$config['migration_enabled'] = FALSE;
+$config['migration_enabled'] = TRUE;
 
 /*
 |--------------------------------------------------------------------------
@@ -69,7 +69,7 @@ $config['migration_auto_latest'] = FALSE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 0;
+$config['migration_version'] = 20180225100000;
 
 /*
 |--------------------------------------------------------------------------

application/config/routes.php

@@ -53,25 +53,35 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 $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_sales)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3$/$4';
+$route['reports/(detailed_:any)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
 $route['reports/detailed_sales'] = 'reports/date_input_sales';
-$route['reports/(detailed_receivings)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
 $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;
+$route['translate_uri_dashes'] = FALSE;

application/controllers/Attributes.php

@@ -0,0 +1,192 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('Secure_Controller.php');
+
+class Attributes extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('attributes');
+	}
+
+	public function index()
+	{
+		$data['table_headers'] = $this->xss_clean(get_attribute_definition_manage_table_headers());
+
+		$this->load->view('attributes/manage', $data);
+	}
+
+	/**
+	 * Returns customer 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->post('sort') === NULL ? definition.definition_name : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
+
+		$attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order);
+		$total_rows = $this->Attribute->get_found_rows($search);
+
+		$data_rows = [];
+		foreach($attributes->result() as $attribute)
+		{
+			$attribute->definition_flags = $this->get_attributes($attribute->definition_flags);
+			$data_rows[] = get_attribute_definition_data_row($attribute, $this);
+		}
+
+		$data_rows = $this->xss_clean($data_rows);
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function save_attribute_value()
+	{
+		$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')
+		);
+
+		echo json_encode(array('success' => $success != 0));
+	}
+
+	public function delete_attribute_value()
+	{
+		$success = $this->Attribute->delete_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id')
+		);
+
+		echo json_encode(array('success' => $success));
+	}
+
+	public function save_definition($definition_id = NO_DEFINITION_ID)
+	{
+		$definition_flags = 0;
+
+		$flags = (empty($this->input->post('definition_flags'))) ? [] : $this->input->post('definition_flags');
+
+		foreach($flags as $flag)
+		{
+			$definition_flags |= $flag;
+		}
+
+	//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_flags' => $definition_flags,
+			'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL
+		);
+
+		if ($this->input->post('definition_type') != null)
+		{
+			$definition_data['definition_type'] = DEFINITION_TYPES[$this->input->post('definition_type')];
+		}
+
+		$definition_name = $this->xss_clean($definition_data['definition_name']);
+
+		if($this->Attribute->save_definition($definition_data, $definition_id))
+		{
+		//New definition
+			if($definition_id == 0)
+			{
+				$definition_values = json_decode($this->input->post('definition_values'));
+
+				foreach($definition_values as $definition_value)
+				{
+					$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']));
+			}
+		//Existing definition
+			else
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('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));
+		}
+	}
+
+	public function suggest_attribute($definition_id)
+	{
+		$suggestions = $this->xss_clean($this->Attribute->get_suggestions($definition_id, $this->input->get('term')));
+
+		echo json_encode($suggestions);
+	}
+
+	public function get_row($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));
+
+		echo json_encode($data_row);
+	}
+
+	private function get_attributes($definition_flags = 0)
+	{
+		$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');
+			}
+		}
+		return $definition_flag_names;
+	}
+
+	public function view($definition_id = NO_DEFINITION_ID)
+	{
+		$info = $this->Attribute->get_info($definition_id);
+		foreach(get_object_vars($info) as $property => $value)
+		{
+			$info->$property = $this->xss_clean($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_info'] = $info;
+
+		$show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
+		$data['definition_flags'] = $this->get_attributes($show_all);
+		$selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
+		$data['selected_definition_flags'] = $this->get_attributes($selected_flags);
+
+		$this->load->view('attributes/form', $data);
+	}
+
+	public function delete_value($attribute_id)
+	{
+		return $this->Attribute->delete_value($attribute_id);
+	}
+
+	public function delete()
+	{
+		$attributes_to_delete = $this->input->post('ids');
+
+		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));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_cannot_be_deleted')));
+		}
+	}
+}

application/controllers/Cashups.php

@@ -0,0 +1,246 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Cashups extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('cashups');
+	}
+
+	public function index()
+	{
+		$data['table_headers'] = $this->xss_clean(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'));
+
+		$this->load->view('cashups/manage', $data);
+	}
+
+	public function search()
+	{
+		$cash_up = 0;
+		$search   = $this->input->get('search');
+		$limit    = $this->input->get('limit');
+		$offset   = $this->input->get('offset');
+		$sort     = $this->input->post('sort') === NULL ? 'cashup_id' : $this->db->escape($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);
+
+		// check if any filter is set in the multiselect dropdown
+		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$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)
+		{
+			$data_rows[] = $this->xss_clean(get_cash_up_data_row($cash_up));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function view($cashup_id = -1)
+	{
+		$data = array();
+
+		$data['employees'] = array();
+		foreach($this->Employee->get_all()->result() as $employee)
+		{
+			foreach(get_object_vars($employee) as $property => $value)
+			{
+				$employee->$property = $this->xss_clean($value);
+			}
+
+			$data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+		}
+
+		$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);
+		}
+
+		// open cashup
+		if(empty($cash_ups_info->cashup_id))
+		{
+			$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;
+		}
+		// 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)
+		{
+			// 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');
+
+			// the closed amount starts with the open amount -/+ any trasferred amount
+			$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')))
+			{
+				// 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');
+			}
+			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');
+			}
+
+			// get all the transactions payment summaries
+			$this->load->model('reports/Summary_payments');
+			$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_type'] == $this->lang->line('sales_cash'))
+					{
+						$cash_ups_info->closed_amount_cash += $this->xss_clean($row['trans_amount']);
+					}
+					elseif($row['trans_type'] == $this->lang->line('sales_due'))
+					{
+						$cash_ups_info->closed_amount_due += $this->xss_clean($row['trans_amount']);
+					}
+					elseif($row['trans_type'] == $this->lang->line('sales_debit') ||
+						$row['trans_type'] == $this->lang->line('sales_credit'))
+					{
+						$cash_ups_info->closed_amount_card += $this->xss_clean($row['trans_amount']);
+					}
+					elseif($row['trans_type'] == $this->lang->line('sales_check'))
+					{
+						$cash_ups_info->closed_amount_check += $this->xss_clean($row['trans_amount']);
+					}
+				}
+			}
+
+			// lookup expenses paid in cash
+			$filters = array(
+						 '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));
+
+			foreach($payments as $row)
+			{
+				$cash_ups_info->closed_amount_cash -= $this->xss_clean($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);
+		}
+
+		$data['cash_ups_info'] = $cash_ups_info;
+
+		$this->load->view("cashups/form", $data);
+	}
+
+	public function get_row($row_id)
+	{
+		$cash_ups_info = $this->Cashup->get_info($row_id);
+		$data_row = $this->xss_clean(get_cash_up_data_row($cash_ups_info));
+
+		echo json_encode($data_row);
+	}
+
+	public function save($cashup_id = -1)
+	{
+		$open_date = $this->input->post('open_date');
+		$open_date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('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);
+
+		$cash_up_data = array(
+			'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
+		);
+
+		if($this->Cashup->save($cash_up_data, $cashup_id))
+		{
+			$cash_up_data = $this->xss_clean($cash_up_data);
+
+			//New cashup_id
+			if($cashup_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('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));
+			}
+		}
+		else//failure
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('cashups_error_adding_updating'), 'id' => -1));
+		}
+	}
+
+	public function delete()
+	{
+		$cash_ups_to_delete = $this->input->post('ids');
+
+		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));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('cashups_cannot_be_deleted'), 'ids' => $cash_ups_to_delete));
+		}
+	}
+
+	/*
+	AJAX call from cashup input form to calculate the total
+	*/
+	public function ajax_cashup_total()
+	{
+		$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'));
+
+		$total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check);
+
+		echo json_encode(array('total' => to_currency_no_money($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)
+	{
+		return ($closed_amount_cash - $open_amount_cash - $transfer_amount_cash + $closed_amount_due + $closed_amount_card + $closed_amount_check);
+	}
+}
+?>

application/controllers/Customers.php

@@ -4,18 +4,52 @@ require_once("Persons.php");
 
 class Customers extends Persons
 {
+	private $_list_id;
+
 	public function __construct()
 	{
 		parent::__construct('customers');
+
+		$this->load->library('mailchimp_lib');
+
+		$CI =& get_instance();
+
+		$this->_list_id = $CI->encryption->decrypt($CI->Appconfig->get('mailchimp_list_id'));
 	}
-	
+
 	public function index()
 	{
-		$data['table_headers'] = $this->xss_clean(get_people_manage_table_headers());
+		$data['table_headers'] = $this->xss_clean(get_customer_manage_table_headers());
 
 		$this->load->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)
+	{
+		$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);
+		if(empty($stats))
+		{
+			//create object with empty properties.
+			$stats = new stdClass;
+			$stats->total = 0;
+			$stats->min = 0;
+			$stats->max = 0;
+			$stats->average = 0;
+			$stats->avg_discount = 0;
+			$stats->quantity = 0;
+		}
+
+		$data_row = $this->xss_clean(get_customer_data_row($person, $stats));
+
+		echo json_encode($data_row);
+	}
+
 	/*
 	Returns customer table data rows. This will be called with AJAX.
 	*/
@@ -24,7 +58,7 @@ class Customers extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$customers = $this->Customer->search($search, $limit, $offset, $sort, $order);
@@ -33,14 +67,26 @@ class Customers extends Persons
 		$data_rows = array();
 		foreach($customers->result() as $person)
 		{
-			$data_rows[] = get_person_data_row($person, $this);
-		}
+			// retrieve the total amount the customer spent so far together with min, max and average values
+			$stats = $this->Customer->get_stats($person->person_id);
+			if(empty($stats))
+			{
+				//create object with empty properties.
+				$stats = new stdClass;
+				$stats->total = 0;
+				$stats->min = 0;
+				$stats->max = 0;
+				$stats->average = 0;
+				$stats->avg_discount = 0;
+				$stats->quantity = 0;
+			}
 
-		$data_rows = $this->xss_clean($data_rows);
+			$data_rows[] = $this->xss_clean(get_customer_data_row($person, $stats));
+		}
 
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
-	
+
 	/*
 	Gives search suggestions based on what is being searched for
 	*/
@@ -57,7 +103,7 @@ class Customers extends Persons
 
 		echo json_encode($suggestions);
 	}
-	
+
 	/*
 	Loads the customer edit form
 	*/
@@ -70,21 +116,131 @@ class Customers extends Persons
 		}
 		$data['person_info'] = $info;
 
-		$data['total'] = $this->xss_clean($this->Customer->get_totals($customer_id)->total);
+		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;
+		}
+
+		$employee_info = $this->Employee->get_info($info->employee_id);
+		$data['employee'] = $this->xss_clean($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;
+
+		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);
+		}
+		else
+		{
+			$data['sales_tax_code_label'] = '';
+		}
+
+		$packages = array('' => $this->lang->line('items_none'));
+		foreach($this->Customer_rewards->get_all()->result_array() as $row)
+		{
+			$packages[$this->xss_clean($row['package_id'])] = $this->xss_clean($row['package_name']);
+		}
+		$data['packages'] = $packages;
+		$data['selected_package'] = $info->package_id;
+
+		if($this->config->item('use_destination_based_tax') == '1')
+		{
+			$data['use_destination_based_tax'] = TRUE;
+		}
+		else
+		{
+			$data['use_destination_based_tax'] = FALSE;
+		}
+
+		// retrieve the total amount the customer spent so far together with min, max and average values
+		$stats = $this->Customer->get_stats($customer_id);
+		if(!empty($stats))
+		{
+			foreach(get_object_vars($stats) as $property => $value)
+			{
+				$info->$property = $this->xss_clean($value);
+			}
+			$data['stats'] = $stats;
+		}
+
+		// retrieve the info from Mailchimp only if there is an email address assigned
+		if(!empty($info->email))
+		{
+			// 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);
+
+				// collect customer mailchimp emails activities (stats)
+				if(($activities = $this->mailchimp_lib->getMemberActivity($this->_list_id, $info->email)) !== FALSE)
+				{
+					if(array_key_exists('activity', $activities))
+					{
+						$open = 0;
+						$unopen = 0;
+						$click = 0;
+						$total = 0;
+						$lastopen = '';
+
+						foreach($activities['activity'] as $activity)
+						{
+							if($activity['action'] == 'sent')
+							{
+								++$unopen;
+							}
+							elseif($activity['action'] == 'open')
+							{
+								if(empty($lastopen))
+								{
+									$lastopen = substr($activity['timestamp'], 0, 10);
+								}
+								++$open;
+							}
+							elseif($activity['action'] == 'click')
+							{
+								if(empty($lastopen))
+								{
+									$lastopen = substr($activity['timestamp'], 0, 10);
+								}
+								++$click;
+							}
+
+							++$total;
+						}
+
+						$data['mailchimp_activity']['total'] = $total;
+						$data['mailchimp_activity']['open'] = $open;
+						$data['mailchimp_activity']['unopen'] = $unopen;
+						$data['mailchimp_activity']['click'] = $click;
+						$data['mailchimp_activity']['lastopen'] = $lastopen;
+					}
+				}
+			}
+		}
 
 		$this->load->view("customers/form", $data);
 	}
-	
+
 	/*
 	Inserts/updates a customer
 	*/
 	public function save($customer_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' => $this->input->post('first_name'),
-			'last_name' => $this->input->post('last_name'),
+			'first_name' => $first_name,
+			'last_name' => $last_name,
 			'gender' => $this->input->post('gender'),
-			'email' => $this->input->post('email'),
+			'email' => $email,
 			'phone_number' => $this->input->post('phone_number'),
 			'address_1' => $this->input->post('address_1'),
 			'address_2' => $this->input->post('address_2'),
@@ -94,57 +250,95 @@ class Customers extends Persons
 			'country' => $this->input->post('country'),
 			'comments' => $this->input->post('comments')
 		);
+
+		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $this->input->post('date'));
+
 		$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_percent' => $this->input->post('discount_percent') == '' ? 0.00 : $this->input->post('discount_percent'),
-			'taxable' => $this->input->post('taxable') != NULL
+			'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,
+			'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')
 		);
 
 		if($this->Customer->save_customer($person_data, $customer_data, $customer_id))
 		{
-			$person_data = $this->xss_clean($person_data);
-			$customer_data = $this->xss_clean($customer_data);
-			
-			//New customer
+			// 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));
+
+			// New customer
 			if($customer_id == -1)
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_successful_adding').' '.
-								$person_data['first_name'].' '.$person_data['last_name'], 'id' => $customer_data['person_id']));
+				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'])));
 			}
-			else //Existing customer
+			else // Existing customer
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_successful_updating').' '.
-								$person_data['first_name'].' '.$person_data['last_name'], 'id' => $customer_id));
+				echo json_encode(array('success' => TRUE,
+								'message' => $this->lang->line('customers_successful_updating') . ' ' . $first_name . ' ' . $last_name,
+								'id' => $customer_id));
 			}
 		}
-		else//failure
+		else // Failure
 		{
-			$person_data = $this->xss_clean($person_data);
-
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_error_adding_updating').' '.
-							$person_data['first_name'].' '.$person_data['last_name'], 'id' => -1));
+			echo json_encode(array('success' => FALSE,
+							'message' => $this->lang->line('customers_error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
+							'id' => -1));
 		}
 	}
-	
-	public function check_account_number()
+
+	/*
+	AJAX call to verify if an email address already exists
+	*/
+	public function ajax_check_email()
 	{
-		$exists = $this->Customer->account_number_exists($this->input->post('account_number'), $this->input->post('person_id'));
+		$exists = $this->Customer->check_email_exists(strtolower($this->input->post('email')), $this->input->post('person_id'));
 
 		echo !$exists ? 'true' : 'false';
 	}
-	
+
+	/*
+	AJAX call to verify if an account number already exists
+	*/
+	public function ajax_check_account_number()
+	{
+		$exists = $this->Customer->check_account_number_exists($this->input->post('account_number'), $this->input->post('person_id'));
+
+		echo !$exists ? 'true' : 'false';
+	}
+
 	/*
 	This deletes customers from the customers table
 	*/
 	public function delete()
 	{
-		$customers_to_delete = $this->xss_clean($this->input->post('ids'));
+		$customers_to_delete = $this->input->post('ids');
+		$customers_info = $this->Customer->get_multiple_info($customers_to_delete);
 
-		if($this->Customer->delete_list($customers_to_delete))
+		$count = 0;
+
+		foreach($customers_info->result() as $info)
 		{
-			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_successful_deleted').' '.
-							count($customers_to_delete).' '.$this->lang->line('customers_one_or_multiple')));
+			if($this->Customer->delete($info->person_id))
+			{
+				// remove customer from Mailchimp selected list
+				$this->mailchimp_lib->removeMember($this->_list_id, $info->email);
+
+				$count++;
+			}
+		}
+
+		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')));
 		}
 		else
 		{
@@ -153,101 +347,119 @@ class Customers extends Persons
 	}
 
 	/*
-	Customers import from excel spreadsheet
+	Customers import from csv spreadsheet
 	*/
-	public function excel()
+	public function csv()
 	{
 		$name = 'import_customers.csv';
 		$data = file_get_contents('../' . $name);
 		force_download($name, $data);
 	}
-	
-	public function excel_import()
+
+	public function csv_import()
 	{
-		$this->load->view('customers/form_excel_import', NULL);
+		$this->load->view('customers/form_csv_import', NULL);
 	}
 
-	public function do_excel_import()
+	public function do_csv_import()
 	{
 		if($_FILES['file_path']['error'] != UPLOAD_ERR_OK)
 		{
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_excel_import_failed')));
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_failed')));
 		}
 		else
 		{
 			if(($handle = fopen($_FILES['file_path']['tmp_name'], 'r')) !== FALSE)
 			{
-                // Skip the first row as it's the table description
+				// Skip the first row as it's the table description
 				fgetcsv($handle);
 				$i = 1;
 
 				$failCodes = array();
 
-				while(($data = fgetcsv($handle)) !== FALSE) 
+				while(($data = fgetcsv($handle)) !== FALSE)
 				{
 					// XSS file data sanity check
 					$data = $this->xss_clean($data);
 
-					if(sizeof($data) >= 15)
+					$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'			=> $data[3],
-							'phone_number'	=> $data[4],
-							'address_1'		=> $data[5],
-							'address_2'		=> $data[6],
-							'city'			=> $data[7],
-							'state'			=> $data[8],
-							'zip'			=> $data[9],
-							'country'		=> $data[10],
-							'comments'		=> $data[11]
+							'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(
-							'company_name'		=> $data[12],
-							'discount_percent'	=> $data[14],
-							'taxable'			=> $data[15] == '' ? 0 : 1
+							'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[13];
-						$invalidated = FALSE;
-						if($account_number != '') 
+						$account_number = $data[14];
+
+						// don't duplicate people with same email
+						$invalidated = $this->Customer->check_email_exists($email);
+
+						if($account_number != '')
 						{
 							$customer_data['account_number'] = $account_number;
-							$invalidated = $this->Customer->account_number_exists($account_number);
+							$invalidated &= $this->Customer->check_account_number_exists($account_number);
 						}
 					}
-					else 
+					else
 					{
 						$invalidated = TRUE;
 					}
 
-					if($invalidated || !$this->Customer->save_customer($person_data, $customer_data))
-					{	
+					if($invalidated)
+					{
 						$failCodes[] = $i;
 					}
-					
+					elseif($this->Customer->save_customer($person_data, $customer_data))
+					{
+						// save customer to Mailchimp selected list
+						$this->mailchimp_lib->addOrUpdateMember($this->_list_id, $person_data['email'], $person_data['first_name'], '', $person_data['last_name']);
+					}
+					else
+					{
+						$failCodes[] = $i;
+					}
+
 					++$i;
 				}
-				
+
 				if(count($failCodes) > 0)
 				{
-					$message = $this->lang->line('customers_excel_import_partially_failed') . ' (' . count($failCodes) . '): ' . implode(', ', $failCodes);
-					
+					$message = $this->lang->line('customers_csv_import_partially_failed') . ' (' . count($failCodes) . '): ' . implode(', ', $failCodes);
+
 					echo json_encode(array('success' => FALSE, 'message' => $message));
 				}
 				else
 				{
-					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_excel_import_success')));
+					echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('customers_csv_import_success')));
 				}
 			}
-			else 
+			else
 			{
-                echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_excel_import_nodata_wrongformat')));
+				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('customers_csv_import_nodata_wrongformat')));
 			}
 		}
 	}
 }
-?>
+?>

application/controllers/Employees.php

@@ -8,14 +8,7 @@ class Employees extends Persons
 	{
 		parent::__construct('employees');
 	}
-	
-	public function index()
-	{
-		$data['table_headers'] = $this->xss_clean(get_people_manage_table_headers());
 
-		$this->load->view('people/manage', $data);
-	}
-	
 	/*
 	Returns employee table data rows. This will be called with AJAX.
 	*/
@@ -24,7 +17,7 @@ class Employees extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$employees = $this->Employee->search($search, $limit, $offset, $sort, $order);
@@ -33,24 +26,29 @@ class Employees extends Persons
 		$data_rows = array();
 		foreach($employees->result() as $person)
 		{
-			$data_rows[] = get_person_data_row($person, $this);
+			$data_rows[] = $this->xss_clean(get_person_data_row($person));
 		}
 
-		$data_rows = $this->xss_clean($data_rows);
-
 		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->Employee->get_search_suggestions($this->input->get('term'), TRUE));
+
+		echo json_encode($suggestions);
+	}
+
 	public function suggest_search()
 	{
 		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->post('term')));
 
 		echo json_encode($suggestions);
 	}
-	
+
 	/*
 	Loads the employee edit form
 	*/
@@ -62,13 +60,15 @@ class Employees extends Persons
 			$person_info->$property = $this->xss_clean($value);
 		}
 		$data['person_info'] = $person_info;
+		$data['employee_id'] = $employee_id;
 
 		$modules = array();
 		foreach($this->Module->get_all_modules()->result() 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));
+
 			$modules[] = $module;
 		}
 		$data['all_modules'] = $modules;
@@ -77,26 +77,34 @@ class Employees extends Persons
 		foreach($this->Module->get_all_subpermissions()->result() as $permission)
 		{
 			$permission->module_id = $this->xss_clean($permission->module_id);
-			$permission->permission_id = $this->xss_clean($permission->permission_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));
-			
+
 			$permissions[] = $permission;
 		}
 		$data['all_subpermissions'] = $permissions;
 
-		$this->load->view("employees/form", $data);
+		$this->load->view('employees/form', $data);
 	}
-	
+
 	/*
 	Inserts/updates an employee
 	*/
 	public function save($employee_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' => $this->input->post('first_name'),
-			'last_name' => $this->input->post('last_name'),
+			'first_name' => $first_name,
+			'last_name' => $last_name,
 			'gender' => $this->input->post('gender'),
-			'email' => $this->input->post('email'),
+			'email' => $email,
 			'phone_number' => $this->input->post('phone_number'),
 			'address_1' => $this->input->post('address_1'),
 			'address_2' => $this->input->post('address_2'),
@@ -106,48 +114,66 @@ class Employees extends Persons
 			'country' => $this->input->post('country'),
 			'comments' => $this->input->post('comments'),
 		);
-		$grants_data = $this->input->post('grants') != NULL ? $this->input->post('grants') : array();
-		
-		//Password has been changed OR first time password set
-		if($this->input->post('password') != '')
+
+		$grants_array = array();
+		foreach($this->Module->get_all_permissions()->result() as $permission)
 		{
+			$grants = array();
+			$grant = $this->input->post('grant_'.$permission->permission_id) != NULL ? $this->input->post('grant_'.$permission->permission_id) : '';
+			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_array[] = $grants;
+			}
+		}
+
+		//Password has been changed OR first time password set
+		if($this->input->post('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),
-				'hash_version' => 2
+				'username' 	=> $this->input->post('username'),
+				'password' 	=> password_hash($this->input->post('password'), PASSWORD_DEFAULT),
+				'hash_version' 	=> 2,
+				'language_code' => $exploded[0],
+				'language' 	=> $exploded[1]
 			);
 		}
 		else //Password not changed
 		{
-			$employee_data = array('username' => $this->input->post('username'));
+			$exploded = explode(":", $this->input->post('language'));
+			$employee_data = array(
+				'username' 	=> $this->input->post('username'),
+				'language_code'	=> $exploded[0],
+				'language' 	=> $exploded[1]
+			);
 		}
-		
-		if($this->Employee->save_employee($person_data, $employee_data, $grants_data, $employee_id))
-		{
-			$person_data = $this->xss_clean($person_data);
-			$employee_data = $this->xss_clean($employee_data);
 
-			//New employee
+		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').' '.
-								$person_data['first_name'].' '.$person_data['last_name'], 'id' => $employee_data['person_id']));
+				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'])));
 			}
-			else //Existing employee
+			else // Existing employee
 			{
-				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('employees_successful_updating').' '.
-								$person_data['first_name'].' '.$person_data['last_name'], 'id' => $employee_id));
+				echo json_encode(array('success' => TRUE,
+								'message' => $this->lang->line('employees_successful_updating') . ' ' . $first_name . ' ' . $last_name,
+								'id' => $employee_id));
 			}
 		}
-		else//failure
+		else // Failure
 		{
-			$person_data = $this->xss_clean($person_data);
-
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_error_adding_updating').' '.
-							$person_data['first_name'].' '.$person_data['last_name'], 'id' => -1));
+			echo json_encode(array('success' => FALSE,
+							'message' => $this->lang->line('employees_error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
+							'id' => -1));
 		}
 	}
-	
+
 	/*
 	This deletes employees from the employees table
 	*/
@@ -157,13 +183,19 @@ class Employees extends Persons
 
 		if($this->Employee->delete_list($employees_to_delete))
 		{
-			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(array('success' => TRUE,'message' => $this->lang->line('employees_successful_deleted') . ' ' .
+							count($employees_to_delete) . ' ' . $this->lang->line('employees_one_or_multiple')));
 		}
 		else
 		{
-			echo json_encode(array('success' => FALSE,'message' => $this->lang->line('employees_cannot_be_deleted')));
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_cannot_be_deleted')));
 		}
 	}
+
+	public function check_username($employee_id)
+	{
+		$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
+		echo !$exists ? 'true' : 'false';
+	}
 }
-?>
+?>

application/controllers/Expenses.php

@@ -0,0 +1,183 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Expenses extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('expenses');
+	}
+
+	public function index()
+	{
+		$data['table_headers'] = $this->xss_clean(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'));
+
+		$this->load->view('expenses/manage', $data);
+	}
+
+	public function search()
+	{
+		$payments = 0;
+		$search   = $this->input->get('search');
+		$limit    = $this->input->get('limit');
+		$offset   = $this->input->get('offset');
+		$sort     = $this->input->post('sort') === NULL ? 'expense_id' : $this->db->escape($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);
+
+		// check if any filter is set in the multiselect dropdown
+		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
+		$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);
+		$payment_summary = get_expenses_manage_payments_summary($payments, $expenses);
+		$data_rows = array();
+		foreach($expenses->result() as $expense)
+		{
+			$data_rows[] = $this->xss_clean(get_expenses_data_row($expense));
+		}
+
+		if($total_rows > 0)
+		{
+			$data_rows[] = $this->xss_clean(get_expenses_data_last_row($expenses));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary));
+	}
+
+	public function view($expense_id = -1)
+	{
+		$data = array();
+
+		$data['employees'] = array();
+		foreach($this->Employee->get_all()->result() as $employee)
+		{
+			foreach(get_object_vars($employee) as $property => $value)
+			{
+				$employee->$property = $this->xss_clean($value);
+			}
+
+			$data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+		}
+
+		$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[$row['expense_category_id']] = $row['category_name'];
+		}
+		$data['expense_categories'] = $expense_categories;
+
+		$expense_id = $data['expenses_info']->expense_id;
+
+		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['payments'] = array();
+		foreach($this->Expense->get_expense_payment($expense_id)->result() as $payment)
+		{
+			foreach(get_object_vars($payment) as $property => $value)
+			{
+				$payment->$property = $this->xss_clean($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));
+
+		$this->load->view("expenses/form", $data);
+	}
+
+	public function get_row($row_id)
+	{
+		$expense_info = $this->Expense->get_info($row_id);
+		$data_row = $this->xss_clean(get_expenses_data_row($expense_info));
+
+		echo json_encode($data_row);
+	}
+
+	public function save($expense_id = -1)
+	{
+		$newdate = $this->input->post('date');
+
+		$date_formatter = date_create_from_format($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), $newdate);
+
+		$expense_data = array(
+			'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
+		);
+
+		if($this->Expense->save($expense_data, $expense_id))
+		{
+			$expense_data = $this->xss_clean($expense_data);
+
+			//New expense_id
+			if($expense_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('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));
+			}
+		}
+		else//failure
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_error_adding_updating'), 'id' => -1));
+		}
+	}
+
+	public function ajax_check_amount()
+	{
+		$value = $this->input->post();
+		$parsed_value = parse_decimals(array_pop($value));
+		echo json_encode(array('success' => $parsed_value !== FALSE));
+	}
+
+	public function delete()
+	{
+		$expenses_to_delete = $this->input->post('ids');
+
+		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));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_cannot_be_deleted'), 'ids' => $expenses_to_delete));
+		}
+	}
+}
+?>

application/controllers/Expenses_categories.php

@@ -0,0 +1,97 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Expenses_categories extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('expenses_categories');
+	}
+
+	public function index()
+	{
+		 $data['table_headers'] = $this->xss_clean(get_expense_category_manage_table_headers());
+
+		 $this->load->view('expenses_categories/manage', $data);
+	}
+
+	/*
+	Returns expense_category_manage 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->post('sort') === NULL ? 'category_name' : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
+
+		$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[] = $this->xss_clean(get_expense_category_data_row($expense_category));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function get_row($row_id)
+	{
+		$data_row = $this->xss_clean(get_expense_category_data_row($this->Expense_category->get_info($row_id)));
+
+		echo json_encode($data_row);
+	}
+
+	public function view($expense_category_id = -1)
+	{
+		$data['category_info'] = $this->Expense_category->get_info($expense_category_id);
+
+		$this->load->view("expenses_categories/form", $data);
+	}
+
+	public function save($expense_category_id = -1)
+	{
+		$expense_category_data = array(
+			'category_name' => $this->input->post('category_name'),
+			'category_description' => $this->input->post('category_description')
+		);
+
+		if($this->Expense_category->save($expense_category_data, $expense_category_id))
+		{
+			$expense_category_data = $this->xss_clean($expense_category_data);
+
+			// New expense_category_id
+			if($expense_category_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('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));
+			}
+		}
+		else//failure
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_categories_error_adding_updating') . ' ' . $expense_category_data['category_name'], 'id' => -1));
+		}
+	}
+
+	public function delete()
+	{
+		$expense_category_to_delete = $this->input->post('ids');
+
+		if($this->Expense_category->delete_list($expense_category_to_delete))
+		{
+			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')));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('expenses_categories_cannot_be_deleted')));
+		}
+	}
+}
+?>

application/controllers/Giftcards.php

@@ -24,7 +24,7 @@ class Giftcards extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? 'giftcard_number' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$giftcards = $this->Giftcard->search($search, $limit, $offset, $sort, $order);
@@ -33,17 +33,23 @@ class Giftcards extends Secure_Controller
 		$data_rows = array();
 		foreach($giftcards->result() as $giftcard)
 		{
-			$data_rows[] = get_giftcard_data_row($giftcard, $this);
+			$data_rows[] = $this->xss_clean(get_giftcard_data_row($giftcard));
 		}
 
-		$data_rows = $this->xss_clean($data_rows);
-
 		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')));
@@ -53,7 +59,7 @@ class Giftcards extends Secure_Controller
 
 	public function get_row($row_id)
 	{
-		$data_row = $this->xss_clean(get_giftcard_data_row($this->Giftcard->get_info($row_id), $this));
+		$data_row = $this->xss_clean(get_giftcard_data_row($this->Giftcard->get_info($row_id)));
 
 		echo json_encode($data_row);
 	}
@@ -63,38 +69,53 @@ class Giftcards extends Secure_Controller
 		$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;
-		$data['giftcard_number']      = $giftcard_id > 0 ? $giftcard_info->giftcard_number : $this->Giftcard->get_max_number()->giftcard_number + 1;
-		$data['giftcard_id']          = $giftcard_id;
-		$data['giftcard_value']       = $giftcard_info->value;
+		$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' => $this->input->post('giftcard_number'),
-			'value' => parse_decimals($this->input->post('value')),
+			'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').' '.
+				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').' '.
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('giftcards_successful_updating') . ' ' .
 								$giftcard_data['giftcard_number'], 'id' => $giftcard_id));
 			}
 		}
@@ -102,18 +123,24 @@ class Giftcards extends Secure_Controller
 		{
 			$giftcard_data = $this->xss_clean($giftcard_data);
 			
-			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('giftcards_error_adding_updating').' '.
+			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').' '.
+			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

application/controllers/Home.php

@@ -6,19 +6,67 @@ class Home extends Secure_Controller
 {
 	public function __construct()
 	{
-		parent::__construct();	
+		parent::__construct(NULL, NULL, 'home');
 	}
 
 	public function index()
 	{
-		$this->load->view('home');
+		$this->load->view('home/home');
 	}
 
 	public function logout()
 	{
-		$this->track_page('logout', 'logout');
-
 		$this->Employee->logout();
 	}
+
+	/*
+	Load "change employee password" form
+	*/
+	public function change_password($employee_id = -1)
+	{
+		$person_info = $this->Employee->get_info($employee_id);
+		foreach(get_object_vars($person_info) as $property => $value)
+		{
+			$person_info->$property = $this->xss_clean($value);
+		}
+		$data['person_info'] = $person_info;
+
+		$this->load->view('home/form_change_password', $data);
+	}
+
+	/*
+	Change employee password
+	*/
+	public function save($employee_id = -1)
+	{
+		if($this->input->post('current_password') != '' && $employee_id != -1)
+		{
+			if($this->Employee->check_password($this->input->post('username'), $this->input->post('current_password')))
+			{
+				$employee_data = array(
+					'username' => $this->input->post('username'),
+					'password' => password_hash($this->input->post('password'), PASSWORD_DEFAULT),
+					'hash_version' => 2
+				);
+
+				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));
+				}
+				else//failure
+				{
+					echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_unsuccessful_change_password'), 'id' => -1));
+				}
+			}
+			else
+			{
+				echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_current_password_invalid'), 'id' => -1));
+			}
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_current_password_invalid'), 'id' => -1));
+		}
+	}
 }
-?>
+?>

application/controllers/Item_kits.php

@@ -14,9 +14,12 @@ class Item_kits extends Secure_Controller
 	*/
 	private function _add_totals_to_item_kit($item_kit)
 	{
+		$kit_item_info = $this->Item->get_info(isset($item_kit->kit_item_id) ? $item_kit->kit_item_id : $item_kit->item_id);
+
 		$item_kit->total_cost_price = 0;
-		$item_kit->total_unit_price = 0;
-		
+		$item_kit->total_unit_price = (float)$kit_item_info->unit_price;
+		$total_quantity = 0;
+
 		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']);
@@ -24,11 +27,20 @@ class Item_kits extends Secure_Controller
 			{
 				$item_info->$property = $this->xss_clean($value);
 			}
-			
+
 			$item_kit->total_cost_price += $item_info->cost_price * $item_kit_item['quantity'];
-			$item_kit->total_unit_price += $item_info->unit_price * $item_kit_item['quantity'];
+
+			if($item_kit->price_option == PRICE_OPTION_ALL || ($item_kit->price_option == PRICE_OPTION_KIT_STOCK && $item_info->stock_type == HAS_STOCK ))
+			{
+				$item_kit->total_unit_price += $item_info->unit_price * $item_kit_item['quantity'];
+				$total_quantity += $item_kit_item['quantity'];
+			}
 		}
 
+		$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;
 	}
 	
@@ -47,7 +59,7 @@ class Item_kits extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$item_kits = $this->Item_kit->search($search, $limit, $offset, $sort, $order);
@@ -58,11 +70,9 @@ class Item_kits extends Secure_Controller
 		{
 			// 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[] = get_item_kit_data_row($item_kit, $this);
+			$data_rows[] = $this->xss_clean(get_item_kit_data_row($item_kit));
 		}
 
-		$data_rows = $this->xss_clean($data_rows);
-
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
 
@@ -77,30 +87,44 @@ class Item_kits extends Secure_Controller
 	{
 		// 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, $this));
+
+		echo json_encode(get_item_kit_data_row($item_kit));
 	}
 	
 	public function view($item_kit_id = -1)
 	{
 		$info = $this->Item_kit->get_info($item_kit_id);
+
+		if($item_kit_id == -1)
+		{
+			$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);
 		}
+
 		$data['item_kit_info']  = $info;
-		
+
 		$items = array();
 		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']);
-			
+
 			$items[] = $item;
 		}
+
 		$data['item_kit_items'] = $items;
 
+		$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);
 	}
 	
@@ -108,36 +132,55 @@ class Item_kits extends Secure_Controller
 	{
 		$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')
 		);
 		
 		if($this->Item_kit->save($item_kit_data, $item_kit_id))
 		{
-			$success = TRUE;
+			$new_item = FALSE;
 			//New item kit
-			if ($item_kit_id == -1)
+			if($item_kit_id == -1)
 			{
 				$item_kit_id = $item_kit_data['item_kit_id'];
+				$new_item = TRUE;
 			}
 
-			if($this->input->post('item_kit_item') != NULL)
+			if($this->input->post('item_kit_qty') != NULL)
 			{
 				$item_kit_items = array();
-				foreach($this->input->post('item_kit_item') as $item_id => $quantity)
+				foreach($this->input->post('item_kit_qty') as $item_id => $quantity)
 				{
+					$seq = $this->input->post('item_kit_seq[' . $item_id . ']');
 					$item_kit_items[] = array(
 						'item_id' => $item_id,
-						'quantity' => $quantity
+						'quantity' => $quantity,
+						'kit_sequence' => $seq
 					);
 				}
 
-				$success = $this->Item_kit_items->save($item_kit_items, $item_kit_id);
 			}
 
+			$success = $this->Item_kit_items->save($item_kit_items, $item_kit_id);
+
 			$item_kit_data = $this->xss_clean($item_kit_data);
 
-			echo json_encode(array('success' => $success,
-								'message' => $this->lang->line('item_kits_successful_adding').' '.$item_kit_data['name'], 'id' => $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));
+
+			}
+			else
+			{
+				echo json_encode(array('success' => $success,
+					'message' => $this->lang->line('item_kits_successful_updating').' '.$item_kit_data['name'], 'id' => $item_kit_id));
+			}
 		}
 		else//failure
 		{
@@ -163,6 +206,12 @@ class Item_kits extends Secure_Controller
 								'message' => $this->lang->line('item_kits_cannot_be_deleted')));
 		}
 	}
+
+	public function check_item_number()
+	{
+		$exists = $this->Item_kit->item_number_exists($this->input->post('item_kit_number'), $this->input->post('item_kit_id'));
+		echo !$exists ? 'true' : 'false';
+	}
 	
 	public function generate_barcodes($item_kit_ids)
 	{
@@ -182,7 +231,7 @@ class Item_kits extends Secure_Controller
 		}
 
 		$data['items'] = $result;
-        $barcode_config = $this->barcode_lib->get_barcode_config();
+		$barcode_config = $this->barcode_lib->get_barcode_config();
 		// in case the selected barcode type is not Code39 or Code128 we set by default Code128
 		// the rationale for this is that EAN codes cannot have strings as seed, so 'KIT ' is not allowed
 		if($barcode_config['barcode_type'] != 'Code39' && $barcode_config['barcode_type'] != 'Code128')
@@ -195,4 +244,4 @@ class Item_kits extends Secure_Controller
 		$this->load->view("barcodes/barcode_sheet", $data);
 	}
 }
-?>
+?>

application/controllers/Login.php

@@ -1,47 +1,32 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-class Login extends CI_Controller 
+class Login extends CI_Controller
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
 	public function index()
 	{
+		$this->load->library('migration');
 		if($this->Employee->is_logged_in())
 		{
 			redirect('home');
 		}
 		else
 		{
-			$this->form_validation->set_rules('username', 'lang:login_undername', 'callback_login_check');
 			$this->form_validation->set_error_delimiters('<div class="error">', '</div>');
-			
+
+			$this->form_validation->set_rules('username', 'lang:login_username', 'required|callback_login_check');
+
+
+			if($this->config->item('gcaptcha_enable'))
+			{
+				$this->form_validation->set_rules('g-recaptcha-response', 'lang:login_gcaptcha', 'required|callback_gcaptcha_check');
+			}
+
 			if($this->form_validation->run() == FALSE)
 			{
 				$this->load->view('login');
 			}
 			else
 			{
-				if($this->config->item('statistics'))
-				{
-					$this->load->library('tracking_lib');
-					
-					$this->tracking_lib->track_page('login', 'login');
-					
-					$this->tracking_lib->track_event('Stats', 'Theme', $this->config->item('theme'));
-					$this->tracking_lib->track_event('Stats', 'Language', $this->config->item('language'));
-					$this->tracking_lib->track_event('Stats', 'Timezone', $this->config->item('timezone'));
-					$this->tracking_lib->track_event('Stats', 'Currency', $this->config->item('currency_symbol'));
-					$this->tracking_lib->track_event('Stats', 'Tax Included', $this->config->item('tax_included'));
-					$this->tracking_lib->track_event('Stats', 'Thousands Separator', $this->config->item('thousands_separator'));
-					$this->tracking_lib->track_event('Stats', 'Currency Decimals', $this->config->item('currency_decimals'));
-					$this->tracking_lib->track_event('Stats', 'Tax Decimals', $this->config->item('tax_decimals'));
-					$this->tracking_lib->track_event('Stats', 'Quantity Decimals', $this->config->item('quantity_decimals'));
-					$this->tracking_lib->track_event('Stats', 'Invoice Enable', $this->config->item('invoice_enable'));
-				}
-
 				redirect('home');
 			}
 		}
@@ -51,13 +36,20 @@ class Login extends CI_Controller
 	{
 		$password = $this->input->post('password');
 
-		if($this->_security_check($username, $password))
+		if(!$this->_installation_check())
 		{
-			$this->form_validation->set_message('login_check', 'Security check failure');
+			$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();
+		}
+
 		if(!$this->Employee->login($username, $password))
 		{
 			$this->form_validation->set_message('login_check', $this->lang->line('login_invalid_username_and_password'));
@@ -65,12 +57,53 @@ class Login extends CI_Controller
 			return FALSE;
 		}
 
-		return TRUE;		
+		return TRUE;
 	}
-	
-	private function _security_check($username, $password)
+
+	public function gcaptcha_check($recaptchaResponse)
 	{
-		return preg_match('~\b(Copyright|(c)|<7C>|All rights reserved|Developed|Crafted|Implemented|Made|Powered|Code|Design|unblockUI|blockUI|blockOverlay|hide|opacity)\b~i', file_get_contents(APPPATH . 'views/partial/footer.php'));
+		$url = 'https://www.google.com/recaptcha/api/siteverify?secret=' . $this->config->item('gcaptcha_secret_key') . '&response=' . $recaptchaResponse . '&remoteip=' . $this->input->ip_address();
+
+		$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']))
+		{
+			$this->form_validation->set_message('gcaptcha_check', $this->lang->line('login_invalid_gcaptcha'));
+
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	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;
 	}
 }
 ?>

application/controllers/No_access.php

@@ -2,11 +2,6 @@
 
 class No_Access extends CI_Controller 
 {
-	public function __construct()
-	{
-		parent::__construct();
-	}
-	
 	public function index($module_id = '', $permission_id = '')
 	{
 		$data['module_name']   = $this->Module->get_module_name($module_id);
@@ -17,4 +12,4 @@ class No_Access extends CI_Controller
 		$this->load->view('no_access', $data);
 	}
 }
-?>
+?>

application/controllers/Office.php

@@ -0,0 +1,22 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Office extends Secure_Controller
+{
+	function __construct()
+	{
+		parent::__construct('office', NULL, 'office');
+	}
+
+	public function index()
+	{
+		$this->load->view('home/office');
+	}
+
+	public function logout()
+	{
+		$this->Employee->logout();
+	}
+}
+?>

application/controllers/Persons.php

@@ -6,9 +6,16 @@ abstract class Persons extends Secure_Controller
 {
 	public function __construct($module_id = NULL)
 	{
-		parent::__construct($module_id);		
+		parent::__construct($module_id);
 	}
-	
+
+	public function index()
+	{
+		$data['table_headers'] = $this->xss_clean(get_people_manage_table_headers());
+
+		$this->load->view('people/manage', $data);
+	}
+
 	/*
 	 Gives search suggestions based on what is being searched for
 	*/
@@ -18,15 +25,31 @@ abstract class Persons extends Secure_Controller
 
 		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)
 	{
-		$data_row = $this->xss_clean(get_person_data_row($this->Person->get_info($row_id), $this));
+		$data_row = $this->xss_clean(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)
+	{
+		return str_name_case($string);
+	}
 }
-?>
+?>

application/controllers/Receivings.php

@@ -9,6 +9,7 @@ class Receivings extends Secure_Controller
 		parent::__construct('receivings');
 
 		$this->load->library('receiving_lib');
+		$this->load->library('token_lib');
 		$this->load->library('barcode_lib');
 	}
 
@@ -27,6 +28,16 @@ class Receivings extends Secure_Controller
 		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');
@@ -80,8 +91,11 @@ class Receivings extends Secure_Controller
 
 		$mode = $this->receiving_lib->get_mode();
 		$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
-		$quantity = ($mode == 'receive' || $mode == 'requisition') ? 1 : -1;
+		$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))
 		{
@@ -89,9 +103,9 @@ class Receivings extends Secure_Controller
 		}
 		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);
+			$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))
+		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');
 		}
@@ -110,13 +124,15 @@ class Receivings extends Secure_Controller
 		$description = $this->input->post('description');
 		$serialnumber = $this->input->post('serialnumber');
 		$price = parse_decimals($this->input->post('price'));
-		$quantity = parse_decimals($this->input->post('quantity'));
-		$discount = parse_decimals($this->input->post('discount'));
-		$item_location = $this->input->post('location');
+		$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, $price);
+			$this->receiving_lib->edit_item($item_id, $description, $serialnumber, $quantity, $discount, $discount_type, $price, $receiving_quantity);
 		}
 		else
 		{
@@ -137,7 +153,7 @@ class Receivings extends Secure_Controller
 		}
 	
 		$data['employees'] = array();
-		foreach ($this->Employee->get_all()->result() as $employee)
+		foreach($this->Employee->get_all()->result() as $employee)
 		{
 			$data['employees'][$employee->person_id] = $this->xss_clean($employee->first_name . ' '. $employee->last_name);
 		}
@@ -187,8 +203,7 @@ class Receivings extends Secure_Controller
 		
 		$data['cart'] = $this->receiving_lib->get_cart();
 		$data['total'] = $this->receiving_lib->get_total();
-		$data['receipt_title'] = $this->lang->line('receivings_receipt');
-		$data['transaction_time'] = date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'));
+		$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();
@@ -253,8 +268,8 @@ class Receivings extends Secure_Controller
 			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());
-				$this->receiving_lib->add_item($item['item_id'], -$item['quantity'], $this->receiving_lib->get_stock_source());
+				$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();
@@ -274,8 +289,7 @@ class Receivings extends Secure_Controller
 		$data['cart'] = $this->receiving_lib->get_cart();
 		$data['total'] = $this->receiving_lib->get_total();
 		$data['mode'] = $this->receiving_lib->get_mode();
-		$data['receipt_title'] = $this->lang->line('receivings_receipt');
-		$data['transaction_time'] = date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time']));
+		$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();
@@ -364,15 +378,17 @@ class Receivings extends Secure_Controller
 		$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' => $date_formatter->format('Y-m-d H:i:s'),
+			'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));

application/controllers/Secure_Controller.php

@@ -6,7 +6,7 @@ class Secure_Controller extends CI_Controller
 	* 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)
+	public function __construct($module_id = NULL, $submodule_id = NULL, $menu_group = NULL)
 	{
 		parent::__construct();
 		
@@ -18,8 +18,6 @@ class Secure_Controller extends CI_Controller
 			redirect('login');
 		}
 
-		$this->track_page($module_id, $module_id);
-
 		$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)))
@@ -28,7 +26,31 @@ class Secure_Controller extends CI_Controller
 		}
 
 		// load up global data visible to all the loaded views
-		$data['allowed_modules'] = $this->Module->get_allowed_modules($logged_in_employee_info->person_id);
+
+		$this->load->library('session');
+		if($menu_group == NULL)
+		{
+			$menu_group = $this->session->userdata('menu_group');
+		}
+		else
+		{
+			$this->session->set_userdata('menu_group', $menu_group);
+		}
+
+		if($menu_group == 'home')
+		{
+			$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);
+		}
+
+		foreach($allowed_modules->result() as $module)
+		{
+			$data['allowed_modules'][] = $module;
+		}
+
 		$data['user_info'] = $logged_in_employee_info;
 		$data['controller_name'] = $module_id;
 
@@ -53,32 +75,6 @@ class Secure_Controller extends CI_Controller
 		}
 	}
 
-	protected function track_page($path, $page)
-	{
-		if(get_instance()->Appconfig->get('statistics'))
-		{
-			$this->load->library('tracking_lib');
-
-			if(empty($path))
-			{
-				$path = 'home';
-				$page = 'home';
-			}
-
-			$this->tracking_lib->track_page('controller/' . $path, $page);
-		}
-	}
-
-	protected function track_event($category, $action, $label, $value = NULL)
-	{
-		if(get_instance()->Appconfig->get('statistics'))
-		{
-			$this->load->library('tracking_lib');
-
-			$this->tracking_lib->track_event($category, $action, $label, $value);
-		}
-	}
-
 	public function numeric($str)
 	{
 		return parse_decimals($str);
@@ -90,13 +86,12 @@ class Secure_Controller extends CI_Controller
 
 		foreach($this->input->get() as $str)
 		{
-			$result = parse_decimals($str);
+			$result &= parse_decimals($str);
 		}
 
 		echo $result !== FALSE ? 'true' : 'false';
 	}
 
-
 	// this is the basic set of methods most OSPOS Controllers will implement
 	public function index() { return FALSE; }
 	public function search() { return FALSE; }
@@ -104,6 +99,5 @@ class Secure_Controller extends CI_Controller
 	public function view($data_item_id = -1) { return FALSE; }
 	public function save($data_item_id = -1) { return FALSE; }
 	public function delete() { return FALSE; }
-
 }
-?>
+?>

application/controllers/Suppliers.php

@@ -8,20 +8,21 @@ class Suppliers extends Persons
 	{
 		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), $this));
+		$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);
 	}
@@ -34,7 +35,7 @@ class Suppliers extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$suppliers = $this->Supplier->search($search, $limit, $offset, $sort, $order);
@@ -43,11 +44,11 @@ class Suppliers extends Persons
 		$data_rows = array();
 		foreach($suppliers->result() as $supplier)
 		{
-			$data_rows[] = get_supplier_data_row($supplier, $this);
+			$row = $this->xss_clean(get_supplier_data_row($supplier));
+			$row['category'] = $this->Supplier->get_category_name($row['category']);
+			$data_rows[] = $row;
 		}
 
-		$data_rows = $this->xss_clean($data_rows);
-
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
 	
@@ -79,6 +80,7 @@ class Suppliers extends Persons
 			$info->$property = $this->xss_clean($value);
 		}
 		$data['person_info'] = $info;
+		$data['categories'] = $this->Supplier->get_categories();
 
 		$this->load->view("suppliers/form", $data);
 	}
@@ -88,11 +90,19 @@ class Suppliers extends Persons
 	*/
 	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' => $this->input->post('first_name'),
-			'last_name' => $this->input->post('last_name'),
+			'first_name' => $first_name,
+			'last_name' => $last_name,
 			'gender' => $this->input->post('gender'),
-			'email' => $this->input->post('email'),
+			'email' => $email,
 			'phone_number' => $this->input->post('phone_number'),
 			'address_1' => $this->input->post('address_1'),
 			'address_2' => $this->input->post('address_2'),
@@ -102,10 +112,13 @@ class Suppliers extends Persons
 			'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'),
-			'account_number' => $this->input->post('account_number') == '' ? NULL : $this->input->post('account_number')
+			'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))
@@ -115,21 +128,24 @@ class Suppliers extends Persons
 			//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']));
+				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));
+				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));
+			echo json_encode(array('success' => FALSE,
+							'message' => $this->lang->line('suppliers_error_adding_updating') . ' ' . 	$supplier_data['company_name'],
+							'id' => -1));
 		}
 	}
 	
@@ -152,4 +168,4 @@ class Suppliers extends Persons
 	}
 	
 }
-?>
+?>

application/controllers/Tax_categories.php

@@ -0,0 +1,100 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Tax_categories extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('tax_categories');
+	}
+
+
+	public function index()
+	{
+		 $data['tax_categories_table_headers'] = $this->xss_clean(get_tax_categories_table_headers());
+
+		 $this->load->view('taxes/tax_categories', $data);
+	}
+
+	/*
+	 * Returns tax_category 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->post('sort') === NULL ? 'tax_category' : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
+
+		$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[] = $this->xss_clean(get_tax_category_data_row($tax_category));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function get_row($row_id)
+	{
+		$data_row = $this->xss_clean(get_tax_category_data_row($this->Tax_category->get_info($row_id)));
+
+		echo json_encode($data_row);
+	}
+
+	public function view($tax_category_id = -1)
+	{
+		$data['tax_category_info'] = $this->Tax_category->get_info($tax_category_id);
+
+		$this->load->view("taxes/tax_category_form", $data);
+	}
+
+
+	public function save($tax_category_id = -1)
+	{
+		$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')
+		);
+
+		if($this->Tax_category->save($tax_category_data, $tax_category_id))
+		{
+			$tax_category_data = $this->xss_clean($tax_category_data);
+
+			// New tax_category_id
+			if($tax_category_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_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));
+			}
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_categories_error_adding_updating') . ' ' . $tax_category_data['tax_category'], 'id' => -1));
+		}
+	}
+
+	public function delete()
+	{
+		$tax_categories_to_delete = $this->input->post('ids');
+
+		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')));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_categories_cannot_be_deleted')));
+		}
+	}
+}
+?>

application/controllers/Tax_codes.php

@@ -0,0 +1,104 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Tax_codes extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('tax_codes');
+	}
+
+
+	public function index()
+	{
+		 $this->load->view('taxes/tax_codes',get_data());
+	}
+
+	public function get_data()
+	{
+		$data['table_headers'] = $this->xss_clean(get_tax_codes_table_headers());
+		return $data;
+	}
+
+	/*
+	 * Returns tax_category 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->post('sort') === NULL ? 'tax_code_name' : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
+
+		$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[] = $this->xss_clean(get_tax_code_data_row($tax_code));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function get_row($row_id)
+	{
+		$data_row = $this->xss_clean(get_tax_code_data_row($this->Tax_code->get_info($row_id)));
+
+		echo json_encode($data_row);
+	}
+
+	public function view($tax_code_id = -1)
+	{
+		$data['tax_code_info'] = $this->Tax_code->get_info($tax_code_id);
+
+		$this->load->view("taxes/tax_code_form", $data);
+	}
+
+
+	public function save($tax_code_id = -1)
+	{
+		$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')
+		);
+
+		if($this->Tax_code->save($tax_code_data))
+		{
+			$tax_code_data = $this->xss_clean($tax_code_data);
+
+			if($tax_code_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_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));
+			}
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_codes_error_adding_updating') . ' ' . $tax_code_data['tax_code_id'], 'id' => -1));
+		}
+	}
+
+	public function delete()
+	{
+		$tax_codes_to_delete = $this->input->post('ids');
+
+		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')));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_codes_cannot_be_deleted')));
+		}
+	}
+}
+?>

application/controllers/Tax_jurisdictions.php

@@ -0,0 +1,98 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+class Tax_jurisdictions extends Secure_Controller
+{
+	public function __construct()
+	{
+		parent::__construct('tax_jurisdictions');
+	}
+
+
+	public function index()
+	{
+		 $data['table_headers'] = $this->xss_clean(get_tax_jurisdictions_table_headers());
+
+		 $this->load->view('taxes/tax_jurisdictions', $data);
+	}
+
+	/*
+	 * Returns tax_category 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->post('sort') === NULL ? 'jurisdiction_name' : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
+
+		$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[] = $this->xss_clean(get_tax_jurisdiction_data_row($tax_jurisdiction));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	public function get_row($row_id)
+	{
+		$data_row = $this->xss_clean(get_tax_jurisdiction_data_row($this->Tax_jurisdiction->get_info($row_id)));
+
+		echo json_encode($data_row);
+	}
+
+	public function view($tax_jurisdiction_id = -1)
+	{
+		$data['tax_jurisdiction_info'] = $this->Tax_jurisdiction->get_info($tax_jurisdiction_id);
+
+		$this->load->view("taxes/tax_jurisdiction_form", $data);
+	}
+
+
+	public function save($jurisdiction_id = -1)
+	{
+		$tax_jurisdiction_data = array(
+			'jurisdiction_name' => $this->input->post('jurisdiction_name'),
+			'reporting_authority' => $this->input->post('reporting_authority')
+		);
+
+		if($this->Tax_jurisdiction->save($tax_jurisdiction_data))
+		{
+			$tax_jurisdiction_data = $this->xss_clean($tax_jurisdiction_data);
+
+			if($jurisdiction_id == -1)
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_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));
+			}
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_jurisdictions_error_adding_updating') . ' ' . $tax_jurisdiction_data['jurisdiction_name'], 'id' => -1));
+		}
+	}
+
+	public function delete()
+	{
+		$tax_jurisdictions_to_delete = $this->input->post('ids');
+
+		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')));
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_jurisdictions_cannot_be_deleted')));
+		}
+	}
+}
+?>

application/controllers/Taxes.php

@@ -0,0 +1,542 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once("Secure_Controller.php");
+
+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');
+	}
+
+	public function index()
+	{
+		$data['tax_codes'] = $this->xss_clean($this->Tax_code->get_all()->result_array());
+		if (count($data['tax_codes']) == 0)
+		{
+			$data['tax_codes'] = $this->Tax_code->get_empty_row();
+		}
+		$data['tax_categories'] = $this->xss_clean($this->Tax_category->get_all()->result_array());
+		if (count($data['tax_categories']) == 0)
+		{
+			$data['tax_categories'] = $this->Tax_category->get_empty_row();
+		}
+		$data['tax_jurisdictions'] = $this->xss_clean($this->Tax_jurisdiction->get_all()->result_array());
+		if (count($data['tax_jurisdictions']) == 0)
+		{
+			$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_types'] = $this->tax_lib->get_tax_types();
+
+		if($this->config->item('tax_included') == '1')
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
+		}
+		else
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
+		}
+
+		$data['tax_type_options'] = $this->tax_lib->get_tax_type_options($data['default_tax_type']);
+
+		$this->load->view('taxes/manage', $data);
+	}
+
+
+	/*
+	Returns tax_codes 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->post('sort') === NULL ? 'tax_code_name' : $this->db->escape($this->input->get('sort'));
+		$order = $this->input->get('order');
+
+		$tax_rates = $this->Tax->search($search, $limit, $offset, $sort, $order);
+
+		$total_rows = $this->Tax->get_found_rows($search);
+
+		$data_rows = array();
+		foreach($tax_rates->result() as $tax_rate_row)
+		{
+			$data_rows[] = $this->xss_clean(get_tax_rates_data_row($tax_rate_row));
+		}
+
+		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
+	}
+
+	/*
+	Gives search suggestions based on what is being searched for
+	*/
+	public function suggest_search()
+	{
+		$suggestions = $this->xss_clean($this->Tax->get_search_suggestions($this->input->post('term')));
+
+		echo json_encode($suggestions);
+	}
+
+	/*
+	Provides list of tax categories to select from
+	*/
+	public function suggest_tax_categories()
+	{
+		$suggestions = $this->xss_clean($this->Tax_category->get_tax_category_suggestions($this->input->post('term')));
+
+		echo json_encode($suggestions);
+	}
+
+
+	public function get_row($row_id)
+	{
+		$data_row = $this->xss_clean(get_tax_rates_data_row($this->Tax->get_info($row_id), $this));
+
+		echo json_encode($data_row);
+	}
+
+	public function view_tax_codes($tax_code = -1)
+	{
+		$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);
+
+		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+
+		if($this->config->item('tax_included') == '1')
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
+		}
+		else
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
+		}
+
+		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['html_rounding_options'] = $this->get_html_rounding_options();
+
+		if($tax_code == -1)
+		{
+			$data['tax_code'] = '';
+			$data['tax_code_name'] = '';
+			$data['tax_code_type'] = '0';
+			$data['city'] = '';
+			$data['state'] = '';
+			$data['tax_rate'] = '0.0000';
+			$data['rate_tax_code'] = '';
+			$data['rate_tax_category_id'] = 1;
+			$data['tax_category'] = '';
+			$data['add_tax_category'] = '';
+			$data['rounding_code'] = '0';
+		}
+		else
+		{
+			$data['tax_code'] = $tax_code;
+			$data['tax_code_name'] = $tax_code_info->tax_code_name;
+			$data['tax_code_type'] = $tax_code_info->tax_code_type;
+			$data['city'] = $tax_code_info->city;
+			$data['state'] = $tax_code_info->state;
+			$data['rate_tax_code'] = $tax_code_info->rate_tax_code;
+			$data['rate_tax_category_id'] = $tax_code_info->rate_tax_category_id;
+			$data['tax_category'] = $tax_code_info->tax_category;
+			$data['add_tax_category'] = '';
+			$data['tax_rate'] = $tax_rate_info->tax_rate;
+			$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_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_rates[] = $tax_rate_row;
+		}
+
+		$data['tax_rates'] = $tax_rates;
+
+		$this->load->view('taxes/tax_code_form', $data);
+	}
+
+
+	public function view($tax_rate_id = -1)
+	{
+
+		$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['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)
+		{
+			$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['tax_rate'] = '0.0000';
+		}
+		else
+		{
+			$data['rate_tax_code_id'] = $tax_rate_info->rate_tax_code_id;
+			$data['rate_tax_code'] = $tax_rate_info->tax_code;
+			$data['rate_tax_category_id'] = $tax_rate_info->rate_tax_category_id;
+			$data['rate_jurisdiction_id'] = $tax_rate_info->rate_jurisdiction_id;
+			$data['tax_rounding_code'] = $tax_rate_info->tax_rounding_code;
+			$data['tax_rate'] = $tax_rate_info->tax_rate;
+		}
+
+		$data = $this->xss_clean($data);
+
+		$this->load->view('taxes/tax_rates_form', $data);
+	}
+
+
+
+	public function view_tax_categories($tax_code = -1)
+	{
+		$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);
+
+		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+
+		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['html_rounding_options'] = $this->get_html_rounding_options();
+
+		if($this->config->item('tax_included') == '1')
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
+		}
+		else
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
+		}
+
+		if($tax_code == -1)
+		{
+			$data['tax_code'] = '';
+			$data['tax_code_name'] = '';
+			$data['tax_code_type'] = '0';
+			$data['city'] = '';
+			$data['state'] = '';
+			$data['tax_rate'] = '0.0000';
+			$data['rate_tax_code'] = '';
+			$data['rate_tax_category_id'] = 1;
+			$data['tax_category'] = '';
+			$data['add_tax_category'] = '';
+			$data['rounding_code'] = '0';
+		}
+		else
+		{
+			$data['tax_code'] = $tax_code;
+			$data['tax_code_name'] = $tax_code_info->tax_code_name;
+			$data['tax_code_type'] = $tax_code_info->tax_code_type;
+			$data['city'] = $tax_code_info->city;
+			$data['state'] = $tax_code_info->state;
+			$data['rate_tax_code'] = $tax_code_info->rate_tax_code;
+			$data['rate_tax_category_id'] = $tax_code_info->rate_tax_category_id;
+			$data['tax_category'] = $tax_code_info->tax_category;
+			$data['add_tax_category'] = '';
+			$data['tax_rate'] = $tax_rate_info->tax_rate;
+			$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_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_rates[] = $tax_rate_row;
+		}
+
+		$data['tax_rates'] = $tax_rates;
+
+		$this->load->view('taxes/tax_category_form', $data);
+	}
+
+	public function view_tax_jurisdictions($tax_code = -1)
+	{
+		$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);
+
+		$tax_rate_info = $this->Tax->get_rate_info($tax_code, $default_tax_category_id);
+
+		$data['rounding_options'] = Rounding_mode::get_rounding_options();
+		$data['html_rounding_options'] = $this->get_html_rounding_options();
+
+		if($this->config->item('tax_included') == '1')
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_INCLUDED;
+		}
+		else
+		{
+			$data['default_tax_type'] = Tax_lib::TAX_TYPE_EXCLUDED;
+		}
+
+		if($tax_code == -1)
+		{
+			$data['tax_code'] = '';
+			$data['tax_code_name'] = '';
+			$data['tax_code_type'] = '0';
+			$data['city'] = '';
+			$data['state'] = '';
+			$data['tax_rate'] = '0.0000';
+			$data['rate_tax_code'] = '';
+			$data['rate_tax_category_id'] = 1;
+			$data['tax_category'] = '';
+			$data['add_tax_category'] = '';
+			$data['rounding_code'] = '0';
+		}
+		else
+		{
+			$data['tax_code'] = $tax_code;
+			$data['tax_code_name'] = $tax_code_info->tax_code_name;
+			$data['tax_code_type'] = $tax_code_info->tax_code_type;
+			$data['city'] = $tax_code_info->city;
+			$data['state'] = $tax_code_info->state;
+			$data['rate_tax_code'] = $tax_code_info->rate_tax_code;
+			$data['rate_tax_category_id'] = $tax_code_info->rate_tax_category_id;
+			$data['tax_category'] = $tax_code_info->tax_category;
+			$data['add_tax_category'] = '';
+			$data['tax_rate'] = $tax_rate_info->tax_rate;
+			$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_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_rates[] = $tax_rate_row;
+		}
+
+		$data['tax_rates'] = $tax_rates;
+
+		$this->load->view('taxes/tax_jurisdiction_form', $data);
+	}
+
+	public static function get_html_rounding_options()
+	{
+		return Rounding_mode::get_html_rounding_options();
+	}
+
+	public function save($tax_rate_id = -1)
+	{
+		$tax_category_id = $this->input->post('rate_tax_category_id');
+		$tax_rate = parse_tax($this->input->post('tax_rate'));
+
+		if ($tax_rate == 0) {
+			$tax_category_info = $this->Tax_category->get_info($tax_category_id);
+		}
+
+		$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' => $tax_rate,
+			'tax_rounding_code' => $this->input->post('tax_rounding_code')
+		);
+
+		if($this->Tax->save($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')));
+			}
+			else //Existing tax_code
+			{
+				echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_tax_rate_successful_updated')));
+			}
+		}
+		else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_tax_rate_error_adding_updating')));
+		}
+	}
+
+	public function delete()
+	{
+		$tax_codes_to_delete = $this->xss_clean($this->input->post('ids'));
+
+		if($this->Tax->delete_list($tax_codes_to_delete))
+		{
+			echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('taxes_tax_code_successful_deleted')));
+		} else
+		{
+			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('taxes_tax_code_cannot_be_deleted')));
+		}
+	}
+
+	public function suggest_tax_codes()
+	{
+		$suggestions = $this->xss_clean($this->Tax_code->get_tax_codes_search_suggestions($this->input->post_get('term')));
+
+		echo json_encode($suggestions);
+	}
+
+
+	public function save_tax_codes()
+	{
+		$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');
+
+		$array_save = array();
+		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]));
+		}
+
+		$success = $this->Tax_code->save_tax_codes($array_save);
+
+		echo json_encode(array(
+			'success' => $success,
+			'message' => $this->lang->line('taxes_tax_codes_saved_' . ($success ? '' : 'un') . 'successfully')
+		));
+	}
+
+	public function save_tax_jurisdictions()
+	{
+		$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();
+
+		$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]));
+
+			if (array_search($tax_group[$key], $unique_tax_groups) !== false)
+			{
+				echo json_encode(array(
+					'success' => FALSE,
+					'message' => $this->lang->line('taxes_tax_group_not_unique', $tax_group[$key])
+				));
+				return;
+			}
+			else
+			{
+				$unique_tax_groups[] = $tax_group[$key];
+			}
+		}
+
+		$success = $this->Tax_jurisdiction->save_jurisdictions($array_save);
+
+		echo json_encode(array(
+			'success' => $success,
+			'message' => $this->lang->line('taxes_tax_jurisdictions_saved_' . ($success ? '' : 'un') . 'successfully')
+		));
+	}
+
+	public function save_tax_categories()
+	{
+		$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');
+
+		$array_save= array();
+
+		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]));
+		}
+
+		$success = $this->Tax_category->save_categories($array_save);
+
+		echo json_encode(array(
+			'success' => $success,
+			'message' => $this->lang->line('taxes_tax_categories_saved_' . ($success ? '' : 'un') . 'successfully')
+		));
+	}
+
+	public function ajax_tax_codes()
+	{
+		$tax_codes = $this->Tax_code->get_all()->result_array();
+
+		$tax_codes = $this->xss_clean($tax_codes);
+
+		$this->load->view('partial/tax_codes', array('tax_codes' => $tax_codes));
+	}
+
+	public function ajax_tax_categories()
+	{
+		$tax_categories = $this->Tax_category->get_all()->result_array();
+
+		$tax_categories = $this->xss_clean($tax_categories);
+
+		$this->load->view('partial/tax_categories', array('tax_categories' => $tax_categories));
+	}
+
+	public function ajax_tax_jurisdictions()
+	{
+		$tax_jurisdictions = $this->Tax_jurisdiction->get_all()->result_array();
+
+		if($this->config->item('tax_included') == '1')
+		{
+			$default_tax_type = Tax_lib::TAX_TYPE_INCLUDED;
+		}
+		else
+		{
+			$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));
+	}
+}
+?>

application/core/MY_Lang.php

@@ -1,25 +1,26 @@
-<?php (defined('BASEPATH')) OR exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class MY_Lang extends CI_Lang
 {
-
-	function __construct()
-	{
-		parent::__construct();
-	}
-
-    function switch_to( $idiom )
+    public function switch_to($idiom)
     {
         $CI =& get_instance();
-        if( is_string( $idiom ) )
+        if(is_string($idiom))
         {
-            $CI->config->set_item( 'language', $idiom );
+            $CI->config->set_item('language', $idiom);
             $loaded = $this->is_loaded;
             $this->is_loaded = array();
-                
+
             foreach($loaded as $file)
             {
-                $this->load(strtr($file, '', '_lang.php'));
+                $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;
+                    }
+                }
             }
         }
     }
@@ -32,7 +33,7 @@ class MY_Lang extends CI_Lang
      * @access public
      * @return mixed false if not found or the language string
      */
-	function line($line = '', $log_errors = true)
+	public function line($line = '', $log_errors = TRUE)
     {
         //get the arguments passed to the function
         $args = func_get_args();
@@ -41,28 +42,28 @@ class MY_Lang extends CI_Lang
         $c = count($args);
         
         //if one or more arguments, perform the necessary processing
-        if ($c)
+        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 == '')
+            if($line == '')
             {
             	$line = FALSE;
             }
             else 
             {
-            	if (isset($this->language[$line]))
+            	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)
+            		if($args)
             		{
             			$i = 1;
-            			foreach ($args as $arg)
+            			foreach($args as $arg)
             			{
             				$line = preg_replace('/\%'.$i.'/', $arg, $line);
             				++$i;
@@ -80,17 +81,16 @@ class MY_Lang extends CI_Lang
         else
         {
             //if no arguments given, no language line available
-            $line = false;
+            $line = FALSE;
         }
         
         return $line;
     }
     
-    function line_tbd($line='')
+    public function line_tbd($line = '')
     {
     	return $line . ' (TBD)';
     }
-    
 }
 
 ?>

application/core/MY_Security.php

@@ -0,0 +1,57 @@
+<?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;
+    }
+}

application/helpers/dompdf_helper.php

@@ -1,24 +1,16 @@
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-function pdf_create($html, $filename = '') 
+/**
+ * PDF helper
+ */
+
+function create_pdf($html, $filename = '')
 {
     // need to enable magic quotes for the
-    $magic_quotes_enabled = get_magic_quotes_runtime();
-
-    if(!$magic_quotes_enabled)
-    {
-    	ini_set('magic_quotes_runtime', TRUE);
-    }
-
-    $dompdf = new Dompdf\Dompdf();
-    $dompdf->loadHtml($html);
+    $dompdf = new Dompdf\Dompdf(array("isRemoteEnabled" => TRUE, "isPhpEnabled" => TRUE));
+    $dompdf->loadHtml(str_replace(array("\n", "\r"), '', $html));
     $dompdf->render();
-
-    if(!$magic_quotes_enabled)
-    {
-		ini_set('magic_quotes_runtime', $magic_quotes_enabled);
-	}
-
+    
     if($filename != '')
     {
         $dompdf->stream($filename . '.pdf');
@@ -28,4 +20,4 @@ function pdf_create($html, $filename = '')
         return $dompdf->output();
     }
 }
-?>  
+?>

application/helpers/importfile_helper.php

@@ -0,0 +1,93 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+function generate_import_items_csv($stock_locations,$attributes)
+{
+	$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';
+	$csv_headers .= generate_stock_location_headers($stock_locations);
+	$csv_headers .= generate_attribute_headers($attributes);
+
+	return $csv_headers;
+}
+
+function generate_stock_location_headers($locations)
+{
+	$location_headers = '';
+
+	foreach($locations as $location_name)
+	{
+		$location_headers .= ',"location_' . $location_name . '"';
+	}
+
+	return $location_headers;
+}
+
+function generate_attribute_headers($attribute_names)
+{
+	$attribute_headers = '';
+	unset($attribute_names[-1]);
+
+	foreach($attribute_names as $attribute_name)
+	{
+		$attribute_headers .= ',"attribute_' . $attribute_name . '"';
+	}
+
+	return $attribute_headers;
+}
+
+function get_csv_file($file_name)
+{
+//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.
+//It must be done in a way that does not significantly negatively affect performance.
+	ini_set('auto_detect_line_endings', true);
+
+	$csv_rows = FALSE;
+
+	if(($csv_file = fopen($file_name,'r')) !== FALSE)
+	{
+		$CI =& get_instance();
+		$CI->load->helper('security');
+
+		$csv_rows = [];
+
+		//Skip Byte-Order Mark
+		if(bom_exists($csv_file) === TRUE)
+		{
+			fseek($csv_file, 3);
+		}
+
+		$headers = fgetcsv($csv_file);
+
+		while(($row = fgetcsv($csv_file)) !== FALSE)
+		{
+			//Skip empty lines
+			if($row !== array(null))
+			{
+				$csv_rows[] = array_combine($headers, $CI->security->xss_clean($row));
+			}
+		}
+
+		fclose($csv_file);
+	}
+
+	return $csv_rows;
+}
+
+function bom_exists(&$file_handle)
+{
+	$result		= FALSE;
+	$candidate	= fread($file_handle, 3);
+
+	rewind($file_handle);
+
+	$bom = pack('CCC', 0xef, 0xbb, 0xbf);
+
+	if (0 === strncmp($candidate, $bom, 3))
+	{
+		$result = TRUE;
+	}
+
+	return $result;
+}
+?>

application/helpers/locale_helper.php

@@ -1,102 +1,466 @@
-<?php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-/*
- * Currency locale
+const DEFAULT_LANGUAGE = 'english';
+const DEFAULT_LANGUAGE_CODE = 'en-US';
+
+define('NOW', time());
+define('MAX_PRECISION', 1e14);
+define('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()
+function current_language_code($load_system_language = FALSE)
 {
-    return get_instance()->config->item('language_code');
+	$employee = get_instance()->Employee;
+
+	// Returns the language code of the employee if set or system language code if not
+	if($employee->is_logged_in() && $load_system_language != TRUE)
+	{
+		$employee_info = $employee->get_logged_in_employee_info();
+
+		if(property_exists($employee_info, 'language_code') && !empty($employee_info->language_code))
+		{
+			return $employee_info->language_code;
+		}
+	}
+
+	$language_code = get_instance()->config->item('language_code');
+
+	return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code;
 }
 
-function current_language()
+function current_language($load_system_language = FALSE)
 {
-    return get_instance()->config->item('language');
+	$employee = get_instance()->Employee;
+
+	// Returns the language of the employee if set or system language if not
+	if($employee->is_logged_in() && $load_system_language != TRUE)
+	{
+		$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');
+
+	return empty($language) ? DEFAULT_LANGUAGE : $language;
+}
+
+function get_languages()
+{
+	return array(
+		'ar-EG:arabic' => 'Arabic (Egypt)',
+		'ar-LB:arabic' => 'Arabic (Lebanon)',
+		'az-AZ:azerbaijani' => 'Azerbaijani (Azerbaijan)',
+		'bg:bulgarian' => 'Bulgarian',
+		'bs-BA:bosnian' => 'Bosnian',
+		'cs:czech' => 'Czech',
+		'da:danish' => 'Danish',
+		'de:german' => 'German (Germany)',
+		'de-CH:german' => 'German (Swiss)',
+		'el:greek' => 'Greek',
+		'en-GB:english' => 'English (Great Britain)',
+		'en-US:english' => 'English (United States)',
+		'es:spanish' => 'Spanish',
+		'es-MX:spanish' => 'Spanish (Mexico)',
+		'fr:french' => 'French',
+		'fa-IR:persian' => 'Farsi (Iran)',
+		'he:english' => 'Hebrew',
+		'hr-HR:croatian' => 'Croatian (Croatia)',
+		'hu-HU:hungarian' => 'Hungarian (Hungary)',
+		'hy:armenian' => 'Armenian',
+		'id:indonesian' => 'Indonesian',
+		'it:italian' => 'Italian',
+		'km:khmer' => 'Central Khmer (Cambodia)',
+		'lo:lao' => 'Lao (Laos)',
+		'ml:malay' => 'Malay',
+		'nb:norwegian' => 'Norwegian',
+		'nl:dutch' => 'Dutch',
+		'nl-BE:dutch' => 'Dutch (Belgium)',
+		'pl:polish' => 'Polish',
+		'pt-BR:portuguese' => 'Portuguese (Brazil)',
+		'ro:romanian' => 'Romanian',
+		'ru:russian' => 'Russian',
+		'sv:swedish' => 'Swedish',
+		'ta:tamil' => 'Tamil',
+		'th:thai' => 'Thai',
+		'tl-PH:talong' => 'Tagalog (Philippines)',
+		'tr:turkish' => 'Turkish',
+		'uk-UA:ukrainian' => 'Ukrainian',
+		'ur-PK:urdu' => 'Urdu (Islamic Republic of Pakistan)',
+		'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)
+{
+	$lang = get_instance()->lang;
+
+	if($load_system_language = TRUE)
+	{
+		foreach($lang_array as $language_file)
+		{
+			$lang->load($language_file, current_language_code(TRUE));
+		}
+	}
+	else
+	{
+		foreach($lang_array as $language_file)
+		{
+			$lang->load($language_file, current_language_code());
+		}
+	}
+}
+
+function get_timezones()
+{
+	return array(
+		'Pacific/Midway' => '(GMT-11:00) Midway Island, Samoa',
+		'America/Adak' => '(GMT-10:00) Hawaii-Aleutian',
+		'Etc/GMT+10' => '(GMT-10:00) Hawaii',
+		'Pacific/Marquesas' => '(GMT-09:30) Marquesas Islands',
+		'Pacific/Gambier' => '(GMT-09:00) Gambier Islands',
+		'America/Anchorage' => '(GMT-09:00) Alaska',
+		'America/Ensenada' => '(GMT-08:00) Tijuana, Baja California',
+		'Etc/GMT+8' => '(GMT-08:00) Pitcairn Islands',
+		'America/Los_Angeles' => '(GMT-08:00) Pacific Time (US & Canada)',
+		'America/Denver' => '(GMT-07:00) Mountain Time (US & Canada)',
+		'America/Chihuahua' => '(GMT-07:00) Chihuahua, La Paz, Mazatlan',
+		'America/Dawson_Creek' => '(GMT-07:00) Arizona',
+		'America/Belize' => '(GMT-06:00) Saskatchewan, Central America',
+		'America/Mexico_City' => '(GMT-06:00) Guadalajara, Mexico City, Monterrey',
+		'Chile/EasterIsland' => '(GMT-06:00) Easter Island',
+		'America/Chicago' => '(GMT-06:00) Central Time (US & Canada)',
+		'America/New_York' => '(GMT-05:00) Eastern Time (US & Canada)',
+		'America/Cancun' => '(GMT-05:00) Cancun',
+		'America/Havana' => '(GMT-05:00) Cuba',
+		'America/Bogota' => '(GMT-05:00) Bogota, Lima, Quito, Rio Branco',
+		'America/Caracas' => '(GMT-04:30) Caracas',
+		'America/Santiago' => '(GMT-04:00) Santiago',
+		'America/La_Paz' => '(GMT-04:00) La Paz',
+		'Atlantic/Stanley' => '(GMT-04:00) Falkland Islands',
+		'America/Campo_Grande' => '(GMT-04:00) Brazil',
+		'America/Goose_Bay' => '(GMT-04:00) Atlantic Time (Goose Bay)',
+		'America/Glace_Bay' => '(GMT-04:00) Atlantic Time (Canada)',
+		'America/St_Johns' => '(GMT-03:30) Newfoundland',
+		'America/Araguaina' => '(GMT-03:00) UTC-3',
+		'America/Montevideo' => '(GMT-03:00) Montevideo',
+		'America/Miquelon' => '(GMT-03:00) Miquelon, St. Pierre',
+		'America/Godthab' => '(GMT-03:00) Greenland',
+		'America/Argentina/Buenos_Aires' => '(GMT-03:00) Buenos Aires',
+		'America/Sao_Paulo' => '(GMT-03:00) Brasilia',
+		'America/Noronha' => '(GMT-02:00) Mid-Atlantic',
+		'Atlantic/Cape_Verde' => '(GMT-01:00) Cape Verde Is.',
+		'Atlantic/Azores' => '(GMT-01:00) Azores',
+		'Europe/Belfast' => '(GMT) Greenwich Mean Time : Belfast',
+		'Europe/Dublin' => '(GMT) Greenwich Mean Time : Dublin',
+		'Europe/Lisbon' => '(GMT) Greenwich Mean Time : Lisbon',
+		'Europe/London' => '(GMT) Greenwich Mean Time : London',
+		'Africa/Abidjan' => '(GMT) Monrovia, Reykjavik',
+		'Europe/Amsterdam' => '(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna',
+		'Europe/Belgrade' => '(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague',
+		'Europe/Brussels' => '(GMT+01:00) Brussels, Copenhagen, Madrid, Paris',
+		'Africa/Algiers' => '(GMT+01:00) West Central Africa',
+		'Africa/Windhoek' => '(GMT+01:00) Windhoek',
+		'Asia/Beirut' => '(GMT+02:00) Beirut',
+		'Africa/Cairo' => '(GMT+02:00) Cairo',
+		'Asia/Gaza' => '(GMT+02:00) Gaza',
+		'Africa/Blantyre' => '(GMT+02:00) Harare, Pretoria',
+		'Asia/Jerusalem' => '(GMT+02:00) Jerusalem',
+		'Europe/Minsk' => '(GMT+02:00) Minsk',
+		'Asia/Damascus' => '(GMT+02:00) Syria',
+		'Europe/Moscow' => '(GMT+03:00) Moscow, St. Petersburg, Volgograd',
+		'Africa/Addis_Ababa' => '(GMT+03:00) Nairobi',
+		'Asia/Tehran' => '(GMT+03:30) Tehran',
+		'Asia/Dubai' => '(GMT+04:00) Abu Dhabi, Muscat',
+		'Asia/Yerevan' => '(GMT+04:00) Yerevan',
+		'Asia/Kabul' => '(GMT+04:30) Kabul',
+		'Asia/Baku' => '(GMT+04:00) Baku',
+		'Asia/Yekaterinburg' => '(GMT+05:00) Ekaterinburg',
+		'Asia/Tashkent' => '(GMT+05:00) Tashkent',
+		'Asia/Kolkata' => '(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi',
+		'Asia/Katmandu' => '(GMT+05:45) Kathmandu',
+		'Asia/Dhaka' => '(GMT+06:00) Astana, Dhaka',
+		'Asia/Novosibirsk' => '(GMT+06:00) Novosibirsk',
+		'Asia/Rangoon' => '(GMT+06:30) Yangon (Rangoon)',
+		'Asia/Bangkok' => '(GMT+07:00) Bangkok, Hanoi, Jakarta',
+		'Asia/Krasnoyarsk' => '(GMT+07:00) Krasnoyarsk',
+		'Asia/Hong_Kong' => '(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi',
+		'Asia/Irkutsk' => '(GMT+08:00) Irkutsk, Ulaan Bataar',
+		'Australia/Perth' => '(GMT+08:00) Perth',
+		'Australia/Eucla' => '(GMT+08:45) Eucla',
+		'Asia/Tokyo' => '(GMT+09:00) Osaka, Sapporo, Tokyo',
+		'Asia/Seoul' => '(GMT+09:00) Seoul',
+		'Asia/Yakutsk' => '(GMT+09:00) Yakutsk',
+		'Australia/Adelaide' => '(GMT+09:30) Adelaide',
+		'Australia/Darwin' => '(GMT+09:30) Darwin',
+		'Australia/Brisbane' => '(GMT+10:00) Brisbane',
+		'Australia/Hobart' => '(GMT+10:00) Hobart',
+		'Asia/Vladivostok' => '(GMT+10:00) Vladivostok',
+		'Australia/Lord_Howe' => '(GMT+10:30) Lord Howe Island',
+		'Etc/GMT-11' => '(GMT+11:00) Solomon Is., New Caledonia',
+		'Asia/Magadan' => '(GMT+11:00) Magadan',
+		'Pacific/Norfolk' => '(GMT+11:30) Norfolk Island',
+		'Asia/Anadyr' => '(GMT+12:00) Anadyr, Kamchatka',
+		'Pacific/Auckland' => '(GMT+12:00) Auckland, Wellington',
+		'Etc/GMT-12' => '(GMT+12:00) Fiji, Kamchatka, Marshall Is.',
+		'Pacific/Chatham' => '(GMT+12:45) Chatham Islands',
+		'Pacific/Tongatapu' => '(GMT+13:00) Nuku\'alofa',
+		'Pacific/Kiritimati' => '(GMT+14:00) Kiritimati'
+	);
+}
+
+function get_dateformats()
+{
+	return array(
+		'd/m/Y' => 'dd/mm/yyyy',
+		'd.m.Y' => 'dd.mm.yyyy',
+		'm/d/Y' => 'mm/dd/yyyy',
+		'Y/m/d' => 'yyyy/mm/dd',
+		'd/m/y' => 'dd/mm/yy',
+		'm/d/y' => 'mm/dd/yy',
+		'y/m/d' => 'yy/mm/dd'
+	);
+}
+
+function get_timeformats()
+{
+	return array(
+		'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
+ */
+function get_payment_options()
+{
+	$config = get_instance()->config;
+	$lang = get_instance()->lang;
+
+	$payments = [];
+
+
+	if($config->item('payment_options_order') == 'debitcreditcash')
+	{
+		$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');
+	}
+	elseif($config->item('payment_options_order') == 'debitcashcredit')
+	{
+		$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');
+	}
+	elseif($config->item('payment_options_order') == 'creditdebitcash')
+	{
+		$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');
+	}
+	elseif($config->item('payment_options_order') == 'creditcashdebit')
+	{
+		$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');
+	}
+	else // default: if($config->item('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->line('sales_due')] = $lang->line('sales_due');
+	$payments[$lang->line('sales_check')] = $lang->line('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)
+	{
+		$payments[$lang->line('sales_upi')] = $lang->line('sales_upi');
+	}
+
+	return $payments;
 }
 
 function currency_side()
 {
-    $config = get_instance()->config;
-    $fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::CURRENCY);
-    $fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
-    return !preg_match('/^¤/', $fmt->getPattern());
+	$config = get_instance()->config;
+
+	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::CURRENCY);
+	$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
+
+	return !preg_match('/^¤/', $fmt->getPattern());
 }
 
 function quantity_decimals()
 {
-    $config = get_instance()->config;
-    return $config->item('quantity_decimals') ? $config->item('quantity_decimals') : 0;
+	$config = get_instance()->config;
+
+	return $config->item('quantity_decimals') ? $config->item('quantity_decimals') : 0;
 }
 
 function totals_decimals()
 {
 	$config = get_instance()->config;
+
 	return $config->item('currency_decimals') ? $config->item('currency_decimals') : 0;
 }
 
+function cash_decimals()
+{
+	$config = get_instance()->config;
+
+	return $config->item('cash_decimals') ? $config->item('cash_decimals') : 0;
+}
+
+function tax_decimals()
+{
+	$config = get_instance()->config;
+
+	return $config->item('tax_decimals') ? $config->item('tax_decimals') : 0;
+}
+
+function to_date($date = DEFAULT_DATE)
+{
+	$config = get_instance()->config;
+
+	return date($config->item('dateformat'), $date);
+}
+
+function to_datetime($datetime = DEFAULT_DATETIME)
+{
+	$config = get_instance()->config;
+
+	return date($config->item('dateformat') . ' ' . $config->item('timeformat'), $datetime);
+}
+
 function to_currency($number)
 {
-    return to_decimals($number, 'currency_decimals', \NumberFormatter::CURRENCY);
+	return to_decimals($number, 'currency_decimals', \NumberFormatter::CURRENCY);
 }
 
 function to_currency_no_money($number)
 {
-    return to_decimals($number, 'currency_decimals');
+	return to_decimals($number, 'currency_decimals');
+}
+
+function to_currency_tax($number)
+{
+	$config = get_instance()->config;
+
+	if($config->item('tax_included') == '1')
+	{
+		return to_decimals($number, 'tax_decimals', \NumberFormatter::CURRENCY);
+	}
+	else
+	{
+		return to_decimals($number, 'currency_decimals', \NumberFormatter::CURRENCY);
+	}
 }
 
 function to_tax_decimals($number)
 {
 	// 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
-    if(empty($number))
-    {
-        return $number;
-    }
-	
-    return to_decimals($number, 'tax_decimals');
+	if(empty($number))
+	{
+		return $number;
+	}
+
+	return to_decimals($number, 'tax_decimals');
 }
 
 function to_quantity_decimals($number)
 {
-    return to_decimals($number, 'quantity_decimals');
+	return to_decimals($number, 'quantity_decimals');
 }
 
-function to_decimals($number, $decimals, $type=\NumberFormatter::DECIMAL)
+function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
 {
 	// ignore empty strings and return
 	// NOTE: do not change it to empty otherwise tables will show a 0 with no decimal nor currency symbol
-    if(!isset($number))
-    {
-        return $number;
-    }
-	
-    $config = get_instance()->config;
-    $fmt = new \NumberFormatter($config->item('number_locale'), $type);
-    $fmt->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, $config->item($decimals));
-    $fmt->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, $config->item($decimals));
-    if (empty($config->item('thousands_separator')))
-    {
-        $fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
-    }
-    $fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
-    return $fmt->format($number);
+	if(!isset($number))
+	{
+		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));
+
+	if(empty($config->item('thousands_separator')))
+	{
+		$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
+	}
+	$fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $config->item('currency_symbol'));
+
+	return $fmt->format($number);
 }
 
-function parse_decimals($number)
+function parse_quantity($number)
 {
-    // ignore empty strings and return
-    if(empty($number))
-    {
-        return $number;
-    }
+	return parse_decimals($number, quantity_decimals());
+}
 
-    $config = get_instance()->config;
-    $fmt = new \NumberFormatter( $config->item('number_locale'), \NumberFormatter::DECIMAL );
-    if (empty($config->item('thousands_separator')))
-    {
-        $fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
-    }
-    return $fmt->parse($number);
+function parse_tax($number)
+{
+	return parse_decimals($number, tax_decimals());
+}
+
+function parse_decimals($number, $decimals = NULL)
+{
+	// ignore empty strings and return
+	if(empty($number))
+	{
+		return $number;
+	}
+
+	if ($number > MAX_PRECISION)
+	{
+		return FALSE;
+	}
+
+	if ($number > 1.e14)
+	{
+		return FALSE;
+	}
+
+	$config = get_instance()->config;
+
+	if($decimals === NULL)
+	{
+		$decimals = $config->item('currency_decimals');
+	}
+
+	$fmt = new \NumberFormatter($config->item('number_locale'), \NumberFormatter::DECIMAL);
+
+	if(empty($config->item('thousands_separator')))
+	{
+		$fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
+	}
+
+	try
+	{
+		return $fmt->parse($number);
+	}
+	catch(Exception $e)
+	{
+		return FALSE;
+	}
 }
 
 /*
@@ -105,88 +469,143 @@ function parse_decimals($number)
 
 function dateformat_momentjs($php_format)
 {
-    $SYMBOLS_MATCHING = array(
-        'd' => 'DD',
-        'D' => 'ddd',
-        'j' => 'D',
-        'l' => 'dddd',
-        'N' => 'E',
-        'S' => 'o',
-        'w' => 'e',
-        'z' => 'DDD',
-        'W' => 'W',
-        'F' => 'MMMM',
-        'm' => 'MM',
-        'M' => 'MMM',
-        'n' => 'M',
-        't' => '', // no equivalent
-        'L' => '', // no equivalent
-        'o' => 'YYYY',
-        'Y' => 'YYYY',
-        'y' => 'YY',
-        'a' => 'a',
-        'A' => 'A',
-        'B' => '', // no equivalent
-        'g' => 'h',
-        'G' => 'H',
-        'h' => 'hh',
-        'H' => 'HH',
-        'i' => 'mm',
-        's' => 'ss',
-        'u' => 'SSS',
-        'e' => 'zz', // deprecated since version $1.6.0 of moment.js
-        'I' => '', // no equivalent
-        'O' => '', // no equivalent
-        'P' => '', // no equivalent
-        'T' => '', // no equivalent
-        'Z' => '', // no equivalent
-        'c' => '', // no equivalent
-        'r' => '', // no equivalent
-        'U' => 'X'
-    );
+	$SYMBOLS_MATCHING = array(
+		'd' => 'DD',
+		'D' => 'ddd',
+		'j' => 'D',
+		'l' => 'dddd',
+		'N' => 'E',
+		'S' => 'o',
+		'w' => 'e',
+		'z' => 'DDD',
+		'W' => 'W',
+		'F' => 'MMMM',
+		'm' => 'MM',
+		'M' => 'MMM',
+		'n' => 'M',
+		't' => '', // no equivalent
+		'L' => '', // no equivalent
+		'o' => 'YYYY',
+		'Y' => 'YYYY',
+		'y' => 'YY',
+		'a' => 'a',
+		'A' => 'A',
+		'B' => '', // no equivalent
+		'g' => 'h',
+		'G' => 'H',
+		'h' => 'hh',
+		'H' => 'HH',
+		'i' => 'mm',
+		's' => 'ss',
+		'u' => 'SSS',
+		'e' => 'zz', // deprecated since version $1.6.0 of moment.js
+		'I' => '', // no equivalent
+		'O' => '', // no equivalent
+		'P' => '', // no equivalent
+		'T' => '', // no equivalent
+		'Z' => '', // no equivalent
+		'c' => '', // no equivalent
+		'r' => '', // no equivalent
+		'U' => 'X'
+	);
 
-    return strtr($php_format, $SYMBOLS_MATCHING);
+	return strtr($php_format, $SYMBOLS_MATCHING);
+}
+
+function dateformat_mysql()
+{
+	$config = get_instance()->config;
+	$php_format = $config->item('dateformat');
+
+	$SYMBOLS_MATCHING = array(
+		// Day
+		'd' => '%d',
+		'D' => '%a',
+		'j' => '%e',
+		'l' => '%W',
+		'N' => '',
+		'S' => '',
+		'w' => '',
+		'z' => '',
+		// Week
+		'W' => '',
+		// Month
+		'F' => '',
+		'm' => '%m',
+		'M' => '%b',
+		'n' => '%c',
+		't' => '',
+		// Year
+		'L' => '',
+		'o' => '',
+		'Y' => '%Y',
+		'y' => '%y',
+		// Time
+		'a' => '',
+		'A' => '%p',
+		'B' => '',
+		'g' => '%l',
+		'G' => '%k',
+		'h' => '%H',
+		'H' => '%k',
+		'i' => '%i',
+		's' => '%S',
+		'u' => '%f'
+	);
+
+	return strtr($php_format, $SYMBOLS_MATCHING);
 }
 
 function dateformat_bootstrap($php_format)
 {
-    $SYMBOLS_MATCHING = array(
-        // Day
-        'd' => 'dd',
-        'D' => 'd',
-        'j' => 'd',
-        'l' => 'dd',
-        'N' => '',
-        'S' => '',
-        'w' => '',
-        'z' => '',
-        // Week
-        'W' => '',
-        // Month
-        'F' => 'MM',
-        'm' => 'mm',
-        'M' => 'M',
-        'n' => 'm',
-        't' => '',
-        // Year
-        'L' => '',
-        'o' => '',
-        'Y' => 'yyyy',
-        'y' => 'yy',
-        // Time
-        'a' => 'p',
-        'A' => 'P',
-        'B' => '',
-        'g' => 'H',
-        'G' => 'h',
-        'h' => 'HH',
-        'H' => 'hh',
-        'i' => 'ii',
-        's' => 'ss',
-        'u' => ''
-    );
+	$SYMBOLS_MATCHING = array(
+		// Day
+		'd' => 'dd',
+		'D' => 'd',
+		'j' => 'd',
+		'l' => 'dd',
+		'N' => '',
+		'S' => '',
+		'w' => '',
+		'z' => '',
+		// Week
+		'W' => '',
+		// Month
+		'F' => 'MM',
+		'm' => 'mm',
+		'M' => 'M',
+		'n' => 'm',
+		't' => '',
+		// Year
+		'L' => '',
+		'o' => '',
+		'Y' => 'yyyy',
+		'y' => 'yy',
+		// Time
+		'a' => 'p',
+		'A' => 'P',
+		'B' => '',
+		'g' => 'H',
+		'G' => 'h',
+		'h' => 'HH',
+		'H' => 'hh',
+		'i' => 'ii',
+		's' => 'ss',
+		'u' => ''
+	);
 
-    return strtr($php_format, $SYMBOLS_MATCHING);
+	return strtr($php_format, $SYMBOLS_MATCHING);
+}
+
+function valid_date($date)
+{
+	$config = get_instance()->Appconfig;
+	return (DateTime::createFromFormat($config->get('dateformat'), $date));
+}
+
+function valid_decimal($decimal)
+{
+	return (preg_match('/^(\d*\.)?\d+$/', $decimal) === 1);
 }
 
 ?>

application/helpers/migration_helper.php

@@ -0,0 +1,40 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Migration helper
+ */
+
+function execute_script($path)
+{
+	$CI =& get_instance();
+
+	$version = preg_replace("/(.*_)?(.*).sql/", "$2", $path);
+	error_log("Migrating to $version (file: $path)");
+
+	$sql = file_get_contents($path);
+
+	/*
+	CI migration only allows you to run one statement at a time.
+	This small script splits the statements allowing you to run them all in one go.
+	*/
+
+	$sqls = explode(';', $sql);
+	array_pop($sqls);
+
+	foreach($sqls as $statement)
+	{
+		$statement = $statement . ';';
+
+		if(!$CI->db->simple_query($statement))
+		{
+			foreach($CI->db->error() as $error)
+			{
+				error_log('error: ' . $error);
+			}
+		}
+	}
+
+	error_log("Migrated to $version");
+}
+
+?>

application/helpers/report_helper.php

@@ -1,10 +1,14 @@
-<?php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Report helper
+ */
 
 function show_report_if_allowed($report_prefix, $report_name, $person_id, $permission_id = '')
 {
 	$CI =& get_instance();
 
-	$permission_id = empty($permission_id) ? 'reports_' . $report_name : $permission_id;	
+	$permission_id = empty($permission_id) ? 'reports_' . $report_name : $permission_id;
 	if($CI->Employee->has_grant($permission_id, $person_id))
 	{
 		show_report($report_prefix, $report_name, $permission_id);
@@ -23,8 +27,7 @@ function show_report($report_prefix, $report_name, $lang_key='')
 	{
 		?>
 			<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 
+		<?php
 	}
 }
-
-?>
+?>

application/helpers/table_helper.php

@@ -1,365 +0,0 @@
-<?php
-
-function get_sales_manage_table_headers()
-{
-	$CI =& get_instance();
-
-	$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)
-	{
-		$headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number'));
-		$headers[] = array('invoice' => '&nbsp', 'sortable' => FALSE);
-	}
-
-	return transform_headers(array_merge($headers, array(array('receipt' => '&nbsp', 'sortable' => FALSE))));
-}
-
-/*
- Gets the html data rows for the sales.
- */
-function get_sale_data_last_row($sales, $controller)
-{
-	$CI =& get_instance();
-	$sum_amount_due = 0;
-	$sum_amount_tendered = 0;
-	$sum_change_due = 0;
-
-	foreach($sales->result() as $key=>$sale)
-	{
-		$sum_amount_due += $sale->amount_due;
-		$sum_amount_tendered += $sale->amount_tendered;
-		$sum_change_due += $sale->change_due;
-	}
-
-	return array(
-		'sale_id' => '-',
-		'sale_time' => '<b>'.$CI->lang->line('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>'
-	);
-}
-
-function get_sale_data_row($sale, $controller)
-{
-	$CI =& get_instance();
-	$controller_name = $CI->uri->segment(1);
-
-	$row = array (
-		'sale_id' => $sale->sale_id,
-		'sale_time' => date( $CI->config->item('dateformat') . ' ' . $CI->config->item('timeformat'), strtotime($sale->sale_time) ),
-		'customer_name' => $sale->customer_name,
-		'amount_due' => to_currency($sale->amount_due),
-		'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'))
-	{
-		$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['receipt'] = anchor($controller_name."/receipt/$sale->sale_id", '<span class="glyphicon glyphicon-usd"></span>',
-		array('title' => $CI->lang->line('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'))
-	);
-
-	return $row;
-}
-
-/*
-Get the sales payments summary
-*/
-function get_sales_manage_payments_summary($payments, $sales, $controller)
-{
-	$CI =& get_instance();
-	$table = '<div id="report_summary">';
-
-	foreach($payments as $key=>$payment)
-	{
-		$amount = $payment['payment_amount'];
-
-		// WARNING: the strong assumption here is that if a change is due it was a cash transaction always
-		// therefore we remove from the total cash amount any change due
-		if( $payment['payment_type'] == $CI->lang->line('sales_cash') )
-		{
-			foreach($sales->result_array() as $key=>$sale)
-			{
-				$amount -= $sale['change_due'];
-			}
-		}
-		$table .= '<div class="summary_row">' . $payment['payment_type'] . ': ' . to_currency( $amount ) . '</div>';
-	}
-	$table .= '</div>';
-
-	return $table;
-}
-
-function transform_headers_readonly($array)
-{
-	$result = array();
-	foreach($array as $key => $value)
-	{
-		$result[] = array('field' => $key, 'title' => $value, 'sortable' => $value != '', 'switchable' => !preg_match('(^$|&nbsp)', $value));
-	}
-
-	return json_encode($result);
-}
-
-function transform_headers($array, $readonly = FALSE, $editable = TRUE)
-{
-	$result = array();
-
-	if (!$readonly)
-	{
-		$array = array_merge(array(array('checkbox' => 'select', 'sortable' => FALSE)), $array);
-	}
-
-	if ($editable)
-	{
-		$array[] = array('edit' => '');
-	}
-
-	foreach($array as $element)
-	{
-		$result[] = array('field' => key($element),
-			'title' => current($element),
-			'switchable' => isset($element['switchable']) ?
-				$element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
-			'sortable' => isset($element['sortable']) ?
-				$element['sortable'] : current($element) != '',
-			'checkbox' => isset($element['checkbox']) ?
-				$element['checkbox'] : FALSE,
-			'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ?
-				'print_hide' : '',
-			'sorter' => isset($element['sorter']) ?
-				$element ['sorter'] : '');
-	}
-	return json_encode($result);
-}
-
-function get_people_manage_table_headers()
-{
-	$CI =& get_instance();
-
-	$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'))
-	);
-
-	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
-	{
-		$headers[] = array('messages' => '', 'sortable' => FALSE);
-	}
-	
-	return transform_headers($headers);
-}
-
-function get_person_data_row($person, $controller)
-{
-	$CI =& get_instance();
-	$controller_name=strtolower(get_class($CI));
-
-	return array (
-		'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'))
-	));
-}
-
-function get_suppliers_manage_table_headers()
-{
-	$CI =& get_instance();
-
-	$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('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'))
-	);
-
-	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
-	{
-		$headers[] = array('messages' => '');
-	}
-
-	return transform_headers($headers);
-}
-
-function get_supplier_data_row($supplier, $controller)
-{
-	$CI =& get_instance();
-	$controller_name=strtolower(get_class($CI));
-
-	return array (
-		'people.person_id' => $supplier->person_id,
-		'company_name' => $supplier->company_name,
-		'agency_name' => $supplier->agency_name,
-		'last_name' => $supplier->last_name,
-		'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')))
-		);
-}
-
-function get_items_manage_table_headers()
-{
-	$CI =& get_instance();
-
-	$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')),
-		array('tax_percents' => $CI->lang->line('items_tax_percents'), 'sortable' => FALSE),
-		array('item_pic' => $CI->lang->line('items_image'), 'sortable' => FALSE),
-		array('inventory' => ''),
-		array('stock' => '')
-	);
-
-	return transform_headers($headers);
-}
-
-function get_item_data_row($item, $controller)
-{
-	$CI =& get_instance();
-	$item_tax_info = $CI->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
-	$tax_percents = substr($tax_percents, 0, -2);
-	$controller_name = strtolower(get_class($CI));
-
-	$image = '';
-	if ($item->pic_id != '')
-	{
-		$images = glob('./uploads/item_pics/' . $item->pic_id . '.*');
-		if (sizeof($images) > 0)
-		{
-			$image .= '<a class="rollover" href="'. base_url($images[0]) .'"><img src="'.site_url('items/pic_thumb/'.$item->pic_id).'"></a>';
-		}
-	}
-
-	return array (
-		'items.item_id' => $item->item_id,
-		'item_number' => $item->item_number,
-		'name' => $item->name,
-		'category' => $item->category,
-		'company_name' => $item->company_name,
-		'cost_price' => to_currency($item->cost_price),
-		'unit_price' => to_currency($item->unit_price),
-		'quantity' => to_quantity_decimals($item->quantity),
-		'tax_percents' => !$tax_percents ? '-' : $tax_percents,
-		'item_pic' => $image,
-		'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'))
-		),
-		'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'))
-		),
-		'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'))
-		));
-}
-
-function get_giftcards_manage_table_headers()
-{
-	$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'))
-	);
-
-	return transform_headers($headers);
-}
-
-function get_giftcard_data_row($giftcard, $controller)
-{
-	$CI =& get_instance();
-	$controller_name=strtolower(get_class($CI));
-
-	return array (
-		'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'))
-		));
-}
-
-function get_item_kits_manage_table_headers()
-{
-	$CI =& get_instance();
-
-	$headers = array(
-		array('item_kit_id' => $CI->lang->line('item_kits_kit')),
-		array('name' => $CI->lang->line('item_kits_name')),
-		array('description' => $CI->lang->line('item_kits_description')),
-		array('cost_price' => $CI->lang->line('items_cost_price'), 'sortable' => FALSE),
-		array('unit_price' => $CI->lang->line('items_unit_price'), 'sortable' => FALSE)
-	);
-
-	return transform_headers($headers);
-}
-
-function get_item_kit_data_row($item_kit, $controller)
-{
-	$CI =& get_instance();
-	$controller_name=strtolower(get_class($CI));
-
-	return array (
-		'item_kit_id' => $item_kit->item_kit_id,
-		'name' => $item_kit->name,
-		'description' => $item_kit->description,
-		'cost_price' => to_currency($item_kit->total_cost_price),
-		'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'))
-		));
-}
-
-?>

application/helpers/tabular_helper.php

@@ -0,0 +1,801 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Tabular views helper
+ */
+
+/*
+Basic tabular headers function
+*/
+function transform_headers_readonly($array)
+{
+	$result = array();
+
+	foreach($array as $key => $value)
+	{
+		$result[] = array('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)
+{
+	$result = array();
+
+	if(!$readonly)
+	{
+		$array = array_merge(array(array('checkbox' => 'select', 'sortable' => FALSE)), $array);
+	}
+
+	if($editable)
+	{
+		$array[] = array('edit' => '');
+	}
+
+	foreach($array as $element)
+	{
+		reset($element);
+		$result[] = array('field' => key($element),
+			'title' => current($element),
+			'switchable' => isset($element['switchable']) ? $element['switchable'] : !preg_match('(^$|&nbsp)', current($element)),
+			'sortable' => isset($element['sortable']) ? $element['sortable'] : current($element) != '',
+			'checkbox' => isset($element['checkbox']) ? $element['checkbox'] : FALSE,
+			'class' => isset($element['checkbox']) || preg_match('(^$|&nbsp)', current($element)) ? 'print_hide' : '',
+			'sorter' => isset($element['sorter']) ? $element ['sorter'] : '');
+	}
+
+	return json_encode($result);
+}
+
+
+/*
+Get the header for the sales tabular view
+*/
+function get_sales_manage_table_headers()
+{
+	$CI =& get_instance();
+
+	$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)
+	{
+		$headers[] = array('invoice_number' => $CI->lang->line('sales_invoice_number'));
+		$headers[] = array('invoice' => '&nbsp', 'sortable' => FALSE);
+	}
+
+	$headers[] = array('receipt' => '&nbsp', 'sortable' => FALSE);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the sales
+*/
+function get_sale_data_row($sale)
+{
+	$CI =& get_instance();
+
+	$controller_name = $CI->uri->segment(1);
+
+	$row = array (
+		'sale_id' => $sale->sale_id,
+		'sale_time' => to_datetime(strtotime($sale->sale_time)),
+		'customer_name' => $sale->customer_name,
+		'amount_due' => to_currency($sale->amount_due),
+		'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'))
+	{
+		$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['receipt'] = anchor($controller_name."/receipt/$sale->sale_id", '<span class="glyphicon glyphicon-usd"></span>',
+		array('title' => $CI->lang->line('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'))
+	);
+
+	return $row;
+}
+
+/*
+Get the html data last row for the sales
+*/
+function get_sale_data_last_row($sales)
+{
+	$CI =& get_instance();
+
+	$sum_amount_due = 0;
+	$sum_amount_tendered = 0;
+	$sum_change_due = 0;
+
+	foreach($sales->result() as $key=>$sale)
+	{
+		$sum_amount_due += $sale->amount_due;
+		$sum_amount_tendered += $sale->amount_tendered;
+		$sum_change_due += $sale->change_due;
+	}
+
+	return array(
+		'sale_id' => '-',
+		'sale_time' => '<b>'.$CI->lang->line('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)
+{
+	$CI =& get_instance();
+
+	$table = '<div id="report_summary">';
+	$total = 0;
+
+	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>';
+
+	return $table;
+}
+
+
+/*
+Get the header for the people tabular view
+*/
+function get_people_manage_table_headers()
+{
+	$CI =& get_instance();
+
+	$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'))
+	);
+
+	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	{
+		$headers[] = array('messages' => '', 'sortable' => FALSE);
+	}
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the person
+*/
+function get_person_data_row($person)
+{
+	$CI =& get_instance();
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+
+/*
+Get the header for the customer tabular view
+*/
+function get_customer_manage_table_headers()
+{
+	$CI =& get_instance();
+
+	$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)
+	);
+
+	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	{
+		$headers[] = array('messages' => '', 'sortable' => FALSE);
+	}
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the customer
+*/
+function get_customer_data_row($person, $stats)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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'))
+	));
+}
+
+
+/*
+Get the header for the suppliers tabular view
+*/
+function get_suppliers_manage_table_headers()
+{
+	$CI =& get_instance();
+
+	$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'))
+	);
+
+	if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id')))
+	{
+		$headers[] = array('messages' => '');
+	}
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the supplier
+*/
+function get_supplier_data_row($supplier)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'people.person_id' => $supplier->person_id,
+		'company_name' => $supplier->company_name,
+		'agency_name' => $supplier->agency_name,
+		'category' => $supplier->category,
+		'last_name' => $supplier->last_name,
+		'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')))
+	);
+}
+
+
+/*
+Get the header for the items tabular view
+*/
+function get_items_manage_table_headers()
+{
+	$CI =& get_instance();
+
+	$definition_names = $CI->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+
+	$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'))
+	);
+
+	if($CI->config->item('use_destination_based_tax') == '1')
+	{
+		$headers[] = array('tax_percents' => $CI->lang->line('items_tax_category'), 'sortable' => FALSE);
+	}
+	else
+	{
+		$headers[] = array('tax_percents' => $CI->lang->line('items_tax_percents'), 'sortable' => FALSE);
+
+	}
+
+	$headers[] = array('item_pic' => $CI->lang->line('items_image'), 'sortable' => FALSE);
+
+	foreach($definition_names as $definition_id => $definition_name)
+	{
+		$headers[] = array($definition_id => $definition_name, 'sortable' => FALSE);
+	}
+
+	$headers[] = array('inventory' => '');
+	$headers[] = array('stock' => '');
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the item
+*/
+function get_item_data_row($item)
+{
+	$CI =& get_instance();
+
+	if($CI->config->item('use_destination_based_tax') == '1')
+	{
+		if($item->tax_category_id == NULL)
+		{
+			$tax_percents = '-';
+		}
+		else
+		{
+			$tax_category_info = $CI->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);
+		$tax_percents = '';
+		foreach($item_tax_info as $tax_info)
+		{
+			$tax_percents .= to_tax_decimals($tax_info['percent']) . '%, ';
+		}
+		// remove ', ' from last item
+		$tax_percents = substr($tax_percents, 0, -2);
+		$tax_percents = !$tax_percents ? '-' : $tax_percents;
+	}
+
+	$controller_name = strtolower(get_class($CI));
+
+	$image = NULL;
+	if($item->pic_filename != '')
+	{
+		$ext = pathinfo($item->pic_filename, PATHINFO_EXTENSION);
+		if($ext == '')
+		{
+			// legacy
+			$images = glob('./uploads/item_pics/' . $item->pic_filename . '.*');
+		}
+		else
+		{
+			// preferred
+			$images = glob('./uploads/item_pics/' . $item->pic_filename);
+		}
+
+		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>';
+		}
+	}
+
+	if($CI->config->item('multi_pack_enabled') == '1')
+	{
+		$item->name .= NAME_SEPARATOR . $item->pack_name;
+	}
+
+	$definition_names = $CI->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+
+	$columns = array (
+		'items.item_id' => $item->item_id,
+		'item_number' => $item->item_number,
+		'name' => $item->name,
+		'category' => $item->category,
+		'company_name' => $item->company_name,
+		'cost_price' => to_currency($item->cost_price),
+		'unit_price' => to_currency($item->unit_price),
+		'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'))
+		),
+		'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'))
+		),
+		'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'))
+		)
+	);
+
+	return $columns + expand_attribute_values($definition_names, (array) $item) + $icons;
+
+}
+
+
+/*
+Get the header for the giftcard tabular view
+*/
+function get_giftcards_manage_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the giftcard
+*/
+function get_giftcard_data_row($giftcard)
+{
+	$CI =& get_instance();
+
+	$controller_name=strtolower(get_class($CI));
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+/*
+Get the header for the item kits tabular view
+*/
+function get_item_kits_manage_table_headers()
+{
+	$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)
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the item kit
+*/
+function get_item_kit_data_row($item_kit)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+function parse_attribute_values($columns, $row) {
+	$attribute_values = array();
+	foreach($columns as $column) {
+		if (array_key_exists($column, $row))
+		{
+			$attribute_value = explode('|', $row[$column]);
+			$attribute_values = array_merge($attribute_values, $attribute_value);
+		}
+	}
+	return $attribute_values;
+}
+
+function expand_attribute_values($definition_names, $row)
+{
+	$values = parse_attribute_values(array('attribute_values', 'attribute_dtvalues', 'attribute_dvalues'), $row);
+
+	$indexed_values = array();
+	foreach($values as $attribute_value)
+	{
+		$exploded_value = explode('_', $attribute_value);
+		if(sizeof($exploded_value) > 1)
+		{
+			$indexed_values[$exploded_value[0]] = $exploded_value[1];
+		}
+	}
+
+	$attribute_values = array();
+	foreach($definition_names as $definition_id => $definition_name)
+	{
+		if(isset($indexed_values[$definition_id]))
+		{
+			$attribute_value = $indexed_values[$definition_id];
+			$attribute_values["$definition_id"] = $attribute_value;
+		}
+	}
+
+	return $attribute_values;
+}
+
+function get_attribute_definition_manage_table_headers()
+{
+	$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')),
+	);
+
+	return transform_headers($headers);
+}
+
+function get_attribute_definition_data_row($attribute)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	if(count($attribute->definition_flags) == 0)
+	{
+		$definition_flags = $CI->lang->line('common_none_selected_text');
+	}
+	else if($attribute->definition_type == GROUP)
+	{
+		$definition_flags = "-";
+	}
+	else
+	{
+		$definition_flags = implode(', ', $attribute->definition_flags);
+	}
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+/*
+Get the header for the expense categories tabular view
+*/
+function get_expense_category_manage_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Gets the html data row for the expenses category
+*/
+function get_expense_category_data_row($expense_category)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+
+/*
+Get the header for the expenses tabular view
+*/
+function get_expenses_manage_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Gets the html data row for the expenses
+*/
+function get_expenses_data_row($expense)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'expense_id' => $expense->expense_id,
+		'date' => to_datetime(strtotime($expense->date)),
+		'supplier_name' => $expense->supplier_name,
+		'supplier_tax_code' => $expense->supplier_tax_code,
+		'amount' => to_currency($expense->amount),
+		'tax_amount' => to_currency($expense->tax_amount),
+		'payment_type' => $expense->payment_type,
+		'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'))
+		)
+	);
+}
+
+/*
+Get the html data last row for the expenses
+*/
+function get_expenses_data_last_row($expense)
+{
+	$CI =& get_instance();
+
+	$table_data_rows = '';
+	$sum_amount_expense = 0;
+	$sum_tax_amount_expense = 0;
+
+	foreach($expense->result() as $key=>$expense)
+	{
+		$sum_amount_expense += $expense->amount;
+		$sum_tax_amount_expense += $expense->tax_amount;
+	}
+
+	return array(
+		'expense_id' => '-',
+		'date' => '<b>'.$CI->lang->line('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)
+{
+	$CI =& get_instance();
+
+	$table = '<div id="report_summary">';
+
+	foreach($payments as $key=>$payment)
+	{
+		$amount = $payment['amount'];
+		$table .= '<div class="summary_row">' . $payment['payment_type'] . ': ' . to_currency($amount) . '</div>';
+	}
+
+	$table .= '</div>';
+
+	return $table;
+}
+
+
+/*
+Get the header for the cashup tabular view
+*/
+function get_cashups_manage_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Gets the html data row for the cashups
+*/
+function get_cash_up_data_row($cash_up)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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,
+		'open_amount_cash' => to_currency($cash_up->open_amount_cash),
+		'transfer_amount_cash' => to_currency($cash_up->transfer_amount_cash),
+		'close_date' => to_datetime(strtotime($cash_up->close_date)),
+		'close_employee_id' => $cash_up->close_first_name . ' ' . $cash_up->close_last_name,
+		'closed_amount_cash' => to_currency($cash_up->closed_amount_cash),
+		'note' => $cash_up->note ? '<span class="glyphicon glyphicon-ok"></span>' : '<span class="glyphicon glyphicon-remove"></span>',
+		'closed_amount_due' => to_currency($cash_up->closed_amount_due),
+		'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'))
+		)
+	);
+}
+?>

application/helpers/tax_helper.php

@@ -0,0 +1,158 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Tax Configuration tabular helpers
+ */
+
+/*
+Get the header for the taxes tabular view
+*/
+function get_tax_code_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the tax
+*/
+function get_tax_code_data_row($tax_code_row)
+{
+	$CI =& get_instance();
+
+	$controller_name = 'tax_codes';
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+/*
+Get the header for the taxes tabular view
+*/
+function get_tax_categories_table_headers()
+{
+	$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')),
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the tax
+*/
+function get_tax_categories_data_row($tax_categories_row)
+{
+	$CI =& get_instance();
+
+	$controller_name = 'tax_categories';
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+/*
+Get the header for the taxes tabular view
+*/
+function get_tax_jurisdictions_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the tax
+*/
+function get_tax_jurisdictions_data_row($tax_jurisdiction_row)
+{
+	$CI =& get_instance();
+	$controller_name='tax_jurisdictions';
+
+	return array (
+		'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'))
+		)
+	);
+}
+
+/*
+Get the header for the taxes tabular view
+*/
+function get_tax_rates_manage_table_headers()
+{
+	$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'))
+	);
+
+	return transform_headers($headers);
+}
+
+/*
+Get the html data row for the tax
+*/
+function get_tax_rates_data_row($tax_rates_row)
+{
+	$CI =& get_instance();
+
+	$controller_name = strtolower(get_class($CI));
+
+	return array (
+		'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,
+		'tax_category' => $tax_rates_row->tax_category,
+		'tax_rate' => $tax_rates_row->tax_rate,
+		'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'))
+		)
+	);
+}
+
+?>

application/hooks/db_log.php

@@ -1,5 +1,8 @@
-<?php
-// Name of function same as mentioned in Hooks Config
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Name of function same as mentioned in Hooks Config
+ */
 function db_log_queries()
 {
 	$CI = & get_instance();
@@ -14,7 +17,7 @@ function db_log_queries()
 
 		// Get execution time of all the queries executed by controller
 		$times = $CI->db->query_times;
-		foreach ($CI->db->queries as $key => $query)
+		foreach($CI->db->queries as $key => $query)
 		{ 
 			// Generating SQL file alongwith execution time
 			$sql = $query . " \n Execution Time:" . $times[$key];
@@ -26,4 +29,5 @@ function db_log_queries()
 		fclose($handle);
 	}
 }
-?>
+
+?>

application/hooks/load_config.php

@@ -1,28 +1,34 @@
-<?php
-//Loads configuration from database into global CI config
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Loads configuration from database into global CI config
+ */
 function load_config()
 {
     $CI =& get_instance();
 
+    $migration = $CI->load->library('migration');
+    if (!$CI->migration->is_latest())
+    {
+        $CI->session->sess_destroy();
+    }
+
     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));
     }
-    
-    //Loads all the language files from the language directory
-    if(!empty(current_language()))
-    {
-        // fallback to English if language folder does not exist
-        if (!file_exists('../application/language/' . current_language_code()))
-        {
-            $CI->config->set_item('language', 'english');
-            $CI->config->set_item('language_code', 'en');
-        }
 
-        load_language_files('../vendor/codeigniter/framework/system/language', current_language());
-        load_language_files('../application/language', current_language_code());
+    // 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'))
     {
@@ -33,26 +39,42 @@ function load_config()
         date_default_timezone_set('America/New_York');
     }
 
-    bcscale(max(2, $CI->config->item('currency_decimals') + $CI->config->item('tax_decimals')));
+    bcscale(max(2, totals_decimals() + tax_decimals()));
 }
 
 /**
- * @param $language
  * @param $CI
+ * @param $path
+ * @param $language
+ * @param $fallback
  */
-function load_language_files($path, $language)
+function _load_language_files($CI, $path, $language, $fallback)
 {
-    $CI =& get_instance();
-
     $map = directory_map($path . DIRECTORY_SEPARATOR . $language);
 
     foreach($map as $file)
 	{
+
         if(!is_array($file) && substr(strrchr($file, '.'), 1) == 'php')
 		{
-            $CI->lang->load(strtr($file, '', '_lang.php'), $language);
+            $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);
+            }
+
         }
     }
 }
 
-?>
+?>

application/hooks/load_stats.php

@@ -1,58 +0,0 @@
-<?php
-
-function load_stats()
-{
-    $CI =& get_instance();
-    $line = $CI->lang->line('common_you_are_using_ospos');
-
-    if(count($CI->session->userdata('session_sha1')) == 0)
-    {
-        $footer_tags = file_get_contents(APPPATH . 'views/partial/footer.php');
-        $d = preg_replace('/\$Id:\s.*?\s\$/', '$Id$', $footer_tags);
-        $session_sha1 = sha1("blob " .strlen( $d ). "\0" . $d);
-        $CI->session->set_userdata('session_sha1', substr($session_sha1, 0, 7));
-
-        preg_match('/\$Id:\s(.*?)\s\$/', $footer_tags, $matches);
-        $needle = 'Open Source Point Of Sale';
-
-        if(!stristr($line, $needle) || $session_sha1 != $matches[1])
-        {
-            $CI->load->library('tracking_lib');
-
-            $roguer = $CI->Appconfig->get('company') . ' | ' .  $CI->Appconfig->get('address') . ' | ' . $CI->Appconfig->get('email') . ' | ' . $CI->Appconfig->get('website') . ' | ' . $CI->config->item('base_url');
-            $CI->tracking_lib->track_page('rogue/roguer', 'roguer', $roguer);
-            $CI->tracking_lib->track_page('rogue/footer', 'rogue footer', $footer_tags);
-
-			$login_footer = '';
-
-			if($handle = @fopen(APPPATH . 'views/login.php', 'r'))
-			{
-				while(!feof($handle))
-				{
-					$buffer = fgets($handle);
-					if(strpos($buffer, $needle) !== FALSE)
-					{
-						$login_footer = '';
-					}
-					elseif(strpos($buffer, 'form_close') !== FALSE)
-					{
-						$login_footer = 'Footer: ';
-					}
-					elseif($login_footer != '')
-					{
-						$login_footer .= $buffer;
-					}
-				}
-
-				fclose($handle);
-			}
-
-            if($login_footer != '')
-            {
-                $CI->tracking_lib->track_page('rogue/login', 'rogue login', $login_footer);
-            }
-        }
-    }
-}
-
-?>

application/hooks/save_hook.php

@@ -0,0 +1,16 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+function validate_save()
+{
+
+    $url = $_SERVER['REQUEST_URI'];
+
+    $is_save = preg_match('/save\/\d*?/', $url);
+
+    if($is_save && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
+    {
+        echo "Method not allowed";
+        die;
+    }
+
+}

application/language/Language code definition

@@ -2,9 +2,7 @@ ISO Language Code Table
 -----------------------
 
 Code	Name
-af	Afrikaans
 af-ZA	Afrikaans (South Africa)
-ar	Arabic
 ar-AE	Arabic (U.A.E.)
 ar-BH	Arabic (Bahrain)
 ar-DZ	Arabic (Algeria)
@@ -21,33 +19,22 @@ ar-SA	Arabic (Saudi Arabia)
 ar-SY	Arabic (Syria)
 ar-TN	Arabic (Tunisia)
 ar-YE	Arabic (Yemen)
-az	Azeri (Latin)
 az-AZ	Azeri (Latin) (Azerbaijan)
 az-AZ	Azeri (Cyrillic) (Azerbaijan)
-be	Belarusian
 be-BY	Belarusian (Belarus)
-bg	Bulgarian
 bg-BG	Bulgarian (Bulgaria)
 bs-BA	Bosnian (Bosnia and Herzegovina)
-ca	Catalan
 ca-ES	Catalan (Spain)
-cs	Czech
 cs-CZ	Czech (Czech Republic)
-cy	Welsh
 cy-GB	Welsh (United Kingdom)
-da	Danish
 da-DK	Danish (Denmark)
-de	German
 de-AT	German (Austria)
 de-CH	German (Switzerland)
 de-DE	German (Germany)
 de-LI	German (Liechtenstein)
 de-LU	German (Luxembourg)
-dv	Divehi
 dv-MV	Divehi (Maldives)
-el	Greek
 el-GR	Greek (Greece)
-en	English
 en-AU	English (Australia)
 en-BZ	English (Belize)
 en-CA	English (Canada)
@@ -61,8 +48,6 @@ en-TT	English (Trinidad and Tobago)
 en-US	English (United States)
 en-ZA	English (South Africa)
 en-ZW	English (Zimbabwe)
-eo	Esperanto
-es	Spanish
 es-AR	Spanish (Argentina)
 es-BO	Spanish (Bolivia)
 es-CL	Spanish (Chile)
@@ -83,104 +68,61 @@ es-PY	Spanish (Paraguay)
 es-SV	Spanish (El Salvador)
 es-UY	Spanish (Uruguay)
 es-VE	Spanish (Venezuela)
-et	Estonian
 et-EE	Estonian (Estonia)
-eu	Basque
 eu-ES	Basque (Spain)
-fa	Farsi
 fa-IR	Farsi (Iran)
-fi	Finnish
 fi-FI	Finnish (Finland)
-fo	Faroese
 fo-FO	Faroese (Faroe Islands)
-fr	French
 fr-BE	French (Belgium)
 fr-CA	French (Canada)
 fr-CH	French (Switzerland)
 fr-FR	French (France)
 fr-LU	French (Luxembourg)
 fr-MC	French (Principality of Monaco)
-gl	Galician
 gl-ES	Galician (Spain)
-gu	Gujarati
 gu-IN	Gujarati (India)
-he	Hebrew
 he-IL	Hebrew (Israel)
-hi	Hindi
 hi-IN	Hindi (India)
-hr	Croatian
 hr-BA	Croatian (Bosnia and Herzegovina)
 hr-HR	Croatian (Croatia)
-hu	Hungarian
 hu-HU	Hungarian (Hungary)
-hy	Armenian
 hy-AM	Armenian (Armenia)
-id	Indonesian
 id-ID	Indonesian (Indonesia)
-is	Icelandic
 is-IS	Icelandic (Iceland)
-it	Italian
 it-CH	Italian (Switzerland)
 it-IT	Italian (Italy)
-ja	Japanese
 ja-JP	Japanese (Japan)
-ka	Georgian
 ka-GE	Georgian (Georgia)
-kk	Kazakh
 kk-KZ	Kazakh (Kazakhstan)
-kn	Kannada
 kn-IN	Kannada (India)
-ko	Korean
 ko-KR	Korean (Korea)
-kok	Konkani
 kok-IN	Konkani (India)
-ky	Kyrgyz
 ky-KG	Kyrgyz (Kyrgyzstan)
-lt	Lithuanian
 lt-LT	Lithuanian (Lithuania)
-lv	Latvian
 lv-LV	Latvian (Latvia)
-mi	Maori
 mi-NZ	Maori (New Zealand)
-mk	FYRO Macedonian
 mk-MK	FYRO Macedonian (Former Yugoslav Republic of Macedonia)
-mn	Mongolian
 mn-MN	Mongolian (Mongolia)
-mr	Marathi
 mr-IN	Marathi (India)
-ms	Malay
 ms-BN	Malay (Brunei Darussalam)
 ms-MY	Malay (Malaysia)
-mt	Maltese
 mt-MT	Maltese (Malta)
-nb	Norwegian (Bokm?l)
 nb-NO	Norwegian (Bokm?l) (Norway)
-nl	Dutch
 nl-BE	Dutch (Belgium)
 nl-NL	Dutch (Netherlands)
 nn-NO	Norwegian (Nynorsk) (Norway)
-ns	Northern Sotho
 ns-ZA	Northern Sotho (South Africa)
-pa	Punjabi
 pa-IN	Punjabi (India)
-pl	Polish
 pl-PL	Polish (Poland)
-ps	Pashto
 ps-AR	Pashto (Afghanistan)
-pt	Portuguese
 pt-BR	Portuguese (Brazil)
 pt-PT	Portuguese (Portugal)
-qu	Quechua
 qu-BO	Quechua (Bolivia)
 qu-EC	Quechua (Ecuador)
 qu-PE	Quechua (Peru)
-ro	Romanian
 ro-RO	Romanian (Romania)
-ru	Russian
 ru-RU	Russian (Russia)
-sa	Sanskrit
 sa-IN	Sanskrit (India)
-se	Sami (Northern)
 se-FI	Sami (Northern) (Finland)
 se-FI	Sami (Skolt) (Finland)
 se-FI	Sami (Inari) (Finland)
@@ -190,55 +132,35 @@ se-NO	Sami (Southern) (Norway)
 se-SE	Sami (Northern) (Sweden)
 se-SE	Sami (Lule) (Sweden)
 se-SE	Sami (Southern) (Sweden)
-sk	Slovak
 sk-SK	Slovak (Slovakia)
-sl	Slovenian
 sl-SI	Slovenian (Slovenia)
-sq	Albanian
 sq-AL	Albanian (Albania)
 sr-BA	Serbian (Latin) (Bosnia and Herzegovina)
 sr-BA	Serbian (Cyrillic) (Bosnia and Herzegovina)
 sr-SP	Serbian (Latin) (Serbia and Montenegro)
 sr-SP	Serbian (Cyrillic) (Serbia and Montenegro)
-sv	Swedish
 sv-FI	Swedish (Finland)
 sv-SE	Swedish (Sweden)
-sw	Swahili
 sw-KE	Swahili (Kenya)
-syr	Syriac
 syr-SY	Syriac (Syria)
-ta	Tamil
 ta-IN	Tamil (India)
-te	Telugu
 te-IN	Telugu (India)
-th	Thai
 th-TH	Thai (Thailand)
-tl	Tagalog
 tl-PH	Tagalog (Philippines)
-tn	Tswana
 tn-ZA	Tswana (South Africa)
-tr	Turkish
 tr-TR	Turkish (Turkey)
-tt	Tatar
 tt-RU	Tatar (Russia)
-ts	Tsonga
-uk	Ukrainian
 uk-UA	Ukrainian (Ukraine)
-ur	Urdu
 ur-PK	Urdu (Islamic Republic of Pakistan)
-uz	Uzbek (Latin)
 uz-UZ	Uzbek (Latin) (Uzbekistan)
 uz-UZ	Uzbek (Cyrillic) (Uzbekistan)
-vi	Vietnamese
 vi-VN	Vietnamese (Viet Nam)
-xh	Xhosa
 xh-ZA	Xhosa (South Africa)
-zh	Chinese
 zh-CN	Chinese (S)
+zh-Hans	Chinese in the simplified scrip
+zh-Hant	Chinese in the traditional script
 zh-HK	Chinese (Hong Kong)
 zh-MO	Chinese (Macau)
 zh-SG	Chinese (Singapore)
 zh-TW	Chinese (T)
-zu	Zulu
 zu-ZA	Zulu (South Africa)
-

application/language/ar-EG/attributes_lang.php

@@ -0,0 +1,31 @@
+<?php 
+
+$lang["attributes_attribute_value_invalid_chars"] = "الميزات لا يمكن أن تحتوي على ':' أو'|'";
+$lang["attributes_confirm_delete"] = "هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟";
+$lang["attributes_confirm_restore"] = "هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟";
+$lang["attributes_definition_cannot_be_deleted"] = "لا يمكن حذف السمات المحددة";
+$lang["attributes_definition_error_adding_updating"] = "لا يمكن إضافة السمة ٪1 أو تحديثها. يرجى التحقق من سجل الخطأ.";
+$lang["attributes_definition_flags"] = "رؤية الميزات";
+$lang["attributes_definition_group"] = "المجموعة";
+$lang["attributes_definition_id"] = "كود";
+$lang["attributes_definition_name"] = "إضافة ميزة";
+$lang["attributes_definition_name_required"] = "اسم الميزة هي خانة اجبارية";
+$lang["attributes_definition_one_or_multiple"] = "ميزة/ميزات";
+$lang["attributes_definition_successful_adding"] = "لقد تم إضافة صنف بنجاح";
+$lang["attributes_definition_successful_deleted"] = "لقد تم حذف ميزة بنجاح";
+$lang["attributes_definition_successful_updating"] = "تم تعديل الميزة بنجاح";
+$lang["attributes_definition_type"] = "نوع الميزة";
+$lang["attributes_definition_type_required"] = "نوع الميزة هي خانة إجبارية";
+$lang["attributes_definition_unit"] = "وحدة قياس";
+$lang["attributes_definition_values"] = "قيمة الميزة";
+$lang["attributes_new"] = "اضافة ميزة جديده";
+$lang["attributes_no_attributes_to_display"] = "لا يوجد اصناف للعرض";
+$lang["attributes_receipt_visibility"] = "وصل";
+$lang["attributes_show_in_items"] = "اظهار في الصنف";
+$lang["attributes_show_in_items_visibility"] = "الصنف";
+$lang["attributes_show_in_receipt"] = "اظهار على الوصل";
+$lang["attributes_show_in_receivings"] = "اظهار في استلام البضائع";
+$lang["attributes_show_in_receivings_visibility"] = "استلام البضائع";
+$lang["attributes_show_in_sales"] = "اظهار خلال البيع";
+$lang["attributes_show_in_sales_visibility"] = "البيع";
+$lang["attributes_update"] = "تحديث الميزات";

application/language/ar-EG/bootstrap_tables_lang.php

@@ -1,10 +1,10 @@
 <?php 
 
-$lang["tables_loading"] = "جارى التحميل، برجاء الإنتظار";
-$lang["tables_rows_per_page"] = "{0} صف بالصفحة";
-$lang["tables_page_from_to"] = "عرض {0} إلى {1} من {2} صفوف";
-$lang["tables_hide_show_pagination"] = "عرض/إخفاء أرقام الصفحات";
-$lang["tables_refresh"] = "إعادة تحميل";
-$lang["tables_toggle"] = "تغيير";
-$lang["tables_columns"] = "أعمدة";
 $lang["tables_all"] = "الجميع";
+$lang["tables_columns"] = "أعمدة";
+$lang["tables_hide_show_pagination"] = "عرض/إخفاء أرقام الصفحات";
+$lang["tables_loading"] = "جارى التحميل، برجاء الإنتظار ...";
+$lang["tables_page_from_to"] = "عرض {0} إلى {1} من {2} صفوف";
+$lang["tables_refresh"] = "إعادة تحميل";
+$lang["tables_rows_per_page"] = "{0} صف بالصفحة";
+$lang["tables_toggle"] = "تغيير";

application/language/ar-EG/cashups_lang.php

@@ -0,0 +1,38 @@
+<?php 
+
+$lang["cashups_amount"] = "قيمة المبلغ";
+$lang["cashups_amount_number"] = "قيمة المبلغ يجب ان تتكون من ارقام";
+$lang["cashups_amount_required"] = "قيمة المبلغ هي خانة إجبارية.";
+$lang["cashups_cannot_be_deleted"] = "لا يمكن حذف الصندوق النقدي";
+$lang["cashups_close_date"] = "تاريخ تسكير الصندوق";
+$lang["cashups_close_employee"] = "تم التسكير من قبل";
+$lang["cashups_closed_amount_card"] = "بطاقات ائتمان";
+$lang["cashups_closed_amount_cash"] = "الصندوق النقدي";
+$lang["cashups_closed_amount_check"] = "شيكات";
+$lang["cashups_closed_amount_due"] = "الديون";
+$lang["cashups_closed_amount_total"] = "المجموع";
+$lang["cashups_closed_date"] = "تاريخ تسكير الصندوق";
+$lang["cashups_confirm_delete"] = "هل انت متأكد من حذف الصندوق النقدي؟";
+$lang["cashups_confirm_restore"] = "هل انت متأكد من استعادة الصندوق النقدي؟";
+$lang["cashups_date_number"] = "التاريخ يجب ان يكون مكون من ارقام";
+$lang["cashups_date_required"] = "التاريخ هي خانة اجبارية";
+$lang["cashups_description"] = "الوصف";
+$lang["cashups_error_adding_updating"] = "خطأ في تعديل او اضافة صندوق نقدي";
+$lang["cashups_id"] = "كود";
+$lang["cashups_info"] = "معلومات عن الصندوق النقدي";
+$lang["cashups_is_deleted"] = "محذوف";
+$lang["cashups_new"] = "صندوق نقدي جديد";
+$lang["cashups_no_cashups_to_display"] = "لا يوجد صناديق نقدية للاظهار";
+$lang["cashups_none_selected"] = "لم يتم اختيار اي صندوق نقدي";
+$lang["cashups_note"] = "ملاحظات";
+$lang["cashups_one_or_multiple"] = "صندوق او صناديق نقدية";
+$lang["cashups_open_amount_cash"] = "بداية صندوق نقدي";
+$lang["cashups_open_date"] = "تاريخ بداية الصندوق النقدي";
+$lang["cashups_open_employee"] = "تمت بداية الصندوق النقدي من قبل";
+$lang["cashups_opened_date"] = "تاريخ بداية الصندوق النقدي";
+$lang["cashups_successful_adding"] = "تمت إضافة الصندوق النقدي بنجاح";
+$lang["cashups_successful_deleted"] = "تم حذف الصندوق النقدي بنجاح";
+$lang["cashups_successful_updating"] = "تم تعديل الصندوق النقدي بنجاح";
+$lang["cashups_total"] = "المجموع";
+$lang["cashups_transfer_amount_cash"] = "حركة الصندوق";
+$lang["cashups_update"] = "تعديل/تحديث الصندوق النقدي";

application/language/ar-EG/common_lang.php

@@ -7,59 +7,73 @@ $lang["common_close"] = "إغلاق";
 $lang["common_comments"] = "تعليقات";
 $lang["common_common"] = "عام";
 $lang["common_confirm_search"] = "لقد قمت اختيار أكتر من سجل، سوف تفقد هذه الاختيارات عند إرسال البحث، موافق؟";
+$lang["common_copyrights"] = "© 2010 - %1";
+$lang["common_correct_errors"] = "يرجى تصحيح الأخطاء المحددة قبل الحفظ";
 $lang["common_country"] = "البلد";
 $lang["common_date"] = "التاريخ";
 $lang["common_delete"] = "حذف";
-$lang["common_print"] = "طباعة";
 $lang["common_det"] = "تفاصيل";
+$lang["common_download_import_template"] = "تنزيل قالب الاستيراد من اكسل (CSV)";
 $lang["common_edit"] = "تحرير";
 $lang["common_email"] = "بريد إلكتروني";
-$lang["common_email_invalid_format"] = "شكل البريد الإلكتروني غير صحيح";
+$lang["common_email_invalid_format"] = "شكل البريد الإلكتروني غير صحيح.";
+$lang["common_export_csv"] = "تصدير إلى اكسل";
+$lang["common_export_csv_no"] = "لا";
+$lang["common_export_csv_yes"] = "نعم";
 $lang["common_fields_required_message"] = "الحقول التي بالأحمر مطلوبة";
 $lang["common_first_name"] = "الاسم الأول";
-$lang["common_first_name_required"] = "الاسم الأول مطلوب";
+$lang["common_first_name_required"] = "الاسم الأول مطلوب.";
 $lang["common_first_page"] = "الأول";
 $lang["common_gender"] = "النوع";
 $lang["common_gender_female"] = "أنثى";
 $lang["common_gender_male"] = "ذكر";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
+$lang["common_id"] = "كود";
+$lang["common_import"] = "استيراد";
+$lang["common_import_change_file"] = "تغيير";
+$lang["common_import_csv"] = "استيراد من اكسل";
+$lang["common_import_full_path"] = "المسار الكامل لملف اكسل مطلوب";
+$lang["common_import_remove_file"] = "إزالة";
+$lang["common_import_select_file"] = "اختار ملف";
 $lang["common_inv"] = "المخزن";
 $lang["common_last_name"] = "الاسم الأخير";
-$lang["common_last_name_required"] = "الاسم الأخير مطلوب";
+$lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
 $lang["common_last_page"] = "الأخيرة";
-$lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع";
+$lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
 $lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "خروج";
+$lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
 $lang["common_new"] = "جديد";
-$lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم";
-$lang["common_none_selected_text"] = "لم يتم اختيار شيء";
+$lang["common_no"] = "";
+$lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم.";
+$lang["common_none_selected_text"] = "[إختيار]";
 $lang["common_or"] = "أو";
 $lang["common_phone_number"] = "رقم التليفون";
 $lang["common_phone_number_required"] = "رقم التليفون مطلوب";
 $lang["common_please_visit_my"] = "برجاء زيارة";
 $lang["common_powered_by"] = "مدعوم بواسطة";
 $lang["common_price"] = "السعر";
+$lang["common_print"] = "طباعة";
 $lang["common_remove"] = "إزالة";
+$lang["common_required"] = "مطلوب";
+$lang["common_restore"] = "الإستعادة";
 $lang["common_return_policy"] = "سياسة الاسترجاع";
 $lang["common_search"] = "بحث";
 $lang["common_search_options"] = "خيارات البحث";
 $lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "المحافظة";
 $lang["common_submit"] = "حفظ";
+$lang["common_total_spent"] = "مجموع الصرف";
+$lang["common_unknown"] = "غير معروف";
 $lang["common_view_recent_sales"] = "عرض أحدث المبيعات";
 $lang["common_website"] = "الموقع الإلكترونى";
 $lang["common_welcome"] = "مرحباً";
-$lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء";
-$lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale ";
+$lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء.";
+$lang["common_yes"] = "";
+$lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale";
 $lang["common_zip"] = "الرقم البريدى";
-$lang["common_import"] = "استيراد";
-$lang["common_download_import_template"] = "تنزيل قالب الاستيراد من اكسل (CSV)";
-$lang["common_import_excel"] = "استيراد من اكسل";
-$lang["common_import_full_path"] = "المسار الكامل لملف اكسل مطلوب";
-$lang["common_import_select_file"] = "اختار ملف";
-$lang["common_import_change_file"] = "تغيير";
-$lang["common_import_remove_file"] = "إزالة";
-$lang["common_export_excel"] = "تصدير إلى اكسل";
-$lang["common_export_excel_yes"] = "نعم";
-$lang["common_export_excel_no"] = "لا";
-$lang["common_required"] = "مطلوب";
-$lang["common_id"] = "كود";

application/language/ar-EG/config_lang.php

@@ -1,7 +1,9 @@
 <?php 
 
 $lang["config_address"] = "عنوان الشركة";
-$lang["config_address_required"] = "عنوان الشركة مطلوب";
+$lang["config_address_required"] = "عنوان الشركة مطلوب.";
+$lang["config_all_set"] = "All file permissions are set correctly!";
+$lang["config_allow_duplicate_barcodes"] = "السماح بتشابة الباركود";
 $lang["config_apostrophe"] = "الفاصلة";
 $lang["config_backup_button"] = "نسخ إحتياطى";
 $lang["config_backup_database"] = "نسخ إحتياطى لقاعدة البيانات";
@@ -11,6 +13,8 @@ $lang["config_barcode_configuration"] = "اعدادات الباركود";
 $lang["config_barcode_content"] = "محتويات الباركود";
 $lang["config_barcode_first_row"] = "الصف 1";
 $lang["config_barcode_font"] = "الخط";
+$lang["config_barcode_formats"] = "اشكال الادخال";
+$lang["config_barcode_generate_if_empty"] = "توليد اذا كان الباركود فارغ.";
 $lang["config_barcode_height"] = "الارتفاع (px)";
 $lang["config_barcode_id"] = "كود/اسم الصنف";
 $lang["config_barcode_info"] = "معلومات اعدادات الباركود";
@@ -18,167 +22,283 @@ $lang["config_barcode_layout"] = "تخطيط الباركود";
 $lang["config_barcode_name"] = "الاسم";
 $lang["config_barcode_number"] = "الباركود UPC/EAN/ISBN";
 $lang["config_barcode_number_in_row"] = "الرقم فى الصف";
-$lang["config_barcode_page_cellspacing"] = "المسافة بين الخلايا فى صفحة العرض";
+$lang["config_barcode_page_cellspacing"] = "المسافة بين الخلايا فى صفحة العرض.";
 $lang["config_barcode_page_width"] = "عرض الصفحة";
 $lang["config_barcode_price"] = "السعر";
-$lang["config_barcode_quality"] = "الجودة (1-100)";
 $lang["config_barcode_second_row"] = "الصف 2";
 $lang["config_barcode_third_row"] = "الصف 3";
+$lang["config_barcode_tooltip"] = "تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.";
 $lang["config_barcode_type"] = "نوعية الباركود";
 $lang["config_barcode_width"] = "العرض (px)";
-$lang["config_barcode_generate_if_empty"] = "توليد اذا كان الباركود فارغ";
 $lang["config_bottom"] = "الأسفل";
+$lang["config_cash_decimals"] = "فواصل النقدية";
+$lang["config_cash_decimals_tooltip"] = "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.";
+$lang["config_cash_rounding"] = "التقريب النقدي";
+$lang["config_category_dropdown"] = "";
 $lang["config_center"] = "الوسط";
+$lang["config_comma"] = "فاصلة";
 $lang["config_company"] = "اسم الشركة";
-$lang["config_company_logo"] = "شعار الشركة";
-$lang["config_company_select_image"] = "اختار صورة";
 $lang["config_company_change_image"] = "تغيير الصورة";
+$lang["config_company_logo"] = "شعار الشركة";
 $lang["config_company_remove_image"] = "إزالة الصورة";
 $lang["config_company_required"] = "اسم الشركة مطلوب";
-$lang["config_company_website_url"] = "الموقع الإلكترونى للشركة غير صحيح";
-$lang["config_comma"] = "فاصلة";
+$lang["config_company_select_image"] = "اختار صورة";
+$lang["config_company_website_url"] = "الموقع الإلكترونى للشركة غير صحيح.";
 $lang["config_country_codes"] = "أكواد الدولة";
-$lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة لاسماء الدول للبحث";
-$lang["config_currency_symbol"] = "رمز العملة";
+$lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة لاسماء الدول للبحث.";
+$lang["config_currency_code"] = "رمز العملة";
 $lang["config_currency_decimals"] = "العلامة العشرية للعملة";
-$lang["config_custom1"] = "حقل مخصص 1";
-$lang["config_custom2"] = "حقل مخصص 2";
-$lang["config_custom3"] = "حقل مخصص 3";
-$lang["config_custom4"] = "حقل مخصص 4";
-$lang["config_custom5"] = "حقل مخصص 5";
-$lang["config_custom6"] = "حقل مخصص 6";
-$lang["config_custom7"] = "حقل مخصص 7";
-$lang["config_custom8"] = "حقل مخصص 8";
-$lang["config_custom9"] = "حقل مخصص 9";
-$lang["config_custom10"] = "حقل مخصص 10";
+$lang["config_currency_symbol"] = "رمز العملة";
+$lang["config_customer_reward"] = "المكافآت";
+$lang["config_customer_reward_duplicate"] = "المكافئة يجب ان تكون فريدة.";
+$lang["config_customer_reward_enable"] = "تمكين مكافآت العميل";
+$lang["config_customer_reward_invalid_chars"] = "لا يمكن أن تحتوي المكافأة على '_'";
+$lang["config_customer_reward_required"] = "المكافأة هي حقل مطلوب";
+$lang["config_customer_sales_tax_support"] = "دعم الضرائب المبيعات العملاء";
+$lang["config_date_or_time_format"] = "تصفية التاريخ والوقت";
 $lang["config_datetimeformat"] = "شكل الوقت و التاريخ";
 $lang["config_decimal_point"] = "العلامة العشرية";
-$lang["config_default_barcode_font_size_number"] = "الحجم الافتراضي لخط الباركود لابد أن يكون رقم";
-$lang["config_default_barcode_font_size_required"] = "الحجم الافتراضي لخط الباركود مطلوب";
-$lang["config_default_barcode_height_number"] = "الارتفاع الافتراضي للباركود لابد ان يكون رقم";
-$lang["config_default_barcode_height_required"] = "الارتفاع الافتراضي للباركود مطلوب";
-$lang["config_default_barcode_num_in_row_number"] = "رقم الباركود فى اى سطر لابد ان يكون رقم";
-$lang["config_default_barcode_num_in_row_required"] = "رقم الباركود فى اى سطر مطلوب";
-$lang["config_default_barcode_page_cellspacing_number"] = "المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم";
-$lang["config_default_barcode_page_cellspacing_required"] = "المسافة الافتراضية بين خلايا الباركود مطلوبة";
-$lang["config_default_barcode_page_width_number"] = "عرض الصفحة الافتراضي للباركود لابد ان يكون رقم";
-$lang["config_default_barcode_page_width_required"] = "عرض الصفحة الافتراضي للباركود مطلوب";
-$lang["config_default_barcode_quality_number"] = "الجودة الافتراضية للباركود لابد ان تكون رقم";
-$lang["config_default_barcode_quality_required"] = "الجودة الافتراضية للباركود مطلوبة";
-$lang["config_default_barcode_width_number"] = "العرض الافتراضي للباركود لابد ان يكون رقم";
-$lang["config_default_barcode_width_required"] = "العرض الافتراضي للباركود مطلوب";
-$lang["config_default_sales_discount"] = "نسبة الخصم الافتراضية %";
-$lang["config_default_sales_discount_number"] = "نسبة الخصم الافتراضية لابد ان تكون رقم";
-$lang["config_default_sales_discount_required"] = "نسبة الخصم الافتراضية مطلوبة";
+$lang["config_default_barcode_font_size_number"] = "الحجم الافتراضي لخط الباركود لابد أن يكون رقم.";
+$lang["config_default_barcode_font_size_required"] = "الحجم الافتراضي لخط الباركود مطلوب.";
+$lang["config_default_barcode_height_number"] = "الارتفاع الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_height_required"] = "الارتفاع الافتراضي للباركود مطلوب.";
+$lang["config_default_barcode_num_in_row_number"] = "رقم الباركود فى اى سطر لابد ان يكون رقم.";
+$lang["config_default_barcode_num_in_row_required"] = "رقم الباركود فى اى سطر مطلوب.";
+$lang["config_default_barcode_page_cellspacing_number"] = "المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.";
+$lang["config_default_barcode_page_cellspacing_required"] = "المسافة الافتراضية بين خلايا الباركود مطلوبة.";
+$lang["config_default_barcode_page_width_number"] = "عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_page_width_required"] = "عرض الصفحة الافتراضي للباركود مطلوب.";
+$lang["config_default_barcode_width_number"] = "العرض الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_width_required"] = "العرض الافتراضي للباركود مطلوب.";
+$lang["config_default_item_columns"] = "الخانات المراد إظهارها";
+$lang["config_default_origin_tax_code"] = "كود الضريبة الاساسي الافتراضي";
+$lang["config_default_receivings_discount"] = "خصم الإيصالات الافتراضي";
+$lang["config_default_receivings_discount_number"] = "خصم الإيصالات الافتراضي يجب ان يكون رقم.";
+$lang["config_default_receivings_discount_required"] = "خصم الإيصالات الافتراضي هي خانة اجبارية.";
+$lang["config_default_sales_discount"] = "نسبة الخصم الافتراضية";
+$lang["config_default_sales_discount_number"] = "نسبة الخصم الافتراضية لابد ان تكون رقم.";
+$lang["config_default_sales_discount_required"] = "نسبة الخصم الافتراضية مطلوبة.";
+$lang["config_default_tax_category"] = "فئة الضرائب الافتراضية";
+$lang["config_default_tax_code"] = "قانون الضرائب الافتراضي";
+$lang["config_default_tax_jurisdiction"] = "الاختصاص الضريبي الافتراضي";
+$lang["config_default_tax_name_number"] = "يجب أن يكون الاسم الافتراضي للضريبة سلسلة.";
+$lang["config_default_tax_name_required"] = "اسم الضريبة الافتراضية مطلوب.";
 $lang["config_default_tax_rate"] = "معدل الضريبة الافتراضي %";
 $lang["config_default_tax_rate_1"] = "معدل الضريبة 1";
 $lang["config_default_tax_rate_2"] = "معدل الضريبة 2";
-$lang["config_default_tax_rate_number"] = "معدل الضريبة الافتراضي يجب أن يكون رقم";
-$lang["config_default_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب";
-$lang["config_default_tax_name_required"] = "اسم الضريبة الافتراضية مطلوب";
+$lang["config_default_tax_rate_number"] = "معدل الضريبة الافتراضي يجب أن يكون رقم.";
+$lang["config_default_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب.";
+$lang["config_derive_sale_quantity"] = "السماح بأسعار البيع المشتقة";
+$lang["config_derive_sale_quantity_tooltip"] = "إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع";
+$lang["config_dinner_table"] = "طاولة";
+$lang["config_dinner_table_duplicate"] = "الطاولة يجب ان تكون فريدة.";
+$lang["config_dinner_table_enable"] = "تمكين جداول الطاولات";
+$lang["config_dinner_table_invalid_chars"] = "لا يمكن أن يحتوي اسم الطاولة على '_'.";
+$lang["config_dinner_table_required"] = "الطاولة هو حقل مطلوب.";
 $lang["config_dot"] = "نقطة";
 $lang["config_email"] = "البريد الإلكتروني";
 $lang["config_email_configuration"] = "إعدادات البريد الإلكتروني";
-$lang["config_email_protocol"] = "بروتوكول";
 $lang["config_email_mailpath"] = "مسار ارسال البريد";
-$lang["config_email_smtp_host"] = "خادم SMTP";
-$lang["config_email_smtp_port"] = "رقم منفذ SMTP";
+$lang["config_email_protocol"] = "بروتوكول";
+$lang["config_email_receipt_check_behaviour"] = "ارسال رسائل الكترونية";
+$lang["config_email_receipt_check_behaviour_always"] = "مختار دائما";
+$lang["config_email_receipt_check_behaviour_last"] = "تذكر آخر إختيار";
+$lang["config_email_receipt_check_behaviour_never"] = "دائما غير مختار";
 $lang["config_email_smtp_crypto"] = "تشفير SMTP";
+$lang["config_email_smtp_host"] = "خادم SMTP";
+$lang["config_email_smtp_pass"] = "كلمة سر SMTP";
+$lang["config_email_smtp_port"] = "رقم منفذ SMTP";
 $lang["config_email_smtp_timeout"] = "وقت فشل المحاولة (ثوانى) لـ SMTP";
 $lang["config_email_smtp_user"] = "اسم مستخدم SMTP";
-$lang["config_email_smtp_pass"] = "كلمة سر SMTP";
+$lang["config_enforce_privacy"] = "فرض نظام الخصوصية";
+$lang["config_enforce_privacy_tooltip"] = "حماية ملفات ومعلومات المستخدم عند الحذف";
 $lang["config_fax"] = "الفاكس";
+$lang["config_file_perm"] = "There are problems with file permissions please fix and reload this page.";
+$lang["config_financial_year"] = "بداية السنة المالية";
+$lang["config_financial_year_apr"] = "1 أبريل";
+$lang["config_financial_year_aug"] = "1 أغسطس";
+$lang["config_financial_year_dec"] = "1 ديسمبر";
+$lang["config_financial_year_feb"] = "1 فبراير";
+$lang["config_financial_year_jan"] = "1 يناير";
+$lang["config_financial_year_jul"] = "1 يوليو";
+$lang["config_financial_year_jun"] = "1 يونيو";
+$lang["config_financial_year_mar"] = "1 مارس";
+$lang["config_financial_year_may"] = "1 مايو";
+$lang["config_financial_year_nov"] = "1 نوفمبر";
+$lang["config_financial_year_oct"] = "1 أكتوبر";
+$lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
+$lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
+$lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
+$lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
+$lang["config_gcaptcha_site_key"] = "ريكابتشا مفتاح الموقع";
+$lang["config_gcaptcha_site_key_required"] = "ريكابتشا مفتاح الموقع هو حقل مطلوب";
+$lang["config_gcaptcha_tooltip"] = "احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.";
 $lang["config_general"] = "عام";
 $lang["config_general_configuration"] = "إعدادات عامة";
+$lang["config_giftcard_number"] = "رقم كارت الهدية";
+$lang["config_giftcard_random"] = "توليد عشوائي";
+$lang["config_giftcard_series"] = "توليد في السلسلة";
+$lang["config_image_allowed_file_types"] = "";
+$lang["config_image_max_height_tooltip"] = "";
+$lang["config_image_max_size_tooltip"] = "";
+$lang["config_image_max_width_tooltip"] = "";
+$lang["config_image_restrictions"] = "";
+$lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
 $lang["config_info"] = "معلومات";
 $lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
+$lang["config_integrations"] = "التكامل";
+$lang["config_integrations_configuration"] = "تكامل";
 $lang["config_invoice"] = "الفاتورة";
 $lang["config_invoice_configuration"] = "إعدادات طباعة الفاتورة";
 $lang["config_invoice_default_comments"] = "التعليق الافتراضي على الفاتورة";
-$lang["config_invoice_enable"] = "تفعيل الفوترة";
 $lang["config_invoice_email_message"] = "قالب البريد الإلكتروني للفاتورة";
+$lang["config_invoice_enable"] = "تفعيل الفوترة";
 $lang["config_invoice_printer"] = "طابعة الفواتير";
+$lang["config_invoice_type"] = "نوع الفاتورة";
+$lang["config_is_readable"] = "";
+$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
 $lang["config_jsprintsetup_required"] = "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟";
 $lang["config_language"] = "اللغة";
+$lang["config_last_used_invoice_number"] = "اخر رقم مستخدم للفاتورة";
+$lang["config_last_used_quote_number"] = "اخر رقم مستخدم لعرض الاسعار";
+$lang["config_last_used_work_order_number"] = "آخر رقم مستخدم في طلبات العمل";
 $lang["config_left"] = "يسار";
 $lang["config_license"] = "الرخصة";
 $lang["config_license_configuration"] = "نص الرخصة";
+$lang["config_line_sequence"] = "تسلسل خطي";
 $lang["config_lines_per_page"] = "عدد السطور فى الصفحة";
-$lang["config_lines_per_page_number"] = "عدد السطور فى الصفحة يجب أن يكون رقم";
-$lang["config_lines_per_page_required"] = "عدد السطور فى الصفحة مطلوب";
+$lang["config_lines_per_page_number"] = "عدد السطور فى الصفحة يجب أن يكون رقم.";
+$lang["config_lines_per_page_required"] = "عدد السطور فى الصفحة مطلوب.";
 $lang["config_locale"] = "إقليمية";
 $lang["config_locale_configuration"] = "الإعدادات الإقليمية";
 $lang["config_locale_info"] = "معلومات التهيئة الإقليمية";
 $lang["config_location"] = "المخزون";
 $lang["config_location_configuration"] = "أماكن المخزون";
 $lang["config_location_info"] = "معلومات تهيئة الأماكن";
-$lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج";
+$lang["config_login_form"] = "";
+$lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
+$lang["config_mailchimp"] = "mailchimp ميل تشامب";
+$lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
+$lang["config_mailchimp_configuration"] = "إعدادات mailchimp";
+$lang["config_mailchimp_key_successfully"] = "نجاح.";
+$lang["config_mailchimp_key_unsuccessfully"] = "فشل.";
+$lang["config_mailchimp_lists"] = "mailchimp قوائم";
+$lang["config_mailchimp_tooltip"] = "انقر على رمز مفتاح API.";
 $lang["config_message"] = "الرسائل";
 $lang["config_message_configuration"] = "إعدادات الرسائل";
 $lang["config_msg_msg"] = "الرسائل النصية المحفوظة";
-$lang["config_msg_msg_placeholder"] = "إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ";
-$lang["config_msg_uid"] = "SMS-API اسم المستخدم لـ";
-$lang["config_msg_uid_required"] = "مطلوب SMS-API اسم المستخدم لـ";
+$lang["config_msg_msg_placeholder"] = "إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.";
 $lang["config_msg_pwd"] = "SMS-API  كلمة السر لـ";
 $lang["config_msg_pwd_required"] = "مطلوب SMS-API كلمة السر لـ";
 $lang["config_msg_src"] = "SMS-API  كود المرسل لـ";
 $lang["config_msg_src_required"] = "مطلوب SMS-API كود المرسل لـ";
+$lang["config_msg_uid"] = "SMS-API اسم المستخدم لـ";
+$lang["config_msg_uid_required"] = "مطلوب SMS-API اسم المستخدم لـ";
+$lang["config_multi_pack_enabled"] = "رزم متعددة لكل صنف";
+$lang["config_no_risk"] = "No security/vulnerability risks.";
 $lang["config_none"] = "لايوجد";
 $lang["config_notify_alignment"] = "مكان عرض رسائل المعلومات";
 $lang["config_number_format"] = "شكل الرقم";
+$lang["config_number_locale"] = "التهيئة الاقليمية";
+$lang["config_number_locale_invalid"] = "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.";
+$lang["config_number_locale_required"] = "رقم التهيئة الإقليمية مطلوب.";
+$lang["config_number_locale_tooltip"] = "إيجاد تهيئة إقليمية مناسبة عبر الرابط.";
+$lang["config_os_timezone"] = "";
+$lang["config_ospos_info"] = "معلومات التثبيت OSPOS";
 $lang["config_payment_options_order"] = "ترتيب خيارات الدفع";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
 $lang["config_phone"] = "هاتف الشركة";
-$lang["config_phone_required"] = "هاتف الشركة مطلوب";
+$lang["config_phone_required"] = "هاتف الشركة مطلوب.";
 $lang["config_print_bottom_margin"] = "الهامش السفلي";
-$lang["config_print_bottom_margin_number"] = "الهامش السفلي يجب أن يكون رقم";
-$lang["config_print_bottom_margin_required"] = "الهامش السفلي مطلوب";
+$lang["config_print_bottom_margin_number"] = "الهامش السفلي يجب أن يكون رقم.";
+$lang["config_print_bottom_margin_required"] = "الهامش السفلي مطلوب.";
+$lang["config_print_delay_autoreturn"] = "العودة الى عمليات البيع تلقائيا ( عدد الثواني )";
+$lang["config_print_delay_autoreturn_number"] = "الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.";
+$lang["config_print_delay_autoreturn_required"] = "الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.";
 $lang["config_print_footer"] = "طباعة تذييل المتصفح";
 $lang["config_print_header"] = "طباعة ترويسة المتصفح";
 $lang["config_print_left_margin"] = "الهامش الأيسر";
-$lang["config_print_left_margin_number"] = "الهامش الأيسر يجب ان يكون رقم";
-$lang["config_print_left_margin_required"] = "الهامش الأيسر مطلوب";
+$lang["config_print_left_margin_number"] = "الهامش الأيسر يجب ان يكون رقم.";
+$lang["config_print_left_margin_required"] = "الهامش الأيسر مطلوب.";
+$lang["config_print_receipt_check_behaviour"] = "خانة طباعة الفواتير";
+$lang["config_print_receipt_check_behaviour_always"] = "دائما مختار";
+$lang["config_print_receipt_check_behaviour_last"] = "تذكر آخر اختيار";
+$lang["config_print_receipt_check_behaviour_never"] = "دائما ليس مختار";
 $lang["config_print_right_margin"] = "الهامش الأيمن";
-$lang["config_print_right_margin_number"] = "الهامش الأيمن يجب أن يكون رقم";
-$lang["config_print_right_margin_required"] = "الهامش الأيمن مطلوب";
+$lang["config_print_right_margin_number"] = "الهامش الأيمن يجب أن يكون رقم.";
+$lang["config_print_right_margin_required"] = "الهامش الأيمن مطلوب.";
 $lang["config_print_silently"] = "عرض صندوق حوار طباعة";
 $lang["config_print_top_margin"] = "الهامش العلوى";
-$lang["config_print_top_margin_number"] = "الهامش العلوى يجب أن يكون رقم";
-$lang["config_print_top_margin_required"] = "الهامش العلوى مطلوب";
+$lang["config_print_top_margin_number"] = "الهامش العلوى يجب أن يكون رقم.";
+$lang["config_print_top_margin_required"] = "الهامش العلوى مطلوب.";
 $lang["config_quantity_decimals"] = "العلامة العشرية للكمية";
+$lang["config_quote_default_comments"] = "ملاحظات طلبات العمل الثابتة";
 $lang["config_receipt"] = "الإيصال";
 $lang["config_receipt_configuration"] = "إعدادات طباعة الايصالات";
+$lang["config_receipt_default"] = "افتراضى";
+$lang["config_receipt_font_size"] = "الخط";
+$lang["config_receipt_font_size_number"] = "رقم الخط يجب ان يكون رقم.";
+$lang["config_receipt_font_size_required"] = "رقم الخط مطلوب.";
 $lang["config_receipt_info"] = "معلومات تهيئة الإيصالات";
 $lang["config_receipt_printer"] = "طابعة تذاكر";
-$lang["config_receipt_show_taxes"] = "عرض الضرائب";
-$lang["config_receipt_show_total_discount"] = "عرض إجمالى الخصم";
+$lang["config_receipt_short"] = "مختصر";
+$lang["config_receipt_show_company_name"] = "عرض اسم الشركة";
 $lang["config_receipt_show_description"] = "عرض الوصف";
 $lang["config_receipt_show_serialnumber"] = "عرض الرقم المسلسل";
+$lang["config_receipt_show_tax_ind"] = "";
+$lang["config_receipt_show_taxes"] = "عرض الضرائب";
+$lang["config_receipt_show_total_discount"] = "عرض إجمالى الخصم";
 $lang["config_receipt_template"] = "قالب الايصال";
-$lang["config_receipt_default"] = "افتراضى";
-$lang["config_receipt_short"] = "مختصر";
 $lang["config_receiving_calculate_average_price"] = "حساب متوسط سعر الأصناف المستلمة";
 $lang["config_recv_invoice_format"] = "شكل فاتورة الإستلام";
-$lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب";
+$lang["config_register_mode_default"] = "نمط التسجيل الافتراضي";
+$lang["config_report_an_issue"] = "";
+$lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب.";
+$lang["config_reward"] = "المكافاة";
+$lang["config_reward_configuration"] = "اعدادات المكافاة";
 $lang["config_right"] = "يمين";
 $lang["config_sales_invoice_format"] = "شكل فاتورة البيع";
-$lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح";
-$lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح";
-$lang["config_statistics"] = "Send statistics";
-$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
+$lang["config_sales_quote_format"] = "شكل فاتورة عرض الاسعار";
+$lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح.";
+$lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح.";
+$lang["config_security_issue"] = "Security Vulnerability Warning";
+$lang["config_server_notice"] = "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.";
+$lang["config_show_office_group"] = "اظهار ايكونة المكتب";
+$lang["config_statistics"] = "إرسال اﻹحصائيات";
+$lang["config_statistics_tooltip"] = "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.";
 $lang["config_stock_location"] = "مكان المخزون";
-$lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر";
-$lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'";
-$lang["config_stock_location_required"] = "مكان المخزون مطلوب";
+$lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر.";
+$lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'.";
+$lang["config_stock_location_required"] = "مكان المخزون مطلوب.";
+$lang["config_suggestions_first_column"] = "العامود 1";
+$lang["config_suggestions_layout"] = "تخطيط اقتراحات البحث";
+$lang["config_suggestions_second_column"] = "العامود 2";
+$lang["config_suggestions_third_column"] = "العامود 3";
+$lang["config_system_conf"] = "Setup & Conf";
+$lang["config_system_info"] = "System Info";
+$lang["config_table"] = "جدول";
+$lang["config_table_configuration"] = "اعدادات الجدول";
 $lang["config_takings_printer"] = "طابعة الإيراد";
+$lang["config_tax"] = "الضريبة";
+$lang["config_tax_category"] = "تصنيف الضريبة";
+$lang["config_tax_category_duplicate"] = "الفئة الضريبية اللتي تم ادخالها موجودة.";
+$lang["config_tax_category_invalid_chars"] = "الفئة الضريبية اللتي تم ادخالها غير صحيحة.";
+$lang["config_tax_category_required"] = "الفئة الضريبية مطلوبة.";
+$lang["config_tax_category_used"] = "الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.";
+$lang["config_tax_configuration"] = "إعدادات الضريبة";
 $lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
+$lang["config_tax_id"] = "الرقم الضريبي";
 $lang["config_tax_included"] = "شامل الضريبة";
+$lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "فاصل الاف";
 $lang["config_timezone"] = "المنطقة الزمنية";
+$lang["config_timezone_error"] = "";
 $lang["config_top"] = "علوى";
+$lang["config_use_destination_based_tax"] = "استخدام الضريبة المستندة على الوجهة";
+$lang["config_user_timezone"] = "";
 $lang["config_website"] = "موقع الشركة";
-$lang["config_number_locale"] = "التهيئة الاقليمية";
-$lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب";
-$lang["config_number_locale_required"] = "رقم التهيئة الإقليمية مطلوب";
-$lang["config_number_locale_invalid"] = "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة";
-$lang["config_number_locale_tooltip"] = "إيجاد تهيئة إقليمية مناسبة عبر الرابط";
-$lang["config_theme"] = "السمة";
+$lang["config_work_order_enable"] = "تفعيل طلبات العمل";
+$lang["config_work_order_format"] = "شكل طلبات العمل";

application/language/ar-EG/customers_lang.php

@@ -1,24 +1,54 @@
 <?php 
 
 $lang["customers_account_number"] = "رقم الحساب";
-$lang["customers_account_number_duplicate"] = "رقم الحساب هذا موجود فى قاعدة البيانات من قبل";
-$lang["customers_cannot_be_deleted"] = "لايمكن حذف هؤلاء العملاء، أحدهم/كلهم مرتبط/مرتبطين بمبيعات";
+$lang["customers_account_number_duplicate"] = "رقم الحساب هذا موجود فى قاعدة البيانات من قبل.";
+$lang["customers_available_points"] = "النقاط المتاحة";
+$lang["customers_average"] = "معدل الصرف";
+$lang["customers_avg_discount"] = "معدل الخصم";
+$lang["customers_basic_information"] = "معلومات الزبون";
+$lang["customers_cannot_be_deleted"] = "لايمكن حذف هؤلاء العملاء، أحدهم/كلهم مرتبط/مرتبطين بمبيعات.";
 $lang["customers_company_name"] = "اسم الشركة";
 $lang["customers_confirm_delete"] = "هل تريد حذف هؤلاء العملاء حقاً؟";
+$lang["customers_confirm_restore"] = "هل انت متأكد من إستعادة قاعدة بيانات الزبائن ؟";
+$lang["customers_consent"] = "موافقة التسجيل";
+$lang["customers_consent_required"] = "موافقة التسجيل هي خانة اجبارية.";
+$lang["customers_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["customers_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["customers_csv_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
+$lang["customers_csv_import_success"] = "تم استيراد العملاء بنجاح.";
 $lang["customers_customer"] = "العميل";
+$lang["customers_date"] = "التاريخ";
 $lang["customers_discount"] = "نسبة الخصم";
-$lang["customers_error_adding_updating"] = "خطاء فى إضافة أو تحديث العميل";
+$lang["customers_discount_fixed"] = "حسم ثابت";
+$lang["customers_discount_percent"] = "نسبة الحبم";
+$lang["customers_discount_type"] = "نوع الحسم";
+$lang["customers_email_duplicate"] = "البريد الالكتروني مكرر.";
+$lang["customers_employee"] = "الموظف";
+$lang["customers_error_adding_updating"] = "خطاء فى إضافة أو تحديث العميل.";
+$lang["customers_import_items_csv"] = "استيراد العملا ء من ورقة عمل اكسل";
+$lang["customers_mailchimp_activity_click"] = "النقر على البريد الإلكتروني";
+$lang["customers_mailchimp_activity_lastopen"] = "آخر رسالة إلكترونية مفتوحة";
+$lang["customers_mailchimp_activity_open"] = "رسالة إلكترونية مفتوحة";
+$lang["customers_mailchimp_activity_total"] = "تم ارسال الرسالة الإلكترونية بنجاح";
+$lang["customers_mailchimp_activity_unopen"] = "رسالة إلكترونية غير مفتوحة";
+$lang["customers_mailchimp_email_client"] = "بريد الكتروني";
+$lang["customers_mailchimp_info"] = "ميل تشيمب";
+$lang["customers_mailchimp_member_rating"] = "التقييم";
+$lang["customers_mailchimp_status"] = "الحالة";
+$lang["customers_mailchimp_vip"] = "مهم";
+$lang["customers_max"] = "الحد الأقصى";
+$lang["customers_min"] = "الحد الأدنى";
 $lang["customers_new"] = "عميل جديد";
-$lang["customers_none_selected"] = "لم تختار عملاء للحذف";
+$lang["customers_none_selected"] = "لم تختار عملاء للحذف.";
 $lang["customers_one_or_multiple"] = "عميل/عملاء";
+$lang["customers_quantity"] = "العدد";
+$lang["customers_stats_info"] = "الحالة";
 $lang["customers_successful_adding"] = "لقد أضفت عميل بنجاح";
 $lang["customers_successful_deleted"] = "لقد قمت بالحذف بنجاح";
 $lang["customers_successful_updating"] = "لقد قمت بتحديث بيانات العميل بنجاح";
+$lang["customers_tax_code"] = "كود الضريبة";
+$lang["customers_tax_id"] = "الرقم الضريبي";
 $lang["customers_taxable"] = "خاضع للضريبة";
 $lang["customers_total"] = "المجموع";
 $lang["customers_update"] = "تحديث بيانات عميل";
-$lang["customers_import_items_excel"] = "استيراد العملا ء من ورقة عمل اكسل";
-$lang["customers_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["customers_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية";
-$lang["customers_excel_import_success"] = "تم استيراد العملاء بنجاح";
-$lang["customers_excel_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة";
+$lang["rewards_package"] = "فئة المكافئة";

application/language/ar-EG/datepicker_lang.php

@@ -1,21 +1,22 @@
 <?php 
 
-$lang["datepicker_today"] = "اليوم";
-$lang["datepicker_weekstart"] = "0";
 $lang["datepicker_all_time"] = "جميع الأوقات";
-$lang["datepicker_last_7"] = "أخر سبعة أيام";
-$lang["datepicker_last_30"] = "أخر 30 يوم";
-$lang["datepicker_last_month"] = "أخر شهر";
-$lang["datepicker_last_year"] = "السنة الماضية";
-$lang["datepicker_this_month"] = "هذا الشهر";
-$lang["datepicker_this_month_last_year"] = "نفس الشهر من العام الماضي";
-$lang["datepicker_same_month_to_today"] = "هذا الشهر حتى اليوم";
-$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
-$lang["datepicker_this_year"] = "السنة الحالية";
-$lang["datepicker_today_last_year"] = "نفس اليوم من السنة الماضية";
-$lang["datepicker_yesterday"] = "أمس";
 $lang["datepicker_apply"] = "تطبيق";
 $lang["datepicker_cancel"] = "إلغاء";
-$lang["datepicker_from"] = "من";
-$lang["datepicker_to"] = "إلى";
 $lang["datepicker_custom"] = "مخصص";
+$lang["datepicker_from"] = "من";
+$lang["datepicker_last_30"] = "أخر 30 يوم";
+$lang["datepicker_last_7"] = "أخر سبعة أيام";
+$lang["datepicker_last_financial_year"] = "السنة المالية الماضية";
+$lang["datepicker_last_month"] = "أخر شهر";
+$lang["datepicker_last_year"] = "السنة الماضية";
+$lang["datepicker_same_month_last_year"] = "نفس الشهر من العام الماضي";
+$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
+$lang["datepicker_this_financial_year"] = "السنة المالية الحالية";
+$lang["datepicker_this_month"] = "هذا الشهر";
+$lang["datepicker_this_year"] = "السنة الحالية";
+$lang["datepicker_to"] = "إلى";
+$lang["datepicker_today"] = "اليوم";
+$lang["datepicker_today_last_year"] = "نفس اليوم من السنة الماضية";
+$lang["datepicker_weekstart"] = "0";
+$lang["datepicker_yesterday"] = "أمس";

application/language/ar-EG/employees_lang.php

@@ -1,28 +1,37 @@
 <?php 
 
 $lang["employees_basic_information"] = "المعلومات الأساسية للموظف";
-$lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :)";
+$lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).";
+$lang["employees_change_password"] = "تغيير كلمة المرور";
 $lang["employees_confirm_delete"] = "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟";
+$lang["employees_confirm_restore"] = "هل انت متاكد من استعادة الموظفين المحددين؟";
+$lang["employees_current_password"] = "كلمة المرور الحالية";
+$lang["employees_current_password_invalid"] = "كلمة المرور الحالية غير صحيحة.";
 $lang["employees_employee"] = "موظف";
-$lang["employees_error_adding_updating"] = "خطاء فى إضافة/تعديل موظف";
-$lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخدم admin الخاص بنسخة العرض";
-$lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض";
+$lang["employees_error_adding_updating"] = "خطاء فى إضافة/تعديل موظف.";
+$lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخدم admin الخاص بنسخة العرض.";
+$lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.";
+$lang["employees_language"] = "اللغة";
 $lang["employees_login_info"] = "معلومات دخول الموظف";
 $lang["employees_new"] = "موظف جديد";
-$lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف";
+$lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف.";
 $lang["employees_one_or_multiple"] = "موظف/موظفين";
 $lang["employees_password"] = "كلمة السر";
-$lang["employees_password_minlength"] = "كلمة السر يجب أن تكون 8 حروف على الأقل";
-$lang["employees_password_must_match"] = "كلمتى السر لا تتطابقان";
-$lang["employees_password_required"] = "كلمة السر مطلوبة";
-$lang["employees_permission_desc"] = "قم بإضافة الصلاحيات بلإختيار من الأسفل";
+$lang["employees_password_minlength"] = "كلمة السر يجب أن تكون 8 حروف على الأقل.";
+$lang["employees_password_must_match"] = "كلمتى السر لا تتطابقان.";
+$lang["employees_password_not_must_match"] = "كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.";
+$lang["employees_password_required"] = "كلمة السر مطلوبة.";
+$lang["employees_permission_desc"] = "قم بإضافة الصلاحيات بلإختيار من الأسفل.";
 $lang["employees_permission_info"] = "اذونات المستخدمين";
 $lang["employees_repeat_password"] = "كلمة السر مرة اخرى";
-$lang["employees_successful_adding"] = "لقد تم إضافة الموظف بنجاح";
+$lang["employees_subpermission_required"] = "يجب إختيار صلاحية واحدة على الأقل لكل قسم.";
+$lang["employees_successful_adding"] = "لقد تم إضافة الموظف بنجاح.";
+$lang["employees_successful_change_password"] = "تم تغيير كلمة المرور بنجاح.";
 $lang["employees_successful_deleted"] = "لقد تم حذف الموظف بنجاح";
 $lang["employees_successful_updating"] = "لقد تم تحديث بيانات الموظف بنجاح";
+$lang["employees_system_language"] = "لغة النظام";
+$lang["employees_unsuccessful_change_password"] = "فشل في تغيير كلمة المرور.";
 $lang["employees_update"] = "تحديث بيانات موظف";
 $lang["employees_username"] = "اسم المستخدم";
-$lang["employees_username_minlength"] = "اسم المستخدم يجب أن يكون 5 حروف على الأقل";
-$lang["employees_username_required"] = "اسم المستخدم مطلوب";
-$lang["employees_subpermission_required"] = "يجب إختيار صلاحية واحدة على الأقل لكل قسم";
+$lang["employees_username_minlength"] = "اسم المستخدم يجب أن يكون 5 حروف على الأقل.";
+$lang["employees_username_required"] = "اسم المستخدم مطلوب.";

application/language/ar-EG/enum_lang.php

@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "تقريب نصفي";
+$lang["enum_half_even"] = "نصف مزدوج";
+$lang["enum_half_five"] = "نصف الخمس";
+$lang["enum_half_odd"] = "نصف فردي";
+$lang["enum_half_up"] = "تقريب نصفي";
+$lang["enum_round_down"] = "التقريب";
+$lang["enum_round_up"] = "التقريب";

application/language/ar-EG/expenses_categories_lang.php

@@ -0,0 +1,21 @@
+<?php 
+
+$lang["category_name_required"] = "اسم نوع المصاريف مطلوب";
+$lang["expenses_categories_add_item"] = "إضافة نوع";
+$lang["expenses_categories_cannot_be_deleted"] = "فشلت عملية مسح نوع المصاريف";
+$lang["expenses_categories_category_id"] = "الكود";
+$lang["expenses_categories_confirm_delete"] = "هل أنت متأكد من مسح نوع المصاريف الذي أخترته؟";
+$lang["expenses_categories_confirm_restore"] = "هل أنت متأكد من أنك تريد استعادة فئة المصاريف المحددة؟";
+$lang["expenses_categories_description"] = "وصف النوع";
+$lang["expenses_categories_error_adding_updating"] = "مشكلة أثناء أضافة أو تعديل نوع المصاريف";
+$lang["expenses_categories_info"] = "معلومات عن نوع المصاريف";
+$lang["expenses_categories_name"] = "أسم النوع";
+$lang["expenses_categories_new"] = "نوع جديد";
+$lang["expenses_categories_no_expenses_categories_to_display"] = "لا يجد أنواع للعرض";
+$lang["expenses_categories_none_selected"] = "لم تختار أي نوع مصاريف";
+$lang["expenses_categories_one_or_multiple"] = "نوع المصاريف";
+$lang["expenses_categories_quantity"] = "الكمية";
+$lang["expenses_categories_successful_adding"] = "تم أضافة نوع المصاريف بنجاح";
+$lang["expenses_categories_successful_deleted"] = "تم مسح نوع المصاريف بنجاح";
+$lang["expenses_categories_successful_updating"] = "تم تعديل نوع المصاريف بنجاح";
+$lang["expenses_categories_update"] = "تعديل النوع";

application/language/ar-EG/expenses_lang.php

@@ -0,0 +1,46 @@
+<?php 
+
+$lang["expenses_add_item"] = "إضافة مصاريف جديدة";
+$lang["expenses_amount"] = "قيمة المصاريف";
+$lang["expenses_amount_number"] = "القيمة يجب ان تكون رقم";
+$lang["expenses_amount_required"] = "القيمة المطلوبة";
+$lang["expenses_by_category"] = "حسب الفئات";
+$lang["expenses_cannot_be_deleted"] = "لا يمكن المسح";
+$lang["expenses_cash"] = "نقدا";
+$lang["expenses_cash_filter"] = "نقدا";
+$lang["expenses_categories_name"] = "اسماء الفئات";
+$lang["expenses_category_required"] = "خانة مطلوبة: الفئات";
+$lang["expenses_check"] = "شيك";
+$lang["expenses_check_filter"] = "تصفية";
+$lang["expenses_confirm_delete"] = "تأكيد المسح؟";
+$lang["expenses_confirm_restore"] = "هل تريد بالتأكيد استعادة النفقات المحددة؟";
+$lang["expenses_credit"] = "بطاقة ائتمان";
+$lang["expenses_credit_filter"] = "بطاقة ائتمان";
+$lang["expenses_date"] = "تاريخ المصاريف";
+$lang["expenses_date_number"] = "التاريخ يجب ان يتكون من ارقام";
+$lang["expenses_date_required"] = "خانة مطلوبة: التاريخ";
+$lang["expenses_debit"] = "بطاقة مدين";
+$lang["expenses_debit_filter"] = "بطاقة مدين";
+$lang["expenses_description"] = "الوصف";
+$lang["expenses_due"] = "الدين";
+$lang["expenses_due_filter"] = "تصفية الدين";
+$lang["expenses_employee"] = "صنع من قبل";
+$lang["expenses_error_adding_updating"] = "خطأ في الإضافة";
+$lang["expenses_expense_id"] = "كود المصاريف";
+$lang["expenses_expenses_employee"] = "موظف";
+$lang["expenses_info"] = "معلومات عن المصاريف";
+$lang["expenses_is_deleted"] = "ممسوحة";
+$lang["expenses_name_required"] = "خانة مطلوبة: اسم المصاريف";
+$lang["expenses_new"] = "مصاريف جديدة";
+$lang["expenses_no_expenses_to_display"] = "لا يوجد مصاريف في التاريخ المحدد";
+$lang["expenses_none_selected"] = "لم يتم تحديد اي خيار";
+$lang["expenses_one_or_multiple"] = "واحد او أكثر";
+$lang["expenses_payment"] = "الدفع";
+$lang["expenses_start_typing_supplier_name"] = "ابدا بكتابة اسم المورد...";
+$lang["expenses_successful_adding"] = "تم إضافة المصاريف بنجاح";
+$lang["expenses_successful_deleted"] = "تم مسح المصاريف بنجاح";
+$lang["expenses_successful_updating"] = "تم تعديل المصاريف بنجاح";
+$lang["expenses_supplier_name"] = "اسم المورد";
+$lang["expenses_supplier_tax_code"] = "كود ضريبة المورد";
+$lang["expenses_tax_amount"] = "قيمة الضريبة";
+$lang["expenses_update"] = "تعديل";

application/language/ar-EG/giftcards_lang.php

@@ -1,31 +1,31 @@
 <?php 
 
-$lang["giftcards_add_minus"] = "المخزن المضاف أو المطروح منه";
+$lang["giftcards_add_minus"] = "المخزن المضاف أو المطروح منه.";
 $lang["giftcards_allow_alt_description"] = "السماح بوصف بديل";
-$lang["giftcards_amazon"] = "Amazon";
-$lang["giftcards_remaining_balance"] = "كارت الهدية %1 القيمة المتبقية منه %2!";
 $lang["giftcards_bulk_edit"] = "تحرير جماعى";
-$lang["giftcards_cannot_be_deleted"] = "لايمكن حذف بطاقات الهدية المختارة، واحد أو أكثر منها لديه مبيعات";
-$lang["giftcards_cannot_find_giftcard"] = "لايمكن إيجاد معلومات حول كارت الهدية";
+$lang["giftcards_cannot_be_deleted"] = "لايمكن حذف بطاقات الهدية المختارة، واحد أو أكثر منها لديه مبيعات.";
+$lang["giftcards_cannot_find_giftcard"] = "لايمكن إيجاد معلومات حول كارت الهدية.";
+$lang["giftcards_cannot_use"] = "كارت الهدية %1                         لا يمكن استعمالة في هذه العملية: اسم الزبون غير صحيح.";
 $lang["giftcards_card_value"] = "القيمة";
 $lang["giftcards_category"] = "الفئة";
-$lang["giftcards_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للكل";
-$lang["giftcards_change_all_to_not_allow_allow_desc"] = "غير مسموح بوصف بديل للكل";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للكل.";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "غير مسموح بوصف بديل للكل.";
 $lang["giftcards_change_all_to_serialized"] = "تغيير الجميع لأرقام مسلسلة";
 $lang["giftcards_change_all_to_unserialized"] = "تغير الجميع لأرقام غير مسلسلة";
 $lang["giftcards_confirm_bulk_edit"] = "هل أنت متأكد انك تريد تحرير كل بطاقات الهدايا المختارة؟";
 $lang["giftcards_confirm_delete"] = "هل أنت متأكد انك تريد حذف كل بطاقات الهدايا المختارة؟";
+$lang["giftcards_confirm_restore"] = "هل تريد بالتأكيد استعادة بطاقة (بطاقات) الهدايا المحددة؟";
 $lang["giftcards_cost_price"] = "سعر التكلفة";
 $lang["giftcards_count"] = "تحديث المخزون";
+$lang["giftcards_csv_import_failed"] = "فشل الإستيراد من اكسل.";
 $lang["giftcards_current_quantity"] = "الكميات الحالية";
 $lang["giftcards_description"] = "الوصف";
 $lang["giftcards_details_count"] = "حركة الكارت";
 $lang["giftcards_do_nothing"] = "لا تفعل شىء";
-$lang["giftcards_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل بطاقات الهدايا المختارة";
-$lang["giftcards_edit_multiple_giftcards"] = "تحرير مجموعة من بطاقات الهدايا";
-$lang["giftcards_error_adding_updating"] = "خطاء فى إضافة/تحديث بطاقة هدية";
-$lang["giftcards_error_updating_multiple"] = "خطاء فى تحديث بيانات بطاقات الهدايا";
-$lang["giftcards_excel_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["giftcards_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل بطاقات الهدايا المختارة.";
+$lang["giftcards_edit_multiple_giftcards"] = "تحرير مجموعة من بطاقات الهدايا.";
+$lang["giftcards_error_adding_updating"] = "خطاء فى إضافة/تحديث بطاقة هدية.";
+$lang["giftcards_error_updating_multiple"] = "خطاء فى تحديث بيانات بطاقات الهدايا.";
 $lang["giftcards_generate_barcodes"] = "توليد أكواد الباركود";
 $lang["giftcards_giftcard"] = "بطاقة هدية";
 $lang["giftcards_giftcard_number"] = "رقم بطاقة الهدية";
@@ -34,19 +34,20 @@ $lang["giftcards_inventory_comments"] = "تعليقات";
 $lang["giftcards_is_serialized"] = "بطاقة الهدية لها رقم مسلسل";
 $lang["giftcards_low_inventory_giftcards"] = "مخزون قليل من بطاقات الهدايا";
 $lang["giftcards_manually_editing_of_quantity"] = "تحرير الكميات يدويا";
-$lang["giftcards_must_select_giftcard_for_barcode"] = "يجب إختيار بطاقة هدية واحدة على الأقل لتوليد أكواد الباركود";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "يجب إختيار بطاقة هدية واحدة على الأقل لتوليد أكواد الباركود.";
 $lang["giftcards_new"] = "بطاقة هدية جديدة";
 $lang["giftcards_no_description_giftcards"] = "لايوجد وصف لبطاقات الهدايا";
-$lang["giftcards_no_giftcards_to_display"] = "لايوجد بطاقات هدايا لعرضها";
+$lang["giftcards_no_giftcards_to_display"] = "لايوجد بطاقات هدايا لعرضها.";
 $lang["giftcards_none"] = "لايوجد";
-$lang["giftcards_none_selected"] = "لم تقم بإختيار أى بطاقة هدية";
-$lang["giftcards_number"] = "رقم بطاقة الهدية يجب أن يكون رقم";
+$lang["giftcards_none_selected"] = "لم تقم بإختيار أى بطاقة هدية.";
+$lang["giftcards_number"] = "رقم بطاقة الهدية يجب أن يكون رقم.";
 $lang["giftcards_number_information"] = "رقم بطاقة الهدية";
-$lang["giftcards_number_required"] = "رقم بطاقة الهدية مطلوب";
+$lang["giftcards_number_required"] = "رقم بطاقة الهدية مطلوب.";
 $lang["giftcards_one_or_multiple"] = "بطاقة/بطاقات الهدية";
 $lang["giftcards_person_id"] = "العميل";
 $lang["giftcards_quantity"] = "الكمية";
-$lang["giftcards_quantity_required"] = "الكمية مطلوبة";
+$lang["giftcards_quantity_required"] = "الكمية مطلوبة.";
+$lang["giftcards_remaining_balance"] = "كارت الهدية %1 القيمة المتبقية منه %2!";
 $lang["giftcards_reorder_level"] = "نقطة إعادة الطلب";
 $lang["giftcards_retrive_giftcard_info"] = "إسترجاع بيانات بطاقة هدية";
 $lang["giftcards_sales_tax_1"] = "ضريبة المبيعات";
@@ -65,5 +66,5 @@ $lang["giftcards_unit_price"] = "سعر الوحدة";
 $lang["giftcards_upc_database"] = "UPC قاعدة بيانات";
 $lang["giftcards_update"] = "تحديث بطاقة هدية";
 $lang["giftcards_use_inventory_menu"] = "استخدام تحديث المخزن";
-$lang["giftcards_value"] = "قيمة بطاقة الهدية يجب ان تكون رقم";
-$lang["giftcards_value_required"] = "قيمة بطاقة الهدية مطلوبة";
+$lang["giftcards_value"] = "قيمة بطاقة الهدية يجب ان تكون رقم.";
+$lang["giftcards_value_required"] = "قيمة بطاقة الهدية مطلوبة.";

application/language/ar-EG/item_kits_lang.php

@@ -1,20 +1,37 @@
 <?php 
 
 $lang["item_kits_add_item"] = "إضافة مجموعة";
-$lang["item_kits_cannot_be_deleted"] = "لايمكن حذف مجموعة/مجموعات";
+$lang["item_kits_all"] = "الكل";
+$lang["item_kits_cannot_be_deleted"] = "لايمكن حذف مجموعة/مجموعات.";
 $lang["item_kits_confirm_delete"] = "هل أنت متأكد أنك تريد حذف المجموعة؟";
+$lang["item_kits_confirm_restore"] = "هل أنت متأكد أنك تريد استعادة المجموعة المحددة؟";
 $lang["item_kits_description"] = "وصف المجموعة";
-$lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث المجموعة";
+$lang["item_kits_discount"] = "الخصم";
+$lang["item_kits_discount_fixed"] = "خصم قابل للتعديل";
+$lang["item_kits_discount_percent"] = "نسبة الخصم";
+$lang["item_kits_discount_type"] = "نوع الخصم";
+$lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث المجموعة.";
+$lang["item_kits_find_kit_item"] = "صنف لمجموعة";
 $lang["item_kits_info"] = "معلومات المجموعة";
 $lang["item_kits_item"] = "صنف";
+$lang["item_kits_item_kit_number"] = "";
+$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_number"] = "";
 $lang["item_kits_items"] = "أصناف";
 $lang["item_kits_kit"] = "كود المجموعة";
+$lang["item_kits_kit_and_components"] = "المجموعة ومحتوياتها";
+$lang["item_kits_kit_and_stock"] = "المجموعه والصنف";
+$lang["item_kits_kit_only"] = "المجموعه فقط";
 $lang["item_kits_name"] = "اسم المجموعة";
 $lang["item_kits_new"] = "مجموعة جديده";
-$lang["item_kits_no_item_kits_to_display"] = "لاتوجد مجموعات لعرضها";
-$lang["item_kits_none_selected"] = "لم تقم بإختيار مجموعات";
+$lang["item_kits_no_item_kits_to_display"] = "لاتوجد مجموعات لعرضها.";
+$lang["item_kits_none_selected"] = "لم تقم بإختيار مجموعات.";
 $lang["item_kits_one_or_multiple"] = "مجموعة/مجموعات";
+$lang["item_kits_price_option"] = "خيارات التسعير";
+$lang["item_kits_priced_only"] = "المسعرين فقط";
+$lang["item_kits_print_option"] = "خيارات الطباعة";
 $lang["item_kits_quantity"] = "الكمية";
+$lang["item_kits_sequence"] = "التسلسل";
 $lang["item_kits_successful_adding"] = "لقد تم إضافة المجموعة بنجاح";
 $lang["item_kits_successful_deleted"] = "لقد تم حذف المجموعة بنجاح";
 $lang["item_kits_successful_updating"] = "لقد تم تحديث بيانات المجموعة بنجاح";

application/language/ar-EG/items_lang.php

@@ -1,75 +1,95 @@
 <?php 
 
-$lang["items_add_minus"] = "الكمية المطلوب خصمها أو اضافتها";
-$lang["items_allow_alt_desciption"] = "وصف بديل";
+$lang["items_add_minus"] = "الكمية المطلوب خصمها أو اضافتها.";
 $lang["items_allow_alt_description"] = "السماح بوصف بديل";
-$lang["items_amazon"] = "Amazon";
+$lang["items_amount_entry"] = "إدخال القيمة";
 $lang["items_bulk_edit"] = "تحرير جماعى";
-$lang["items_buy_price_required"] = "سعر الشراء مطلوب";
-$lang["items_cannot_be_deleted"] = "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات";
-$lang["items_cannot_find_item"] = "لايمكن ايجاد معلومات حول الصنف";
+$lang["items_buy_price_required"] = "سعر الشراء مطلوب.";
+$lang["items_cannot_be_deleted"] = "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات.";
+$lang["items_cannot_find_item"] = "لايمكن ايجاد معلومات حول الصنف.";
 $lang["items_category"] = "التصنيف";
-$lang["items_category_required"] = "التصنيف مطلوب";
-$lang["items_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للجميع";
-$lang["items_change_all_to_not_allow_allow_desc"] = "عدم السماح بوصف بديل للجميع";
+$lang["items_category_required"] = "التصنيف مطلوب.";
+$lang["items_change_all_to_allow_alt_desc"] = "السماح بوصف بديل للجميع.";
+$lang["items_change_all_to_not_allow_allow_desc"] = "عدم السماح بوصف بديل للجميع.";
 $lang["items_change_all_to_serialized"] = "تغير الجميع لمتسلسل";
 $lang["items_change_all_to_unserialized"] = "تغيير الجميع لغير متسلسل";
+$lang["items_change_image"] = "تغيير الصورة";
 $lang["items_confirm_bulk_edit"] = "هل أنت متأكد انك تريد تحرير كل الأصناف المختارة؟";
-$lang["items_confirm_bulk_edit_wipe_taxes"] = "سوف يتم مسح معلومات الضرائب لجميع الأصناف";
+$lang["items_confirm_bulk_edit_wipe_taxes"] = "سوف يتم مسح معلومات الضرائب لجميع الأصناف.";
 $lang["items_confirm_delete"] = "هل أنت متأكد انك تريد حذف كل الأصناف المختارة؟";
+$lang["items_confirm_restore"] = "هل انت متاكد من إستعادة الاصناف المخطارة؟";
 $lang["items_cost_price"] = "سعر التكلفة";
-$lang["items_cost_price_number"] = "سعر التكلفة يجب أن يكون رقم";
-$lang["items_cost_price_required"] = "سعر التكلفة مطلوب";
+$lang["items_cost_price_number"] = "سعر التكلفة يجب أن يكون رقم.";
+$lang["items_cost_price_required"] = "سعر التكلفة مطلوب.";
 $lang["items_count"] = "تحديث المخزون";
+$lang["items_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["items_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["items_csv_import_partially_failed"] = "يوجد خطأ بنسبة 1% في استيراد الاصناف في السطر: %2. لم يتم استيرادهم.";
+$lang["items_csv_import_success"] = "تم استيراد الأصناف بنجاح.";
 $lang["items_current_quantity"] = "الكمية الحالية";
+$lang["items_default_pack_name"] = "كل";
 $lang["items_description"] = "الوصف";
 $lang["items_details_count"] = "حركة الصنف";
 $lang["items_do_nothing"] = "لاتفعل شئ";
-$lang["items_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة";
+$lang["items_edit_fields_you_want_to_update"] = "قم بتحديث الحقول المراد تحديثها لكل الأصناف المختارة.";
 $lang["items_edit_multiple_items"] = "تحريد مجموعة اصناف";
+$lang["items_empty_upc_items"] = "تفريغ اصناف UPC";
 $lang["items_error_adding_updating"] = "خطاء فى إضافة/تحديث صنف";
 $lang["items_error_updating_multiple"] = "خطاء فى تحديث بيانات أصناف";
-$lang["items_excel_import_failed"] = "فشل الإستيراد من اكسل";
-$lang["items_excel_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية";
-$lang["items_excel_import_success"] = "تم استيراد الأصناف بنجاح";
-$lang["items_excel_import_partially_failed"] = "تم استيراد معظم الأصناف. البعض لم يتم استيرادهم ، وهذه هى القائمة";
 $lang["items_generate_barcodes"] = "توليد أكواد الباركود";
+$lang["items_hsn_code"] = "تسميات النظام المنسق";
 $lang["items_image"] = "صورة";
+$lang["items_import_items_csv"] = "استيراد من اكسل";
 $lang["items_info_provided_by"] = "المعلومات مقدمة بواسطة";
 $lang["items_inventory"] = "المخزن";
+$lang["items_inventory_CSV_import_quantity"] = "العدد المستورد من ملفات ال CSV";
 $lang["items_inventory_comments"] = "تعليقات";
+$lang["items_inventory_data_tracking"] = "تتبع بيانات المخزون";
+$lang["items_inventory_date"] = "التاريخ";
+$lang["items_inventory_employee"] = "الموظف";
+$lang["items_inventory_in_out_quantity"] = "+- كمية";
+$lang["items_inventory_remarks"] = "ملاحظات";
 $lang["items_is_deleted"] = "حذفت";
 $lang["items_is_serialized"] = "الصنف له رقم مسلسل";
 $lang["items_item"] = "صنف";
 $lang["items_item_number"] = "الباركود UPC/EAN/ISBN";
-$lang["items_item_number_duplicate"] = "رقم الصنف موجود فى قاعدة البيانات من قبل";
+$lang["items_item_number_duplicate"] = "رقم الصنف موجود فى قاعدة البيانات من قبل.";
+$lang["items_kit"] = "مجموعة اصناف";
 $lang["items_location"] = "مكان";
-$lang["items_empty_upc_items"] = "تفريغ اصناف UPC";
 $lang["items_low_inventory_items"] = "الأصناف التى لا يوجد لها مخزون";
+$lang["items_low_sell_item"] = "الصنف المركب";
 $lang["items_manually_editing_of_quantity"] = "تحرير الكمية يدوياً";
 $lang["items_name"] = "اسم الصنف";
-$lang["items_name_required"] = "اسم الصنف مطلوب";
+$lang["items_name_required"] = "اسم الصنف مطلوب.";
 $lang["items_new"] = "صنف جديد";
 $lang["items_no_description_items"] = "الأصناف التى بلا وصف";
-$lang["items_no_items_to_display"] = "لايوجد أصناف لعرضها";
+$lang["items_no_items_to_display"] = "لايوجد أصناف لعرضها.";
 $lang["items_none"] = "لاشىء";
 $lang["items_none_selected"] = "لم تختار أى أصناف لتحريرها";
+$lang["items_nonstock"] = "غير مخزنة";
 $lang["items_number_information"] = "رقم الصنف";
-$lang["items_number_required"] = "مطلوب UPC/EAN/ISBN رقم الباركود ";
+$lang["items_number_required"] = "مطلوب UPC/EAN/ISBN رقم الباركود.";
 $lang["items_one_or_multiple"] = "صنف/أصناف";
+$lang["items_pack_name"] = "اسم الحزمة";
+$lang["items_qty_per_pack"] = "العدد بكل الحزمة";
 $lang["items_quantity"] = "الكمية";
-$lang["items_quantity_number"] = "الكمية يجب أن تكون رقم";
-$lang["items_quantity_required"] = "الكمية مطلوبة";
+$lang["items_quantity_number"] = "الكمية يجب أن تكون رقم.";
+$lang["items_quantity_required"] = "الكمية مطلوبة.";
 $lang["items_receiving_quantity"] = "الكمية المستلمة";
+$lang["items_remove_image"] = "ازالة الصورة";
 $lang["items_reorder_level"] = "نقطة إعادة الطلب";
-$lang["items_reorder_level_number"] = "نقطة إعادة الطلب يجب أن تكون رقم";
-$lang["items_reorder_level_required"] = "نقطة إعادة الطلب مطلوبة";
+$lang["items_reorder_level_number"] = "نقطة إعادة الطلب يجب أن تكون رقم.";
+$lang["items_reorder_level_required"] = "نقطة إعادة الطلب مطلوبة.";
 $lang["items_retrive_item_info"] = "استرجاع بيانات الصنف";
 $lang["items_sales_tax_1"] = "ضريبة المبيعات";
 $lang["items_sales_tax_2"] = "ضريبة المبيعات 2";
-$lang["items_search_custom_items"] = "بحث الحقول المخصصة";
+$lang["items_search_attributes"] = "بحث الحقول المخصصة";
+$lang["items_select_image"] = "اختار صورة";
 $lang["items_serialized_items"] = "أصناف مسلسلة";
+$lang["items_standard"] = "اساسي";
+$lang["items_stock"] = "مخزن";
 $lang["items_stock_location"] = "مكان المخزون";
+$lang["items_stock_type"] = "نوع المخزن";
 $lang["items_successful_adding"] = "لقد تم إضافة صنف بنجاح";
 $lang["items_successful_bulk_edit"] = "لقد تم تحديث بيانات صنف/أصناف بنجاح";
 $lang["items_successful_deleted"] = "لقد تم الحذف بنجاح";
@@ -77,16 +97,16 @@ $lang["items_successful_updating"] = "لقد تم تحديث بيانات صنف
 $lang["items_supplier"] = "المورد";
 $lang["items_tax_1"] = "الضريبة 1";
 $lang["items_tax_2"] = "الضريبة 2";
+$lang["items_tax_category"] = "الفئة الضريبية";
 $lang["items_tax_percent"] = "نسبة الضريبة";
-$lang["items_tax_percent_required"] = "نسبة الضريبة مطلوبة";
+$lang["items_tax_percent_number"] = "نسبة الضريبة يجب ان تكون رقم";
+$lang["items_tax_percent_required"] = "نسبة الضريبة مطلوبة.";
 $lang["items_tax_percents"] = "نسبة/نسب الضريبة";
+$lang["items_temp"] = "مؤقت";
+$lang["items_type"] = "نوع الصنف";
 $lang["items_unit_price"] = "السعر";
-$lang["items_unit_price_number"] = "السعر يجب أن يكون رقم";
-$lang["items_unit_price_required"] = "السعر مطلوب";
+$lang["items_unit_price_number"] = "السعر يجب أن يكون رقم.";
+$lang["items_unit_price_required"] = "السعر مطلوب.";
 $lang["items_upc_database"] = "UPC قاعدة بيانات";
 $lang["items_update"] = "تحديث بيانات صنف";
 $lang["items_use_inventory_menu"] = "استخدام تحديث المخزن";
-$lang["items_import_items_excel"] = "استيراد من اكسل";
-$lang["items_select_image"] = "اختار صورة";
-$lang["items_change_image"] = "تغيير الصورة";
-$lang["items_remove_image"] = "ازالة الصورة";

application/language/ar-EG/login_lang.php

@@ -1,7 +1,13 @@
 <?php 
 
+$lang["login_gcaptcha"] = "أنا لست بوت.";
 $lang["login_go"] = "البدء";
-$lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح";
+$lang["login_invalid_gcaptcha"] = "رمز التحقق غير صحيح.";
+$lang["login_invalid_installation"] = "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.";
+$lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح.";
 $lang["login_login"] = "دخول";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "كلمة السر";
 $lang["login_username"] = "اسم المستخدم";
+$lang["login_welcome"] = "";

application/language/ar-EG/messages_lang.php

@@ -1,14 +1,14 @@
 <?php 
 
-$lang["messages_sms_send"] = "إرسال SMS";
 $lang["messages_first_name"] = "الإسم الأول";
 $lang["messages_last_name"] = "الأسم الأخير";
-$lang["messages_phone"] = "رقم المحمول";
-$lang["messages_phone_placeholder"] = "رقم/أرقام المحمول هنا...";
-$lang["messages_phone_number_required"] = "رقم المحمول مطلوب";
 $lang["messages_message"] = "الرسالة";
 $lang["messages_message_placeholder"] = "رسالتك هنا...";
 $lang["messages_message_required"] = "الرسالة مطلوبة";
-$lang["messages_multiple_phones"] = "  فى حالة إرسال الرسالة لأكثر من شخص قم بفصل الأرقام بعلامة الفاصلة";
+$lang["messages_multiple_phones"] = "فى حالة إرسال الرسالة لأكثر من شخص قم بفصل الأرقام بعلامة الفاصلة";
+$lang["messages_phone"] = "رقم المحمول";
+$lang["messages_phone_number_required"] = "رقم المحمول مطلوب";
+$lang["messages_phone_placeholder"] = "رقم/أرقام المحمول هنا...";
+$lang["messages_sms_send"] = "إرسال SMS";
 $lang["messages_successfully_sent"] = "تم إرسال الرسالة بنجاح إلى: ";
 $lang["messages_unsuccessfully_sent"] = "لم يتم إرسال الرسالة بنجاح إلى: ";

application/language/ar-EG/module_lang.php

@@ -1,25 +1,41 @@
 <?php 
 
+$lang["module_attributes"] = "ميزات/مميزات";
+$lang["module_attributes_desc"] = "إضافة، تعديل، حذف، وبحث بالميزات.";
+$lang["module_both"] = "الاثنين";
+$lang["module_cashups"] = "الصندوق النقدي";
+$lang["module_cashups_desc"] = "إضافة، تعديل، حذف، وبحث بالصندوق النقدي.";
 $lang["module_config"] = "إعدادات الشركة";
-$lang["module_config_desc"] = "تغيير إعدادات الشركة";
+$lang["module_config_desc"] = "تغيير إعدادات الشركة.";
 $lang["module_customers"] = "العملاء";
-$lang["module_customers_desc"] = "إضافة، تحديث ، بحث و حذف العملاء";
+$lang["module_customers_desc"] = "إضافة، تحديث ، بحث و حذف العملاء.";
 $lang["module_employees"] = "الموظفين";
-$lang["module_employees_desc"] = "إضافة، تحديث ، بحث و حذف الموظفين";
+$lang["module_employees_desc"] = "إضافة، تحديث ، بحث و حذف الموظفين.";
+$lang["module_expenses"] = "المصاريف";
+$lang["module_expenses_categories"] = "فئات المصاريف";
+$lang["module_expenses_categories_desc"] = "إضافة، تحديث ، بحث و حذف فئات المصاريف.";
+$lang["module_expenses_desc"] = "إضافة، تحديث ، بحث و حذف مصاريف.";
 $lang["module_giftcards"] = "بطاقات الهدايا";
-$lang["module_giftcards_desc"] = "إضافة، تحديث ، بحث و حذف بطاقات الهدايا";
+$lang["module_giftcards_desc"] = "إضافة، تحديث ، بحث و حذف بطاقات الهدايا.";
 $lang["module_home"] = "الرئيسية";
+$lang["module_home_desc"] = "اظهار الائحة الرئيسية.";
 $lang["module_item_kits"] = "مجموعات الأصناف";
-$lang["module_item_kits_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الأصناف";
+$lang["module_item_kits_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الأصناف.";
 $lang["module_items"] = "الأصناف";
-$lang["module_items_desc"] = "إضافة، تحديث ، بحث و حذف الأصناف";
-$lang["module_receivings"] = "استلام الأصناف";
-$lang["module_receivings_desc"] = "معالجة أوامر الشراء و استلام الأصناف";
-$lang["module_reports"] = "التقارير";
-$lang["module_reports_desc"] = "عرض وتوليد التقارير";
-$lang["module_sales"] = "المبيعات";
-$lang["module_sales_desc"] = "معالجة المبيعات و المرتجعات";
-$lang["module_suppliers"] = "الموردين";
-$lang["module_suppliers_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الموردين";
+$lang["module_items_desc"] = "إضافة، تحديث ، بحث و حذف الأصناف.";
 $lang["module_messages"] = "الرسائل";
-$lang["module_messages_desc"] = "إرسال رسائل للعملاء ، الموردين او الموظفين";
+$lang["module_messages_desc"] = "إرسال رسائل للعملاء ، الموردين او الموظفين.";
+$lang["module_migrate"] = "النقل";
+$lang["module_migrate_desc"] = "تحديث قاعدة البيانات.";
+$lang["module_office"] = "المكتب";
+$lang["module_office_desc"] = "اظهار الائحة المكتبية.";
+$lang["module_receivings"] = "استلام الأصناف";
+$lang["module_receivings_desc"] = "معالجة أوامر الشراء و استلام الأصناف.";
+$lang["module_reports"] = "التقارير";
+$lang["module_reports_desc"] = "عرض وتوليد التقارير.";
+$lang["module_sales"] = "المبيعات";
+$lang["module_sales_desc"] = "معالجة المبيعات و المرتجعات.";
+$lang["module_suppliers"] = "الموردين";
+$lang["module_suppliers_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الموردين.";
+$lang["module_taxes"] = "الضرائب";
+$lang["module_taxes_desc"] = "اعدادات ضريبة المبيعات.";

application/language/ar-EG/receivings_lang.php

@@ -1,52 +1,54 @@
 <?php 
 
-$lang["receivings_transaction_failed"] = "حركات الإستلام فشلت";
 $lang["receivings_cancel_receiving"] = "إلغاء";
-$lang["receivings_cannot_be_deleted"] = "لايمكن حذف الإستلام/الإستلامات";
+$lang["receivings_cannot_be_deleted"] = "لايمكن حذف الإستلام/الإستلامات.";
 $lang["receivings_comments"] = "تعليقات";
 $lang["receivings_complete_receiving"] = "إنهاء";
 $lang["receivings_confirm_cancel_receiving"] = "هل أنت متاكد أنك تريد إلغاء هذا الإستلام؟ سيتم حذف كل الأصناف.";
-$lang["receivings_confirm_finish_receiving"] = "هل أنت متاكد أنك تريد تنفيذ هذا الإستلام؟ لايمكن التراجع بعد الإرسال";
+$lang["receivings_confirm_delete"] = "هل أنت متاكد أنك تريد حذف هذا الإستلام؟ سيتم حذف كل الأصناف. لايمكن التراجع بعد الحذف.";
+$lang["receivings_confirm_finish_receiving"] = "هل أنت متاكد أنك تريد تنفيذ هذا الإستلام؟ لايمكن التراجع بعد الإرسال.";
 $lang["receivings_cost"] = "التكلفة";
 $lang["receivings_date"] = "تاريخ الإستلام";
-$lang["receivings_date_required"] = "يجب إدخال تاريخ صحيح";
-$lang["receivings_date_type"] = "التاريخ مطلوب";
-$lang["receivings_confirm_delete"] = "هل أنت متاكد أنك تريد حذف هذا الإستلام؟ سيتم حذف كل الأصناف. لايمكن التراجع بعد الحذف";
+$lang["receivings_date_required"] = "يجب إدخال تاريخ صحيح.";
+$lang["receivings_date_type"] = "التاريخ مطلوب.";
 $lang["receivings_delete_entire_sale"] = "حذف عملية البيع بالكامل";
 $lang["receivings_discount"] = "نسبة الخصم";
 $lang["receivings_edit"] = "تحرير";
 $lang["receivings_edit_sale"] = "تحرير إستلام";
 $lang["receivings_employee"] = "الموظف";
-$lang["receivings_error_editing_item"] = "خطاء فى تحرير الصنف";
-$lang["receivings_error_requisition"] = "غير قادر على تحريك الصنف من و إلى نفس المكان";
+$lang["receivings_error_editing_item"] = "خطاء فى تحرير الصنف.";
+$lang["receivings_error_requisition"] = "غير قادر على تحريك الصنف من و إلى نفس المكان.";
 $lang["receivings_find_or_scan_item"] = "بحث/مسح باركود صنف";
 $lang["receivings_find_or_scan_item_or_receipt"] = "بحث/مسح باركود صنف أو إيصال";
 $lang["receivings_id"] = "كود الإستلام";
-$lang["receivings_reference"] = "رقم المرجع";
 $lang["receivings_item_name"] = "اسم الصنف";
 $lang["receivings_mode"] = "وضع الإستلام";
 $lang["receivings_new_supplier"] = "مورد جديد";
 $lang["receivings_one_or_multiple"] = "إستلام/إستلامات";
 $lang["receivings_print_after_sale"] = "طباعة بعد الإستلام";
-$lang["receivings_quantity"] = "الكمية";
+$lang["receivings_quantity"] = "الكمية.";
 $lang["receivings_receipt"] = "إيصال إستلام";
 $lang["receivings_receipt_number"] = "كود الإستلام";
 $lang["receivings_receiving"] = "إستلام";
+$lang["receivings_reference"] = "رقم المرجع";
 $lang["receivings_register"] = "استلام الأصناف";
 $lang["receivings_requisition"] = "طلب شراء";
 $lang["receivings_return"] = "إرتجاع لمورد";
 $lang["receivings_select_supplier"] = "اختار المورد (اختيارى)";
+$lang["receivings_ship_pack"] = "حزمة توصيل";
 $lang["receivings_start_typing_supplier_name"] = "ابداء بكتابة اسم المورد....";
+$lang["receivings_stock"] = "المخزون";
 $lang["receivings_stock_destination"] = "المخزون المحول له";
 $lang["receivings_stock_locaiton"] = "مكان المخزون";
 $lang["receivings_stock_source"] = "مصدر المخزون";
 $lang["receivings_successfully_deleted"] = "لقد تم الحذف";
 $lang["receivings_successfully_updated"] = "لقد تم التحديث";
 $lang["receivings_supplier"] = "المورد";
-$lang["receivings_supplier_email"] = "البريد الإلكتروني";
 $lang["receivings_supplier_address"] = "العنوان";
+$lang["receivings_supplier_email"] = "البريد الإلكتروني";
 $lang["receivings_supplier_location"] = "المكان";
 $lang["receivings_total"] = "الإجمالى";
-$lang["receivings_unable_to_add_item"] = "غير قادر على إضافة صنف للإستلام";
-$lang["receivings_unsuccessfully_updated"] = "لم يتم تحديث الإستلام بنجاح";
+$lang["receivings_transaction_failed"] = "حركات الإستلام فشلت.";
+$lang["receivings_unable_to_add_item"] = "غير قادر على إضافة صنف للإستلام.";
+$lang["receivings_unsuccessfully_updated"] = "لم يتم تحديث الإستلام بنجاح.";
 $lang["receivings_update"] = "تحديث";

application/language/ar-EG/reports_lang.php

@@ -1,10 +1,25 @@
 <?php 
 
 $lang["reports_all"] = "الكل";
+$lang["reports_authority"] = "السلطة";
+$lang["reports_canceled"] = "ملغى";
 $lang["reports_categories"] = "التصنيفات";
 $lang["reports_categories_summary_report"] = "تقرير ملخص التصنيفات";
 $lang["reports_category"] = "تصنيف";
+$lang["reports_code_canceled"] = "كود العمليات الملغية";
+$lang["reports_code_invoice"] = "كود الفواتير الرسمية";
+$lang["reports_code_pos"] = "نقطة بيع";
+$lang["reports_code_quote"] = "كود عروض الاسعار";
+$lang["reports_code_return"] = "كود عمليات المرتجع";
+$lang["reports_code_type"] = "النوع";
+$lang["reports_code_work_order"] = "طلب عمل";
 $lang["reports_comments"] = "التعليقات";
+$lang["reports_complete"] = "عمليات البيع والمرتجع المكتملة";
+$lang["reports_completed_sales"] = "المبيعات المكتملة";
+$lang["reports_confirm_delete"] = "هل انت متاكد من مسح البيانات المحددة؟";
+$lang["reports_confirm_restore"] = "هل انت متاكد من استعادة البيانات المحددة؟";
+$lang["reports_cost"] = "التكلفة";
+$lang["reports_cost_price"] = "سعر التكلفة";
 $lang["reports_count"] = "عدد";
 $lang["reports_customer"] = "عميل";
 $lang["reports_customers"] = "عملاء";
@@ -17,12 +32,23 @@ $lang["reports_detailed_reports"] = "التقارير التفصيلية";
 $lang["reports_detailed_requisition_report"] = "تقرير مفصل لطلبات الشراء";
 $lang["reports_detailed_sales_report"] = "تقرير مفصل للمبيعات";
 $lang["reports_discount"] = "الخصم";
+$lang["reports_discount_fixed"] = "حسم ثابت";
 $lang["reports_discount_percent"] = "نسبة الخصم";
+$lang["reports_discount_type"] = "نوع الحسم";
 $lang["reports_discounts"] = "الخصومات";
 $lang["reports_discounts_summary_report"] = "تقرير ملخص الخصومات";
+$lang["reports_earned"] = "النقاط المحصلة";
 $lang["reports_employee"] = "موظف";
 $lang["reports_employees"] = "الموظفين";
 $lang["reports_employees_summary_report"] = "تقرير ملخص الموظفين";
+$lang["reports_expenses"] = "المصاريف";
+$lang["reports_expenses_amount"] = "القيمة";
+$lang["reports_expenses_categories"] = "فئات المصاريف";
+$lang["reports_expenses_categories_summary_report"] = "تقرير المصاريف حسب الفئات";
+$lang["reports_expenses_category"] = "الفئة";
+$lang["reports_expenses_tax_amount"] = "الضريبة";
+$lang["reports_expenses_total_amount"] = "المبلغ الإجمالي";
+$lang["reports_expenses_total_tax_amount"] = "الضريبة الإجمالية";
 $lang["reports_graphical_reports"] = "تقارير رسومية";
 $lang["reports_inventory"] = "المخزن";
 $lang["reports_inventory_low"] = "نواقص المخزون";
@@ -31,22 +57,27 @@ $lang["reports_inventory_reports"] = "تقارير المخزن";
 $lang["reports_inventory_summary"] = "ملخص المخزن";
 $lang["reports_inventory_summary_report"] = "تقرير ملخص المخزن";
 $lang["reports_item"] = "صنف";
+$lang["reports_item_count"] = "تصفية عداد الصنف";
 $lang["reports_item_name"] = "اسم الصنف";
-$lang["reports_item_number"] = "رقم الصنف";
+$lang["reports_item_number"] = "باركود";
 $lang["reports_items"] = "الأصناف";
 $lang["reports_items_purchased"] = "الأصناف مشتراه";
 $lang["reports_items_received"] = "الأصناف مستلمة";
 $lang["reports_items_summary_report"] = "تقرير ملخص الأصناف";
+$lang["reports_jurisdiction"] = "الاختصاص القضائي";
 $lang["reports_low_inventory"] = "النواقص";
 $lang["reports_low_inventory_report"] = "تقرير نواقص المخزون";
+$lang["reports_low_sell_quantity"] = "كميات حسب الصنف الاولي";
+$lang["reports_more_than_zero"] = "أكثر من صفر";
 $lang["reports_name"] = "الاسم";
+$lang["reports_no_reports_to_display"] = "لايوجد أصناف لعرضها.";
 $lang["reports_payment_type"] = "طريقة الدفع";
 $lang["reports_payments"] = "المدفوعات";
 $lang["reports_payments_summary_report"] = "ملخص المدفوعات";
 $lang["reports_profit"] = "الربح";
-$lang["reports_cost"] = "التكلفة";
 $lang["reports_quantity"] = "الكمية المشتراه";
 $lang["reports_quantity_purchased"] = "المستلم";
+$lang["reports_quotes"] = "عروض اسعار";
 $lang["reports_received_by"] = "مستلمة بواسطة";
 $lang["reports_receiving_id"] = "كود الاستلام";
 $lang["reports_receiving_type"] = "نوع الاستلام";
@@ -71,10 +102,13 @@ $lang["reports_sale_type"] = "طريقة البيع";
 $lang["reports_sales"] = "بيع";
 $lang["reports_sales_amount"] = "كمية المبيعات";
 $lang["reports_sales_summary_report"] = "تقرير ملخص المبيعات";
+$lang["reports_sales_taxes"] = "ضرائب المبيعات";
+$lang["reports_sales_taxes_summary_report"] = "تقرير ملخص ضرائب المبيعات";
 $lang["reports_serial_number"] = "مسلسل";
 $lang["reports_sold_by"] = "البائع";
 $lang["reports_sold_to"] = "مباع الى";
 $lang["reports_stock_location"] = "مكان المخزون";
+$lang["reports_sub_total_value"] = "المجموع الفرعى";
 $lang["reports_subtotal"] = "المجموع الفرعى";
 $lang["reports_summary_reports"] = "تقارير ملخصة";
 $lang["reports_supplied_by"] = "مورده بواسطة";
@@ -82,16 +116,26 @@ $lang["reports_supplier"] = "المورد";
 $lang["reports_suppliers"] = "الموردين";
 $lang["reports_suppliers_summary_report"] = "تقرير ملخص الموردين";
 $lang["reports_tax"] = "الضريبة";
+$lang["reports_tax_category"] = "الفئة الضريبية";
 $lang["reports_tax_percent"] = "نسبة الضريبة";
+$lang["reports_tax_rate"] = "معدل الضريبة";
 $lang["reports_taxes"] = "الضرائب";
 $lang["reports_taxes_summary_report"] = "تقرير ملخص الضرائب";
 $lang["reports_total"] = "الإجمالى";
-$lang["reports_type"] = "النوع";
-$lang["reports_item_count"] = "تصفية عداد الصنف";
-$lang["reports_cost_price"] = "سعر التكلفة";
-$lang["reports_unit_price"] = "السعر";
-$lang["reports_sub_total_value"] = "المجموع الفرعى";
 $lang["reports_total_inventory_value"] = "إجمالى قيمة المخزن";
+$lang["reports_total_low_sell_quantity"] = "مجموع الكميات حسب الصنف الاولي";
+$lang["reports_total_quantity"] = "الكمية/العدد";
+$lang["reports_total_retail"] = "قيمة المبيع";
+$lang["reports_trans_amount"] = "قيمة العملية التجارية";
+$lang["reports_trans_due"] = "مستحق";
+$lang["reports_trans_group"] = "مجموعة العمليات التجارية";
+$lang["reports_trans_nopay_sales"] = "المبيعات الغير مسدده";
+$lang["reports_trans_payments"] = "المدفوعات";
+$lang["reports_trans_refunded"] = "المرتجع";
+$lang["reports_trans_sales"] = "المبيعات";
+$lang["reports_trans_type"] = "نوع العملية التجارية";
+$lang["reports_type"] = "النوع";
+$lang["reports_unit_price"] = "السعر";
+$lang["reports_used"] = "النقاط المستخدمة";
+$lang["reports_work_orders"] = "طلبات عمل";
 $lang["reports_zero_and_less"] = "صفر و أقل";
-$lang["reports_more_than_zero"] = "أكثر من صفر";
-$lang["reports_no_reports_to_display"] = "لايوجد أصناف لعرضها";

application/language/ar-EG/sales_lang.php

@@ -1,123 +1,182 @@
 <?php 
 
+$lang["customers_available_points"] = "النقاط المتاحة";
+$lang["rewards_package"] = "مكافآت";
+$lang["rewards_remaining_balance"] = "رصيد النقاط المتبقي هو ";
+$lang["sales_account_number"] = "حساب";
 $lang["sales_add_payment"] = "إضافة دفع";
 $lang["sales_amount_due"] = "المبلغ المطلوب";
 $lang["sales_amount_tendered"] = "المبلغ المدفوع";
+$lang["sales_authorized_signature"] = "توقيع معتمد";
 $lang["sales_cancel_sale"] = "الغاء عملية البيع";
 $lang["sales_cash"] = "نقدى";
+$lang["sales_cash_adjustment"] = "";
+$lang["sales_cash_deposit"] = "ايداع نقدي";
+$lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";
+$lang["sales_change_price"] = "";
 $lang["sales_check"] = "شيك";
 $lang["sales_check_balance"] = "تذكير بموعد الشيك";
+$lang["sales_check_filter"] = "شيك";
 $lang["sales_comment"] = "تعليق";
 $lang["sales_comments"] = "تعليقات";
 $lang["sales_complete_sale"] = "إتمام البيع";
-$lang["sales_confirm_cancel_sale"] = "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف";
+$lang["sales_confirm_cancel_sale"] = "هل أنت متأكد من الغاء عملية البيع ؟ سيتم إزالة كل الأصناف.";
 $lang["sales_confirm_delete"] = "هل تريد حذف عمليات البيع المختارة؟";
+$lang["sales_confirm_restore"] = "هل انت متاكد من استعادة عملية البيع؟";
 $lang["sales_credit"] = "بطاقة إئتمانية";
+$lang["sales_credit_deposit"] = "ايداع ببطاقة ائتمان";
+$lang["sales_credit_filter"] = "";
 $lang["sales_customer"] = "العميل";
-$lang["sales_customer_email"] = "البريد الإلكترونى";
 $lang["sales_customer_address"] = "العنوان";
-$lang["sales_customer_location"] = "المكان";
 $lang["sales_customer_discount"] = "الخصم";
+$lang["sales_customer_email"] = "البريد الإلكترونى";
+$lang["sales_customer_location"] = "المكان";
+$lang["sales_customer_mailchimp_status"] = "حالة ميل تشيمب";
+$lang["sales_customer_optional"] = "(مطلوب للدفعات المستحقة)";
+$lang["sales_customer_required"] = "(اجباري)";
 $lang["sales_customer_total"] = "المجموع";
 $lang["sales_date"] = "تاريخ البيع";
-$lang["sales_date_required"] = "يجب إدخال تاريخ صحيح";
-$lang["sales_date_type"] = "التاريخ مطلوب";
+$lang["sales_date_range"] = "الفترة الزمنية";
+$lang["sales_date_required"] = "يجب إدخال تاريخ صحيح.";
+$lang["sales_date_type"] = "التاريخ مطلوب.";
 $lang["sales_debit"] = "بطاقة خصم";
-$lang["sales_delete_confirmation"] = "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف";
+$lang["sales_delete"] = "اسمح بالمسح";
+$lang["sales_delete_confirmation"] = "هل أنت متأكد أنك تريد حذف عملية البيع هذه؟ لايمكن التراجع بعد الحذف.";
 $lang["sales_delete_entire_sale"] = "حذف عملية البيع بالكامل";
-$lang["sales_delete_successful"] = "لقد تم حذف عملية البيع بنجاح";
-$lang["sales_delete_unsuccessful"] = "لقد فشل حذف عملية البيع";
-$lang["sales_description_abbrv"] = "الوصف";
-$lang["sales_discount"] = "خصم %";
+$lang["sales_delete_successful"] = "لقد تم حذف عملية البيع بنجاح.";
+$lang["sales_delete_unsuccessful"] = "لقد فشل حذف عملية البيع.";
+$lang["sales_description_abbrv"] = "الوصف.";
+$lang["sales_discard"] = "الغاء";
+$lang["sales_discard_quote"] = "";
+$lang["sales_discount"] = "خصم";
 $lang["sales_discount_included"] = "% خصم";
-$lang["sales_discount"] = "الخصم";
 $lang["sales_discount_short"] = "%";
+$lang["sales_due"] = "مستحق";
+$lang["sales_due_filter"] = "مستحق";
 $lang["sales_edit"] = "تحرير";
 $lang["sales_edit_item"] = "تحرير صنف";
 $lang["sales_edit_sale"] = "تحرير عملية بيع";
 $lang["sales_email_receipt"] = "إرسال الايصال بالبريد الالكترونى";
 $lang["sales_employee"] = "الموظف";
+$lang["sales_entry"] = "ادخال";
 $lang["sales_error_editing_item"] = "خطاء فى تحرير الصنف";
 $lang["sales_find_or_scan_item"] = "بحث/مسح باركود صنف";
 $lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود صنف أو ايصال";
 $lang["sales_giftcard"] = "بطاقة هدية";
 $lang["sales_giftcard_balance"] = "رصيد بطاقة الهدية";
 $lang["sales_giftcard_number"] = "رقم بطاقة الهدية";
+$lang["sales_group_by_category"] = "تصفية حسب الفئة";
+$lang["sales_group_by_type"] = "تجميع حسب النوع";
+$lang["sales_hsn"] = "رمز نظام منسق";
 $lang["sales_id"] = "كود عملية البيع";
+$lang["sales_include_prices"] = "يشمل الاسعار؟";
 $lang["sales_invoice"] = "فاتورة";
 $lang["sales_invoice_confirm"] = "هذه الفاتورة سوف ترسل إلى";
 $lang["sales_invoice_enable"] = "إنشاء فاتورة";
 $lang["sales_invoice_filter"] = "الفواتير";
-$lang["sales_cash_filter"] = "نقدى";
-$lang["sales_invoice_no_email"] = "هذا العميل ليس لدية بريد الكترونى صالح";
+$lang["sales_invoice_no_email"] = "هذا العميل ليس لدية بريد الكترونى صالح.";
 $lang["sales_invoice_number"] = "فاتورة رقم #";
-$lang["sales_invoice_number_duplicate"] = "من فضلك أدخل رقم فاتورة غير مكرر";
+$lang["sales_invoice_number_duplicate"] = "من فضلك أدخل رقم فاتورة غير مكرر.";
 $lang["sales_invoice_sent"] = "تم إرسال الفاتورة إلى";
+$lang["sales_invoice_total"] = "إجمالي الفاتورة";
+$lang["sales_invoice_type_custom_invoice"] = "فاتورة مخصصة (custom_invoice.php)";
+$lang["sales_invoice_type_custom_tax_invoice"] = "الفاتورة الضريبية المخصصة (custom_tax_invoice.php)";
+$lang["sales_invoice_type_invoice"] = "الفاتورة (invoice.php)";
+$lang["sales_invoice_type_tax_invoice"] = "الفاتورة الضريبية (tax_invoice.php)";
 $lang["sales_invoice_unsent"] = "فشل إرسال الفاتورة إلى";
 $lang["sales_invoice_update"] = "إعادة العد";
-$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من الصنف";
+$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من الصنف.";
 $lang["sales_item_name"] = "اسم الصنف";
 $lang["sales_item_number"] = "صنف #";
-$lang["sales_item_out_of_stock"] = "لايوجد مخزون من الصنف";
+$lang["sales_item_out_of_stock"] = "لايوجد مخزون من الصنف.";
 $lang["sales_mode"] = "وضع التسجيل";
-$lang["sales_must_enter_numeric"] = "يجب إدخال رقم للمبلغ الفعلى المدفوع";
-$lang["sales_must_enter_numeric_giftcard"] = "رقم بطاقة الهدية يجب أن يكون رقم";
+$lang["sales_must_enter_numeric"] = "يجب إدخال رقم للمبلغ الفعلى المدفوع.";
+$lang["sales_must_enter_numeric_giftcard"] = "رقم بطاقة الهدية يجب أن يكون رقم.";
 $lang["sales_new_customer"] = "عميل جديد";
 $lang["sales_new_item"] = "صنف جديد";
-$lang["sales_no_description"] = "لايوجد";
+$lang["sales_no_description"] = "بدون وصف";
 $lang["sales_no_filter"] = "الكل";
-$lang["sales_no_items_in_cart"] = "لايوجد أصناف فى السلة";
-$lang["sales_no_sales_to_display"] = "لاتوجد عمليات بيع لعرضها";
+$lang["sales_no_items_in_cart"] = "لايوجد أصناف فى السلة.";
+$lang["sales_no_sales_to_display"] = "لاتوجد عمليات بيع لعرضها.";
+$lang["sales_none_selected"] = "لم تقم بإختيار أى عمليات بيع لحذفها.";
+$lang["sales_nontaxed_ind"] = "";
+$lang["sales_not_authorized"] = "هذه العملية لا يمكن فعلها لعدم تخويلك.";
 $lang["sales_one_or_multiple"] = "عمليات بيع";
-$lang["sales_takings"] = "الإيراد";
 $lang["sales_payment"] = "طريقة الدفع";
 $lang["sales_payment_amount"] = "المبلغ";
-$lang["sales_payment_not_cover_total"] = "المبلغ المدفوع لايغطى المبلغ الإجمالى";
+$lang["sales_payment_not_cover_total"] = "المبلغ المدفوع لايغطى المبلغ الإجمالى.";
 $lang["sales_payment_type"] = "طريقة";
 $lang["sales_payments_total"] = "إجمالى المدفوعات";
 $lang["sales_price"] = "السعر";
 $lang["sales_print_after_sale"] = "اطبع بعد عملية البيع";
 $lang["sales_quantity"] = "الكمية";
+$lang["sales_quantity_less_than_reorder_level"] = "تحذير: الكمية/العدد المطلوب غير متوفر لهذا الصنف.";
 $lang["sales_quantity_less_than_zero"] = "تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.";
-$lang["sales_quantity_less_than_reorder_level"] = "إيصال البيع";
+$lang["sales_quantity_of_items"] = "عدد ال 1% من الاصناف";
+$lang["sales_quote"] = "عرض اسعار";
+$lang["sales_quote_number"] = "رقم عرض الاسعار";
+$lang["sales_quote_number_duplicate"] = "رقم عرض الاسعار يجب ان يكون فريد.";
+$lang["sales_quote_sent"] = "عرض الاسعار ارسل الى";
+$lang["sales_quote_unsent"] = "لم يتم ارسال عرض الاسعار الى";
 $lang["sales_receipt"] = "عملية بيع #";
+$lang["sales_receipt_no_email"] = "هذا العميل ليس له اي بريد الكتروني صحيح.";
 $lang["sales_receipt_number"] = "إيصال بيع";
 $lang["sales_receipt_sent"] = "تم إرسال الإيصال إلى";
 $lang["sales_receipt_unsent"] = "فشل إرسال الإيصال إلى";
+$lang["sales_refund"] = "";
 $lang["sales_register"] = "مسجل المبيعات";
 $lang["sales_remove_customer"] = "حذف عميل";
 $lang["sales_return"] = "إرتجاع";
+$lang["sales_rewards"] = "نقاط المكافئة";
+$lang["sales_rewards_balance"] = "رصيد نقاط المكافئة";
 $lang["sales_sale"] = "بيع";
-$lang["sales_sale_for_customer"] = "العميل: ";
+$lang["sales_sale_by_invoice"] = "البيع بفاتورة رسمية";
+$lang["sales_sale_for_customer"] = "العميل:";
 $lang["sales_sale_time"] = "الوقت";
-$lang["sales_select_customer"] = "اختيار عميل (اختيارى)";
+$lang["sales_sales_tax"] = "ضريبة البيع";
+$lang["sales_select_customer"] = "اختيار عميل (اختياري)";
 $lang["sales_send_invoice"] = "إرسال الفاتورة";
+$lang["sales_send_quote"] = "ارسال عرض الاسعار";
 $lang["sales_send_receipt"] = "إرسال إيصال";
+$lang["sales_send_work_order"] = "ارسال طلب عمل";
 $lang["sales_serial"] = "مسلسل";
 $lang["sales_show_invoice"] = "عرض الفاتورة";
 $lang["sales_show_receipt"] = "عرض الإيصال";
 $lang["sales_start_typing_customer_name"] = "ابداء بكتابة اسم العميل...";
-$lang["sales_start_typing_item_name"] = "ابداء بكتابة اسم أو مسح باركود الصنف";
+$lang["sales_start_typing_item_name"] = "ابداء بكتابة اسم أو مسح باركود الصنف...";
+$lang["sales_stock"] = "المخزن";
 $lang["sales_stock_location"] = "مكان المخزون";
-$lang["sales_sub_total"] = "المجموع الفرعى";
+$lang["sales_sub_total"] = "المجموع الفرعي";
 $lang["sales_successfully_deleted"] = "لقد تم الحذف بنجاح";
-$lang["sales_successfully_suspended_sale"] = "لقد تم تعليق عملية البيع بنجاح";
-$lang["sales_successfully_updated"] = "لقد تم تحديث بيانات عملية البيع بنجاح";
+$lang["sales_successfully_restored"] = "لقد تمت عملية الاستعادة بنجاح";
+$lang["sales_successfully_suspended_sale"] = "لقد تم تعليق عملية البيع بنجاح.";
+$lang["sales_successfully_updated"] = "لقد تم تحديث بيانات عملية البيع بنجاح.";
 $lang["sales_suspend_sale"] = "تعليق عملية البيع";
+$lang["sales_suspended_doc_id"] = "ملف";
 $lang["sales_suspended_sale_id"] = "كود عملية البيع";
 $lang["sales_suspended_sales"] = "المبيعات المعلقة";
+$lang["sales_table"] = "طاولة";
+$lang["sales_takings"] = "المبيع اليومي";
 $lang["sales_tax"] = "ضريبة";
+$lang["sales_tax_id"] = "الرقم الضريبي";
+$lang["sales_tax_invoice"] = "فاتورة ضريبية";
 $lang["sales_tax_percent"] = "ضريبة %";
+$lang["sales_taxed_ind"] = "";
 $lang["sales_total"] = "المجموع";
 $lang["sales_total_tax_exclusive"] = "الإجمالى بدون الضرائب";
-$lang["sales_transaction_failed"] = "فشل حركة البيع";
+$lang["sales_transaction_failed"] = "فشل حركة البيع.";
 $lang["sales_unable_to_add_item"] = "غير قادر على إضافة صنف لعملية البيع";
-$lang["sales_unsuccessfully_deleted"] = "لايمكن حذف عملية/عمليات البيع";
-$lang["sales_unsuccessfully_suspended_sale"] = "فشل تعليق عملية البيع";
-$lang["sales_unsuccessfully_updated"] = "فشل عملية تحديث عملية البيع";
+$lang["sales_unsuccessfully_deleted"] = "لايمكن حذف عملية/عمليات البيع.";
+$lang["sales_unsuccessfully_restored"] = "فشل في استعادة عملية البيع.";
+$lang["sales_unsuccessfully_suspended_sale"] = "فشل تعليق عملية البيع.";
+$lang["sales_unsuccessfully_updated"] = "فشل تحديث عملية البيع.";
 $lang["sales_unsuspend"] = "إلغاء تعليق";
 $lang["sales_unsuspend_and_delete"] = "إلغاء تعليق وحذف";
 $lang["sales_update"] = "تحديث";
-$lang["sales_date_range"] = "الفترة الزمنية";
-$lang["sales_none_selected"] = "لم تقم بإختيار أى عمليات بيع لحذفها";
+$lang["sales_upi"] = "رقم التعريف الشخصي";
+$lang["sales_work_order"] = "طلب عمل";
+$lang["sales_work_order_number"] = "رقم طلب العمل";
+$lang["sales_work_order_number_duplicate"] = "رقم طلب العمل يجب ان يكون فريد.";
+$lang["sales_work_order_sent"] = "تم ارسال طلب العمل الى";
+$lang["sales_work_order_unsent"] = "فشل في ارسال طلب العمل الى";

application/language/ar-EG/suppliers_lang.php

@@ -1,18 +1,23 @@
 <?php 
 
-$lang["suppliers_account_number"] = "حساب رقم#";
-$lang["suppliers_cannot_be_deleted"] = "لايمكن حذف المورد/الموردين لوجود مبيعات مرتبطة بهم";
-$lang["suppliers_company_name"] = "اسم الشركة";
-$lang["suppliers_company_name_required"] = "اسم الشركة مطلوب";
+$lang["suppliers_account_number"] = "رقم الحساب";
 $lang["suppliers_agency_name"] = "اسم الوكالة";
+$lang["suppliers_cannot_be_deleted"] = "لايمكن حذف المورد/الموردين لوجود مبيعات مرتبطة بهم.";
+$lang["suppliers_category"] = "الفئة";
+$lang["suppliers_company_name"] = "اسم الشركة";
+$lang["suppliers_company_name_required"] = "اسم الشركة مطلوب.";
 $lang["suppliers_confirm_delete"] = "هل تريد حقا حذف هؤلاء الموردين؟";
-$lang["suppliers_error_adding_updating"] = "خطاء فى إضافة/تحديث المورد";
+$lang["suppliers_confirm_restore"] = "هل تريد بالتأكيد استعادة المورد (الموردين) المحددين؟";
+$lang["suppliers_cost"] = "مورد كلفة";
+$lang["suppliers_error_adding_updating"] = "خطاء فى إضافة/تحديث المورد.";
+$lang["suppliers_goods"] = "مورد بضائع";
 $lang["suppliers_new"] = "مورد جديد";
-$lang["suppliers_none_selected"] = "لم تختار موردين لحذفهم";
+$lang["suppliers_none_selected"] = "لم تختار موردين لحذفهم.";
 $lang["suppliers_one_or_multiple"] = "مورد/موردين";
 $lang["suppliers_successful_adding"] = "لقد تم إضافة المورد بنجاح";
 $lang["suppliers_successful_deleted"] = "لقد تم حذف المورد بنجاح";
 $lang["suppliers_successful_updating"] = "لقد تم تحديث بيانات المورد بنجاح";
 $lang["suppliers_supplier"] = "مورد";
 $lang["suppliers_supplier_id"] = "كود المورد";
+$lang["suppliers_tax_id"] = "الرقم الضريبي";
 $lang["suppliers_update"] = "تحديث بيانات المورد";

application/language/ar-EG/taxes_lang.php

@@ -0,0 +1,80 @@
+<?php 
+
+$lang["taxes_add_exception"] = "أضافة أستثناء";
+$lang["taxes_cascade"] = "تتالي";
+$lang["taxes_cascade_sequence"] = "تسلسل متتالي";
+$lang["taxes_city"] = "مدينة";
+$lang["taxes_code"] = "الشفرة";
+$lang["taxes_confirm_delete"] = "هل أنت متأكد أنك تريد حذف قانون الضرائب؟ لا يمكن التراجع عن هذا الإجراء";
+$lang["taxes_confirm_restore"] = "هل أنت متأكد من أستعادة الأكواد الضريبية؟";
+$lang["taxes_default_tax_category"] = "التصنيف الضريبي الأفتراضي";
+$lang["taxes_default_tax_rate"] = "معدل الضريبة الافتراضي";
+$lang["taxes_error_adding_updating"] = "فشل إضافة أو تحديث قانون الضرائب";
+$lang["taxes_group_seq"] = "تسلسل المجموعة";
+$lang["taxes_jurisdiction_name"] = "اسم الولاية القضائية";
+$lang["taxes_name"] = "الاسم";
+$lang["taxes_new"] = "ضريبة جديدة";
+$lang["taxes_no_taxes_to_display"] = "لا يوجد أكواد ضريبية للعرض";
+$lang["taxes_reporting_authority"] = "السلطة الضريبية";
+$lang["taxes_round_half_down"] = "نصف الاسفل";
+$lang["taxes_round_half_even"] = "تقريب للنصف";
+$lang["taxes_round_half_odd"] = "تقريب غريب";
+$lang["taxes_round_half_up"] = "تقريب للاعلى";
+$lang["taxes_rounding_code"] = "كود التقريب";
+$lang["taxes_sales_tax"] = "ضريبة المبيعات";
+$lang["taxes_sales_tax_by_invoice"] = "ضريبة المبيعات بالفاتورة";
+$lang["taxes_sequence"] = "تسلسل";
+$lang["taxes_state"] = "حالة";
+$lang["taxes_successful_deleted"] = "تم المسح بنجاح";
+$lang["taxes_tax_categories"] = "فئات الضرائب";
+$lang["taxes_tax_categories_configuration"] = "اعدادات فئات الضرائب";
+$lang["taxes_tax_categories_saved_successfully"] = "تم حفظ تغييرات الفئات الضريبية";
+$lang["taxes_tax_categories_saved_unsuccessfully"] = "لم يتم حفظ تغييرات الفئات الضريبة";
+$lang["taxes_tax_category"] = "الفئة الضريبية";
+$lang["taxes_tax_category_code"] = "رمز الفئة الضريبية";
+$lang["taxes_tax_category_duplicate"] = "الفئة الضريبية مكررة";
+$lang["taxes_tax_category_invalid_chars"] = "أحرف غير صالحة في اسم الفئة الضريبية";
+$lang["taxes_tax_category_name"] = "اسم فئة الضريبة";
+$lang["taxes_tax_category_new"] = "فئة الضريبية جديدة";
+$lang["taxes_tax_category_required"] = "الفئة الضريبة مطلوبة";
+$lang["taxes_tax_code"] = "كود الضريبة";
+$lang["taxes_tax_code_cannot_be_deleted"] = "فشل مسح الكود الضريبي";
+$lang["taxes_tax_code_duplicate"] = "رمز الضريبة مكرر";
+$lang["taxes_tax_code_invalid_chars"] = "أحرف لا يمكن استعمالها في قانون الضرائب";
+$lang["taxes_tax_code_name"] = "اسم الكود الضريبي";
+$lang["taxes_tax_code_required"] = "حقل الكود الضريبي مطلوب";
+$lang["taxes_tax_code_successful_deleted"] = "تم مسح الكود الضريبي";
+$lang["taxes_tax_code_successful_updated"] = "تم التعديل بنجاح";
+$lang["taxes_tax_code_successful_updating"] = "تم تعديل الكود الضريبي بنجاح";
+$lang["taxes_tax_code_successfully_added"] = "لقد تم إضافة المورد بنجاح";
+$lang["taxes_tax_code_type"] = "نوع كود الضريبة";
+$lang["taxes_tax_codes"] = "الرموز الضريبية";
+$lang["taxes_tax_codes_configuration"] = "اعدادات الرموز الضريبية";
+$lang["taxes_tax_codes_saved_successfully"] = "تم حفظ تغييرات قانون الضرائب";
+$lang["taxes_tax_codes_saved_unsuccessfully"] = "لم يتم حفظ تغييرات قانون الضريبة";
+$lang["taxes_tax_excluded"] = "لا تشمل الضرائب";
+$lang["taxes_tax_group"] = "المجموعة الضريبية";
+$lang["taxes_tax_group_not_unique"] = "";
+$lang["taxes_tax_group_sequence"] = "تسلسل مجموعة الضرائب";
+$lang["taxes_tax_included"] = "الضريبة مشمولة";
+$lang["taxes_tax_jurisdiction"] = "الاختصاص الضريبي";
+$lang["taxes_tax_jurisdiction_duplicate"] = "تكرير الاختصاص الضريبي";
+$lang["taxes_tax_jurisdiction_invalid_chars"] = "أحرف لا يمكن استعمالها في اسم الولاية القضائية";
+$lang["taxes_tax_jurisdiction_required"] = "الاختصاص الضريبي هي خانة اجبارية";
+$lang["taxes_tax_jurisdictions"] = "الاختصاصات الضريبية";
+$lang["taxes_tax_jurisdictions_configuration"] = "اعجدادات الاختصاصات الضريبية";
+$lang["taxes_tax_jurisdictions_saved_successfully"] = "تم حفظ تغييرات الاختصاص الضريبي";
+$lang["taxes_tax_jurisdictions_saved_unsuccessfully"] = "لم يتم حفظ تغييرات الاختصاص الضريبي";
+$lang["taxes_tax_rate"] = "معدل الضريبة الافتراضي %";
+$lang["taxes_tax_rate_configuration"] = "اعجدادات معدل الضريبة";
+$lang["taxes_tax_rate_error_adding_updating"] = "فشل إضافة أو تحديث معدل الضريبة";
+$lang["taxes_tax_rate_numeric"] = "معدل الضريبة الافتراضي يجب أن يكون رقم";
+$lang["taxes_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب";
+$lang["taxes_tax_rate_successful_updated"] = "لقد تم بالتحديث بنجاح";
+$lang["taxes_tax_rate_successfully_added"] = "لقد تم الاضافة بنجاح";
+$lang["taxes_tax_rates"] = "معدلات الضريبة";
+$lang["taxes_tax_rates_configuration"] = "اعدادات معدلات الضريبة";
+$lang["taxes_tax_rounding"] = "التقريب الضريبي";
+$lang["taxes_tax_type"] = "نوع الضريبة";
+$lang["taxes_update"] = "تحديث معدل الضريبة";
+$lang["taxes_vat_tax"] = "ضريبة القيمة المضافة";

application/language/ar-LB/attributes_lang.php

@@ -0,0 +1,31 @@
+<?php 
+
+$lang["attributes_attribute_value_invalid_chars"] = "الميزات لا يمكن أن تحتوي على ':' أو'|'";
+$lang["attributes_confirm_delete"] = "هل أنت متأكد من أنك تريد حذف الميزات المحددة ؟";
+$lang["attributes_confirm_restore"] = "هل أنت متأكد من أنك تريد استعادة السمة (السمات) المحددة؟";
+$lang["attributes_definition_cannot_be_deleted"] = "لا يمكن حذف السمات المحددة";
+$lang["attributes_definition_error_adding_updating"] = "لا يمكن إضافة السمة ٪1 أو تحديثها. يرجى التحقق من سجل الخطأ.";
+$lang["attributes_definition_flags"] = "رؤية الميزات";
+$lang["attributes_definition_group"] = "المجموعة";
+$lang["attributes_definition_id"] = "كود";
+$lang["attributes_definition_name"] = "إضافة ميزة";
+$lang["attributes_definition_name_required"] = "اسم الميزة هي خانة اجبارية";
+$lang["attributes_definition_one_or_multiple"] = "ميزة/ميزات";
+$lang["attributes_definition_successful_adding"] = "لقد تم إضافة صنف بنجاح";
+$lang["attributes_definition_successful_deleted"] = "لقد تم حذف ميزة بنجاح";
+$lang["attributes_definition_successful_updating"] = "تم تعديل الميزة بنجاح";
+$lang["attributes_definition_type"] = "نوع الميزة";
+$lang["attributes_definition_type_required"] = "نوع الميزة هي خانة إجبارية";
+$lang["attributes_definition_unit"] = "وحدة قياس";
+$lang["attributes_definition_values"] = "قيمة الميزة";
+$lang["attributes_new"] = "اضافة ميزة جديده";
+$lang["attributes_no_attributes_to_display"] = "لا يوجد اصناف للعرض";
+$lang["attributes_receipt_visibility"] = "وصل";
+$lang["attributes_show_in_items"] = "اظهار في الصنف";
+$lang["attributes_show_in_items_visibility"] = "الصنف";
+$lang["attributes_show_in_receipt"] = "اظهار على الوصل";
+$lang["attributes_show_in_receivings"] = "اظهار في استلام البضائع";
+$lang["attributes_show_in_receivings_visibility"] = "استلام البضائع";
+$lang["attributes_show_in_sales"] = "اظهار خلال البيع";
+$lang["attributes_show_in_sales_visibility"] = "البيع";
+$lang["attributes_update"] = "تحديث الميزات";

application/language/ar-LB/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_all"] = "الجميع";
+$lang["tables_columns"] = "أعمدة";
+$lang["tables_hide_show_pagination"] = "عرض/إخفاء أرقام الصفحات";
+$lang["tables_loading"] = "جارى التحميل، برجاء الإنتظار ...";
+$lang["tables_page_from_to"] = "عرض {0} إلى {1} من {2} صفوف";
+$lang["tables_refresh"] = "إعادة تحميل";
+$lang["tables_rows_per_page"] = "{0} صف بالصفحة";
+$lang["tables_toggle"] = "تغيير";

application/language/ar-LB/cashups_lang.php

@@ -0,0 +1,38 @@
+<?php 
+
+$lang["cashups_amount"] = "قيمة المبلغ";
+$lang["cashups_amount_number"] = "قيمة المبلغ يجب ان تتكون من ارقام";
+$lang["cashups_amount_required"] = "قيمة المبلغ هي خانة إجبارية.";
+$lang["cashups_cannot_be_deleted"] = "لا يمكن حذف الصندوق النقدي";
+$lang["cashups_close_date"] = "تاريخ تسكير الصندوق";
+$lang["cashups_close_employee"] = "تم التسكير من قبل";
+$lang["cashups_closed_amount_card"] = "بطاقات ائتمان";
+$lang["cashups_closed_amount_cash"] = "الصندوق النقدي";
+$lang["cashups_closed_amount_check"] = "شيكات";
+$lang["cashups_closed_amount_due"] = "الديون";
+$lang["cashups_closed_amount_total"] = "المجموع";
+$lang["cashups_closed_date"] = "تاريخ تسكير الصندوق";
+$lang["cashups_confirm_delete"] = "هل انت متأكد من حذف الصندوق النقدي؟";
+$lang["cashups_confirm_restore"] = "هل انت متأكد من استعادة الصندوق النقدي؟";
+$lang["cashups_date_number"] = "التاريخ يجب ان يكون مكون من ارقام";
+$lang["cashups_date_required"] = "التاريخ هي خانة اجبارية";
+$lang["cashups_description"] = "الوصف";
+$lang["cashups_error_adding_updating"] = "خطأ في تعديل او اضافة صندوق نقدي";
+$lang["cashups_id"] = "كود";
+$lang["cashups_info"] = "معلومات عن الصندوق النقدي";
+$lang["cashups_is_deleted"] = "محذوف";
+$lang["cashups_new"] = "صندوق نقدي جديد";
+$lang["cashups_no_cashups_to_display"] = "لا يوجد صناديق نقدية للاظهار";
+$lang["cashups_none_selected"] = "لم يتم اختيار اي صندوق نقدي";
+$lang["cashups_note"] = "ملاحظات";
+$lang["cashups_one_or_multiple"] = "صندوق او صناديق نقدية";
+$lang["cashups_open_amount_cash"] = "بداية صندوق نقدي";
+$lang["cashups_open_date"] = "تاريخ بداية الصندوق النقدي";
+$lang["cashups_open_employee"] = "تمت بداية الصندوق النقدي من قبل";
+$lang["cashups_opened_date"] = "تاريخ بداية الصندوق النقدي";
+$lang["cashups_successful_adding"] = "تمت إضافة الصندوق النقدي بنجاح";
+$lang["cashups_successful_deleted"] = "تم حذف الصندوق النقدي بنجاح";
+$lang["cashups_successful_updating"] = "تم تعديل الصندوق النقدي بنجاح";
+$lang["cashups_total"] = "المجموع";
+$lang["cashups_transfer_amount_cash"] = "حركة الصندوق";
+$lang["cashups_update"] = "تعديل/تحديث الصندوق النقدي";

application/language/ar-LB/common_lang.php

@@ -0,0 +1,79 @@
+<?php 
+
+$lang["common_address_1"] = "العنوان 1";
+$lang["common_address_2"] = "العنوان 2";
+$lang["common_city"] = "المدينة";
+$lang["common_close"] = "إغلاق";
+$lang["common_comments"] = "تعليقات";
+$lang["common_common"] = "عام";
+$lang["common_confirm_search"] = "لقد قمت اختيار أكتر من سجل، سوف تفقد هذه الاختيارات عند إرسال البحث، موافق؟";
+$lang["common_copyrights"] = "© 2010 - %1";
+$lang["common_correct_errors"] = "يرجى تصحيح الأخطاء المحددة قبل الحفظ";
+$lang["common_country"] = "البلد";
+$lang["common_date"] = "التاريخ";
+$lang["common_delete"] = "حذف";
+$lang["common_det"] = "تفاصيل";
+$lang["common_download_import_template"] = "تنزيل قالب الاستيراد من اكسل (CSV)";
+$lang["common_edit"] = "تحرير";
+$lang["common_email"] = "بريد إلكتروني";
+$lang["common_email_invalid_format"] = "شكل البريد الإلكتروني غير صحيح.";
+$lang["common_export_csv"] = "تصدير إلى اكسل";
+$lang["common_export_csv_no"] = "لا";
+$lang["common_export_csv_yes"] = "نعم";
+$lang["common_fields_required_message"] = "الحقول التي بالأحمر مطلوبة";
+$lang["common_first_name"] = "الاسم الأول";
+$lang["common_first_name_required"] = "الاسم الأول مطلوب.";
+$lang["common_first_page"] = "الأول";
+$lang["common_gender"] = "النوع";
+$lang["common_gender_female"] = "أنثى";
+$lang["common_gender_male"] = "ذكر";
+$lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
+$lang["common_id"] = "كود";
+$lang["common_import"] = "استيراد";
+$lang["common_import_change_file"] = "تغيير";
+$lang["common_import_csv"] = "استيراد من اكسل";
+$lang["common_import_full_path"] = "المسار الكامل لملف اكسل مطلوب";
+$lang["common_import_remove_file"] = "إزالة";
+$lang["common_import_select_file"] = "اختار ملف";
+$lang["common_inv"] = "المخزن";
+$lang["common_last_name"] = "الاسم الأخير";
+$lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
+$lang["common_last_page"] = "الأخيرة";
+$lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
+$lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
+$lang["common_logout"] = "خروج";
+$lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
+$lang["common_new"] = "جديد";
+$lang["common_no"] = "";
+$lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم.";
+$lang["common_none_selected_text"] = "[إختيار]";
+$lang["common_or"] = "أو";
+$lang["common_phone_number"] = "رقم التليفون";
+$lang["common_phone_number_required"] = "رقم التليفون مطلوب";
+$lang["common_please_visit_my"] = "برجاء زيارة";
+$lang["common_powered_by"] = "مدعوم بواسطة";
+$lang["common_price"] = "السعر";
+$lang["common_print"] = "طباعة";
+$lang["common_remove"] = "إزالة";
+$lang["common_required"] = "مطلوب";
+$lang["common_restore"] = "الإستعادة";
+$lang["common_return_policy"] = "سياسة الاسترجاع";
+$lang["common_search"] = "بحث";
+$lang["common_search_options"] = "خيارات البحث";
+$lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
+$lang["common_state"] = "المحافظة";
+$lang["common_submit"] = "حفظ";
+$lang["common_total_spent"] = "مجموع الصرف";
+$lang["common_unknown"] = "غير معروف";
+$lang["common_view_recent_sales"] = "عرض أحدث المبيعات";
+$lang["common_website"] = "الموقع الإلكترونى";
+$lang["common_welcome"] = "مرحباً";
+$lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء.";
+$lang["common_yes"] = "";
+$lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale";
+$lang["common_zip"] = "الرقم البريدى";

application/language/ar-LB/config_lang.php

@@ -0,0 +1,304 @@
+<?php 
+
+$lang["config_address"] = "عنوان الشركة";
+$lang["config_address_required"] = "عنوان الشركة مطلوب.";
+$lang["config_all_set"] = "All file permissions are set correctly!";
+$lang["config_allow_duplicate_barcodes"] = "السماح بتشابة الباركود";
+$lang["config_apostrophe"] = "الفاصلة";
+$lang["config_backup_button"] = "نسخ إحتياطى";
+$lang["config_backup_database"] = "نسخ إحتياطى لقاعدة البيانات";
+$lang["config_barcode"] = "باركود";
+$lang["config_barcode_company"] = "اسم الشركة";
+$lang["config_barcode_configuration"] = "اعدادات الباركود";
+$lang["config_barcode_content"] = "محتويات الباركود";
+$lang["config_barcode_first_row"] = "الصف 1";
+$lang["config_barcode_font"] = "الخط";
+$lang["config_barcode_formats"] = "اشكال الادخال";
+$lang["config_barcode_generate_if_empty"] = "توليد اذا كان الباركود فارغ.";
+$lang["config_barcode_height"] = "الارتفاع (px)";
+$lang["config_barcode_id"] = "كود/اسم الصنف";
+$lang["config_barcode_info"] = "معلومات اعدادات الباركود";
+$lang["config_barcode_layout"] = "تخطيط الباركود";
+$lang["config_barcode_name"] = "الاسم";
+$lang["config_barcode_number"] = "الباركود UPC/EAN/ISBN";
+$lang["config_barcode_number_in_row"] = "الرقم فى الصف";
+$lang["config_barcode_page_cellspacing"] = "المسافة بين الخلايا فى صفحة العرض.";
+$lang["config_barcode_page_width"] = "عرض الصفحة";
+$lang["config_barcode_price"] = "السعر";
+$lang["config_barcode_second_row"] = "الصف 2";
+$lang["config_barcode_third_row"] = "الصف 3";
+$lang["config_barcode_tooltip"] = "تحذير: قد تؤدي هذه الميزة إلى استيراد اصناف مكررة أو إنشاؤها. لا تستخدمها إذا كنت لا تريد الباركود مكررة.";
+$lang["config_barcode_type"] = "نوعية الباركود";
+$lang["config_barcode_width"] = "العرض (px)";
+$lang["config_bottom"] = "الأسفل";
+$lang["config_cash_decimals"] = "فواصل النقدية";
+$lang["config_cash_decimals_tooltip"] = "إذا كانت الكسور العشرية النقدية وعشرية العملات هي نفسها ثم لن يتم تقريب النقدية.";
+$lang["config_cash_rounding"] = "التقريب النقدي";
+$lang["config_category_dropdown"] = "";
+$lang["config_center"] = "الوسط";
+$lang["config_comma"] = "فاصلة";
+$lang["config_company"] = "اسم الشركة";
+$lang["config_company_change_image"] = "تغيير الصورة";
+$lang["config_company_logo"] = "شعار الشركة";
+$lang["config_company_remove_image"] = "إزالة الصورة";
+$lang["config_company_required"] = "اسم الشركة مطلوب";
+$lang["config_company_select_image"] = "اختار صورة";
+$lang["config_company_website_url"] = "الموقع الإلكترونى للشركة غير صحيح.";
+$lang["config_country_codes"] = "أكواد الدولة";
+$lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة لاسماء الدول للبحث.";
+$lang["config_currency_code"] = "رمز العملة";
+$lang["config_currency_decimals"] = "العلامة العشرية للعملة";
+$lang["config_currency_symbol"] = "رمز العملة";
+$lang["config_customer_reward"] = "المكافآت";
+$lang["config_customer_reward_duplicate"] = "المكافئة يجب ان تكون فريدة.";
+$lang["config_customer_reward_enable"] = "تمكين مكافآت العميل";
+$lang["config_customer_reward_invalid_chars"] = "لا يمكن أن تحتوي المكافأة على '_'";
+$lang["config_customer_reward_required"] = "المكافأة هي حقل مطلوب";
+$lang["config_customer_sales_tax_support"] = "دعم الضرائب المبيعات العملاء";
+$lang["config_date_or_time_format"] = "تصفية التاريخ والوقت";
+$lang["config_datetimeformat"] = "شكل الوقت و التاريخ";
+$lang["config_decimal_point"] = "العلامة العشرية";
+$lang["config_default_barcode_font_size_number"] = "الحجم الافتراضي لخط الباركود لابد أن يكون رقم.";
+$lang["config_default_barcode_font_size_required"] = "الحجم الافتراضي لخط الباركود مطلوب.";
+$lang["config_default_barcode_height_number"] = "الارتفاع الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_height_required"] = "الارتفاع الافتراضي للباركود مطلوب.";
+$lang["config_default_barcode_num_in_row_number"] = "رقم الباركود فى اى سطر لابد ان يكون رقم.";
+$lang["config_default_barcode_num_in_row_required"] = "رقم الباركود فى اى سطر مطلوب.";
+$lang["config_default_barcode_page_cellspacing_number"] = "المسافة الافتراضية بين خلايا الباركود لابد أن تكون رقم.";
+$lang["config_default_barcode_page_cellspacing_required"] = "المسافة الافتراضية بين خلايا الباركود مطلوبة.";
+$lang["config_default_barcode_page_width_number"] = "عرض الصفحة الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_page_width_required"] = "عرض الصفحة الافتراضي للباركود مطلوب.";
+$lang["config_default_barcode_width_number"] = "العرض الافتراضي للباركود لابد ان يكون رقم.";
+$lang["config_default_barcode_width_required"] = "العرض الافتراضي للباركود مطلوب.";
+$lang["config_default_item_columns"] = "الخانات المراد إظهارها";
+$lang["config_default_origin_tax_code"] = "كود الضريبة الاساسي الافتراضي";
+$lang["config_default_receivings_discount"] = "خصم الإيصالات الافتراضي";
+$lang["config_default_receivings_discount_number"] = "خصم الإيصالات الافتراضي يجب ان يكون رقم.";
+$lang["config_default_receivings_discount_required"] = "خصم الإيصالات الافتراضي هي خانة اجبارية.";
+$lang["config_default_sales_discount"] = "نسبة الخصم الافتراضية";
+$lang["config_default_sales_discount_number"] = "نسبة الخصم الافتراضية لابد ان تكون رقم.";
+$lang["config_default_sales_discount_required"] = "نسبة الخصم الافتراضية مطلوبة.";
+$lang["config_default_tax_category"] = "فئة الضرائب الافتراضية";
+$lang["config_default_tax_code"] = "قانون الضرائب الافتراضي";
+$lang["config_default_tax_jurisdiction"] = "الاختصاص الضريبي الافتراضي";
+$lang["config_default_tax_name_number"] = "يجب أن يكون الاسم الافتراضي للضريبة سلسلة.";
+$lang["config_default_tax_name_required"] = "اسم الضريبة الافتراضية مطلوب.";
+$lang["config_default_tax_rate"] = "معدل الضريبة الافتراضي %";
+$lang["config_default_tax_rate_1"] = "معدل الضريبة 1";
+$lang["config_default_tax_rate_2"] = "معدل الضريبة 2";
+$lang["config_default_tax_rate_number"] = "معدل الضريبة الافتراضي يجب أن يكون رقم.";
+$lang["config_default_tax_rate_required"] = "معدل الضريبة الافتراضي مطلوب.";
+$lang["config_derive_sale_quantity"] = "السماح بأسعار البيع المشتقة";
+$lang["config_derive_sale_quantity_tooltip"] = "إذا تم تحديدها، فسيتم توفير نوع جديد من الاصناف للاصناف المطلوبة حسب المبلغ الموسع";
+$lang["config_dinner_table"] = "طاولة";
+$lang["config_dinner_table_duplicate"] = "الطاولة يجب ان تكون فريدة.";
+$lang["config_dinner_table_enable"] = "تمكين جداول الطاولات";
+$lang["config_dinner_table_invalid_chars"] = "لا يمكن أن يحتوي اسم الطاولة على '_'.";
+$lang["config_dinner_table_required"] = "الطاولة هو حقل مطلوب.";
+$lang["config_dot"] = "نقطة";
+$lang["config_email"] = "البريد الإلكتروني";
+$lang["config_email_configuration"] = "إعدادات البريد الإلكتروني";
+$lang["config_email_mailpath"] = "مسار ارسال البريد";
+$lang["config_email_protocol"] = "بروتوكول";
+$lang["config_email_receipt_check_behaviour"] = "ارسال رسائل الكترونية";
+$lang["config_email_receipt_check_behaviour_always"] = "مختار دائما";
+$lang["config_email_receipt_check_behaviour_last"] = "تذكر آخر إختيار";
+$lang["config_email_receipt_check_behaviour_never"] = "دائما غير مختار";
+$lang["config_email_smtp_crypto"] = "تشفير SMTP";
+$lang["config_email_smtp_host"] = "خادم SMTP";
+$lang["config_email_smtp_pass"] = "كلمة سر SMTP";
+$lang["config_email_smtp_port"] = "رقم منفذ SMTP";
+$lang["config_email_smtp_timeout"] = "وقت فشل المحاولة (ثوانى) لـ SMTP";
+$lang["config_email_smtp_user"] = "اسم مستخدم SMTP";
+$lang["config_enforce_privacy"] = "فرض نظام الخصوصية";
+$lang["config_enforce_privacy_tooltip"] = "حماية ملفات ومعلومات المستخدم عند الحذف";
+$lang["config_fax"] = "الفاكس";
+$lang["config_file_perm"] = "There are problems with file permissions please fix and reload this page.";
+$lang["config_financial_year"] = "بداية السنة المالية";
+$lang["config_financial_year_apr"] = "1 أبريل";
+$lang["config_financial_year_aug"] = "1 أغسطس";
+$lang["config_financial_year_dec"] = "1 ديسمبر";
+$lang["config_financial_year_feb"] = "1 فبراير";
+$lang["config_financial_year_jan"] = "1 يناير";
+$lang["config_financial_year_jul"] = "1 يوليو";
+$lang["config_financial_year_jun"] = "1 يونيو";
+$lang["config_financial_year_mar"] = "1 مارس";
+$lang["config_financial_year_may"] = "1 مايو";
+$lang["config_financial_year_nov"] = "1 نوفمبر";
+$lang["config_financial_year_oct"] = "1 أكتوبر";
+$lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
+$lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
+$lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
+$lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
+$lang["config_gcaptcha_site_key"] = "ريكابتشا مفتاح الموقع";
+$lang["config_gcaptcha_site_key_required"] = "ريكابتشا مفتاح الموقع هو حقل مطلوب";
+$lang["config_gcaptcha_tooltip"] = "احرص على حماية صفحة تسجيل الدخول باستخدام ريكابتشا من غوغل.";
+$lang["config_general"] = "عام";
+$lang["config_general_configuration"] = "إعدادات عامة";
+$lang["config_giftcard_number"] = "رقم كارت الهدية";
+$lang["config_giftcard_random"] = "توليد عشوائي";
+$lang["config_giftcard_series"] = "توليد في السلسلة";
+$lang["config_image_allowed_file_types"] = "";
+$lang["config_image_max_height_tooltip"] = "";
+$lang["config_image_max_size_tooltip"] = "";
+$lang["config_image_max_width_tooltip"] = "";
+$lang["config_image_restrictions"] = "";
+$lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
+$lang["config_info"] = "معلومات";
+$lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
+$lang["config_integrations"] = "التكامل";
+$lang["config_integrations_configuration"] = "تكامل";
+$lang["config_invoice"] = "الفاتورة";
+$lang["config_invoice_configuration"] = "إعدادات طباعة الفاتورة";
+$lang["config_invoice_default_comments"] = "التعليق الافتراضي على الفاتورة";
+$lang["config_invoice_email_message"] = "قالب البريد الإلكتروني للفاتورة";
+$lang["config_invoice_enable"] = "تفعيل الفوترة";
+$lang["config_invoice_printer"] = "طابعة الفواتير";
+$lang["config_invoice_type"] = "نوع الفاتورة";
+$lang["config_is_readable"] = "";
+$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_jsprintsetup_required"] = "تحذير! هذه الخاصية غير المفعلة سوف تعمل فقط مع وجود الاضافة jsPrintSetup على متصفح فايرفوكس. حفظ على أى حال؟";
+$lang["config_language"] = "اللغة";
+$lang["config_last_used_invoice_number"] = "اخر رقم مستخدم للفاتورة";
+$lang["config_last_used_quote_number"] = "اخر رقم مستخدم لعرض الاسعار";
+$lang["config_last_used_work_order_number"] = "آخر رقم مستخدم في طلبات العمل";
+$lang["config_left"] = "يسار";
+$lang["config_license"] = "الرخصة";
+$lang["config_license_configuration"] = "نص الرخصة";
+$lang["config_line_sequence"] = "تسلسل خطي";
+$lang["config_lines_per_page"] = "عدد السطور فى الصفحة";
+$lang["config_lines_per_page_number"] = "عدد السطور فى الصفحة يجب أن يكون رقم.";
+$lang["config_lines_per_page_required"] = "عدد السطور فى الصفحة مطلوب.";
+$lang["config_locale"] = "إقليمية";
+$lang["config_locale_configuration"] = "الإعدادات الإقليمية";
+$lang["config_locale_info"] = "معلومات التهيئة الإقليمية";
+$lang["config_location"] = "المخزون";
+$lang["config_location_configuration"] = "أماكن المخزون";
+$lang["config_location_info"] = "معلومات تهيئة الأماكن";
+$lang["config_login_form"] = "";
+$lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
+$lang["config_mailchimp"] = "mailchimp ميل تشامب";
+$lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
+$lang["config_mailchimp_configuration"] = "إعدادات mailchimp";
+$lang["config_mailchimp_key_successfully"] = "نجاح.";
+$lang["config_mailchimp_key_unsuccessfully"] = "فشل.";
+$lang["config_mailchimp_lists"] = "mailchimp قوائم";
+$lang["config_mailchimp_tooltip"] = "انقر على رمز مفتاح API.";
+$lang["config_message"] = "الرسائل";
+$lang["config_message_configuration"] = "إعدادات الرسائل";
+$lang["config_msg_msg"] = "الرسائل النصية المحفوظة";
+$lang["config_msg_msg_placeholder"] = "إذا أردت إستخدام قالب للرسائل القصيرة احفظه هنا. عدا ذلك أترك هذا الحقل فارغ.";
+$lang["config_msg_pwd"] = "SMS-API  كلمة السر لـ";
+$lang["config_msg_pwd_required"] = "مطلوب SMS-API كلمة السر لـ";
+$lang["config_msg_src"] = "SMS-API  كود المرسل لـ";
+$lang["config_msg_src_required"] = "مطلوب SMS-API كود المرسل لـ";
+$lang["config_msg_uid"] = "SMS-API اسم المستخدم لـ";
+$lang["config_msg_uid_required"] = "مطلوب SMS-API اسم المستخدم لـ";
+$lang["config_multi_pack_enabled"] = "رزم متعددة لكل صنف";
+$lang["config_no_risk"] = "No security/vulnerability risks.";
+$lang["config_none"] = "لايوجد";
+$lang["config_notify_alignment"] = "مكان عرض رسائل المعلومات";
+$lang["config_number_format"] = "شكل الرقم";
+$lang["config_number_locale"] = "التهيئة الاقليمية";
+$lang["config_number_locale_invalid"] = "التهيئة الإقليمية المختارة غير صحية، راجع الرابط الموجود فى الملاحظة لاختيار تهيئة مناسبة.";
+$lang["config_number_locale_required"] = "رقم التهيئة الإقليمية مطلوب.";
+$lang["config_number_locale_tooltip"] = "إيجاد تهيئة إقليمية مناسبة عبر الرابط.";
+$lang["config_os_timezone"] = "";
+$lang["config_ospos_info"] = "معلومات التثبيت OSPOS";
+$lang["config_payment_options_order"] = "ترتيب خيارات الدفع";
+$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
+$lang["config_phone"] = "هاتف الشركة";
+$lang["config_phone_required"] = "هاتف الشركة مطلوب.";
+$lang["config_print_bottom_margin"] = "الهامش السفلي";
+$lang["config_print_bottom_margin_number"] = "الهامش السفلي يجب أن يكون رقم.";
+$lang["config_print_bottom_margin_required"] = "الهامش السفلي مطلوب.";
+$lang["config_print_delay_autoreturn"] = "العودة الى عمليات البيع تلقائيا ( عدد الثواني )";
+$lang["config_print_delay_autoreturn_number"] = "الزمن المحدد للعودة الى عمليات البيع هو خانة اجبارية.";
+$lang["config_print_delay_autoreturn_required"] = "الزمن المحدد للعودة الى عمليات البيع يجب ان يكون رقم.";
+$lang["config_print_footer"] = "طباعة تذييل المتصفح";
+$lang["config_print_header"] = "طباعة ترويسة المتصفح";
+$lang["config_print_left_margin"] = "الهامش الأيسر";
+$lang["config_print_left_margin_number"] = "الهامش الأيسر يجب ان يكون رقم.";
+$lang["config_print_left_margin_required"] = "الهامش الأيسر مطلوب.";
+$lang["config_print_receipt_check_behaviour"] = "خانة طباعة الفواتير";
+$lang["config_print_receipt_check_behaviour_always"] = "دائما مختار";
+$lang["config_print_receipt_check_behaviour_last"] = "تذكر آخر اختيار";
+$lang["config_print_receipt_check_behaviour_never"] = "دائما ليس مختار";
+$lang["config_print_right_margin"] = "الهامش الأيمن";
+$lang["config_print_right_margin_number"] = "الهامش الأيمن يجب أن يكون رقم.";
+$lang["config_print_right_margin_required"] = "الهامش الأيمن مطلوب.";
+$lang["config_print_silently"] = "عرض صندوق حوار طباعة";
+$lang["config_print_top_margin"] = "الهامش العلوى";
+$lang["config_print_top_margin_number"] = "الهامش العلوى يجب أن يكون رقم.";
+$lang["config_print_top_margin_required"] = "الهامش العلوى مطلوب.";
+$lang["config_quantity_decimals"] = "العلامة العشرية للكمية";
+$lang["config_quote_default_comments"] = "ملاحظات طلبات العمل الثابتة";
+$lang["config_receipt"] = "الإيصال";
+$lang["config_receipt_configuration"] = "إعدادات طباعة الايصالات";
+$lang["config_receipt_default"] = "افتراضى";
+$lang["config_receipt_font_size"] = "الخط";
+$lang["config_receipt_font_size_number"] = "رقم الخط يجب ان يكون رقم.";
+$lang["config_receipt_font_size_required"] = "رقم الخط مطلوب.";
+$lang["config_receipt_info"] = "معلومات تهيئة الإيصالات";
+$lang["config_receipt_printer"] = "طابعة تذاكر";
+$lang["config_receipt_short"] = "مختصر";
+$lang["config_receipt_show_company_name"] = "عرض اسم الشركة";
+$lang["config_receipt_show_description"] = "عرض الوصف";
+$lang["config_receipt_show_serialnumber"] = "عرض الرقم المسلسل";
+$lang["config_receipt_show_tax_ind"] = "";
+$lang["config_receipt_show_taxes"] = "عرض الضرائب";
+$lang["config_receipt_show_total_discount"] = "عرض إجمالى الخصم";
+$lang["config_receipt_template"] = "قالب الايصال";
+$lang["config_receiving_calculate_average_price"] = "حساب متوسط سعر الأصناف المستلمة";
+$lang["config_recv_invoice_format"] = "شكل فاتورة الإستلام";
+$lang["config_register_mode_default"] = "نمط التسجيل الافتراضي";
+$lang["config_report_an_issue"] = "";
+$lang["config_return_policy_required"] = "سياسة الإسترجاع مطلوب.";
+$lang["config_reward"] = "المكافاة";
+$lang["config_reward_configuration"] = "اعدادات المكافاة";
+$lang["config_right"] = "يمين";
+$lang["config_sales_invoice_format"] = "شكل فاتورة البيع";
+$lang["config_sales_quote_format"] = "شكل فاتورة عرض الاسعار";
+$lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح.";
+$lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح.";
+$lang["config_security_issue"] = "Security Vulnerability Warning";
+$lang["config_server_notice"] = "يرجى استخدام المعلومات أدناه للإبلاغ عن المشكلة.";
+$lang["config_show_office_group"] = "اظهار ايكونة المكتب";
+$lang["config_statistics"] = "إرسال اﻹحصائيات";
+$lang["config_statistics_tooltip"] = "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين.";
+$lang["config_stock_location"] = "مكان المخزون";
+$lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر.";
+$lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'.";
+$lang["config_stock_location_required"] = "مكان المخزون مطلوب.";
+$lang["config_suggestions_first_column"] = "العامود 1";
+$lang["config_suggestions_layout"] = "تخطيط اقتراحات البحث";
+$lang["config_suggestions_second_column"] = "العامود 2";
+$lang["config_suggestions_third_column"] = "العامود 3";
+$lang["config_system_conf"] = "Setup & Conf";
+$lang["config_system_info"] = "System Info";
+$lang["config_table"] = "جدول";
+$lang["config_table_configuration"] = "اعدادات الجدول";
+$lang["config_takings_printer"] = "طابعة الإيراد";
+$lang["config_tax"] = "الضريبة";
+$lang["config_tax_category"] = "تصنيف الضريبة";
+$lang["config_tax_category_duplicate"] = "الفئة الضريبية اللتي تم ادخالها موجودة.";
+$lang["config_tax_category_invalid_chars"] = "الفئة الضريبية اللتي تم ادخالها غير صحيحة.";
+$lang["config_tax_category_required"] = "الفئة الضريبية مطلوبة.";
+$lang["config_tax_category_used"] = "الفئة الضريبية اللتي تم تحديدها لا يمكن حذفها لانها قيد الاستعمال.";
+$lang["config_tax_configuration"] = "إعدادات الضريبة";
+$lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
+$lang["config_tax_id"] = "الرقم الضريبي";
+$lang["config_tax_included"] = "شامل الضريبة";
+$lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
+$lang["config_thousands_separator"] = "فاصل الاف";
+$lang["config_timezone"] = "المنطقة الزمنية";
+$lang["config_timezone_error"] = "";
+$lang["config_top"] = "علوى";
+$lang["config_use_destination_based_tax"] = "استخدام الضريبة المستندة على الوجهة";
+$lang["config_user_timezone"] = "";
+$lang["config_website"] = "موقع الشركة";
+$lang["config_work_order_enable"] = "تفعيل طلبات العمل";
+$lang["config_work_order_format"] = "شكل طلبات العمل";

application/language/ar-LB/customers_lang.php

@@ -0,0 +1,54 @@
+<?php 
+
+$lang["customers_account_number"] = "رقم الحساب";
+$lang["customers_account_number_duplicate"] = "رقم الحساب هذا موجود فى قاعدة البيانات من قبل.";
+$lang["customers_available_points"] = "النقاط المتاحة";
+$lang["customers_average"] = "معدل الصرف";
+$lang["customers_avg_discount"] = "معدل الخصم";
+$lang["customers_basic_information"] = "معلومات الزبون";
+$lang["customers_cannot_be_deleted"] = "لايمكن حذف هؤلاء العملاء، أحدهم/كلهم مرتبط/مرتبطين بمبيعات.";
+$lang["customers_company_name"] = "اسم الشركة";
+$lang["customers_confirm_delete"] = "هل تريد حذف هؤلاء العملاء حقاً؟";
+$lang["customers_confirm_restore"] = "هل انت متأكد من إستعادة قاعدة بيانات الزبائن ؟";
+$lang["customers_consent"] = "موافقة التسجيل";
+$lang["customers_consent_required"] = "موافقة التسجيل هي خانة اجبارية.";
+$lang["customers_csv_import_failed"] = "فشل الإستيراد من اكسل";
+$lang["customers_csv_import_nodata_wrongformat"] = "الملف الذى رفعته إما فارغ أو أنه مختلف البنية.";
+$lang["customers_csv_import_partially_failed"] = "تم استيراد معظم العملاء. البعض لم يتم استيرادهم ، وهذه هى القائمة:";
+$lang["customers_csv_import_success"] = "تم استيراد العملاء بنجاح.";
+$lang["customers_customer"] = "العميل";
+$lang["customers_date"] = "التاريخ";
+$lang["customers_discount"] = "نسبة الخصم";
+$lang["customers_discount_fixed"] = "حسم ثابت";
+$lang["customers_discount_percent"] = "نسبة الحبم";
+$lang["customers_discount_type"] = "نوع الحسم";
+$lang["customers_email_duplicate"] = "البريد الالكتروني مكرر.";
+$lang["customers_employee"] = "الموظف";
+$lang["customers_error_adding_updating"] = "خطاء فى إضافة أو تحديث العميل.";
+$lang["customers_import_items_csv"] = "استيراد العملا ء من ورقة عمل اكسل";
+$lang["customers_mailchimp_activity_click"] = "النقر على البريد الإلكتروني";
+$lang["customers_mailchimp_activity_lastopen"] = "آخر رسالة إلكترونية مفتوحة";
+$lang["customers_mailchimp_activity_open"] = "رسالة إلكترونية مفتوحة";
+$lang["customers_mailchimp_activity_total"] = "تم ارسال الرسالة الإلكترونية بنجاح";
+$lang["customers_mailchimp_activity_unopen"] = "رسالة إلكترونية غير مفتوحة";
+$lang["customers_mailchimp_email_client"] = "بريد الكتروني";
+$lang["customers_mailchimp_info"] = "ميل تشيمب";
+$lang["customers_mailchimp_member_rating"] = "التقييم";
+$lang["customers_mailchimp_status"] = "الحالة";
+$lang["customers_mailchimp_vip"] = "مهم";
+$lang["customers_max"] = "الحد الأقصى";
+$lang["customers_min"] = "الحد الأدنى";
+$lang["customers_new"] = "عميل جديد";
+$lang["customers_none_selected"] = "لم تختار عملاء للحذف.";
+$lang["customers_one_or_multiple"] = "عميل/عملاء";
+$lang["customers_quantity"] = "العدد";
+$lang["customers_stats_info"] = "الحالة";
+$lang["customers_successful_adding"] = "لقد أضفت عميل بنجاح";
+$lang["customers_successful_deleted"] = "لقد قمت بالحذف بنجاح";
+$lang["customers_successful_updating"] = "لقد قمت بتحديث بيانات العميل بنجاح";
+$lang["customers_tax_code"] = "كود الضريبة";
+$lang["customers_tax_id"] = "الرقم الضريبي";
+$lang["customers_taxable"] = "خاضع للضريبة";
+$lang["customers_total"] = "المجموع";
+$lang["customers_update"] = "تحديث بيانات عميل";
+$lang["rewards_package"] = "فئة المكافئة";

application/language/ar-LB/datepicker_lang.php

@@ -0,0 +1,22 @@
+<?php 
+
+$lang["datepicker_all_time"] = "جميع الأوقات";
+$lang["datepicker_apply"] = "تطبيق";
+$lang["datepicker_cancel"] = "إلغاء";
+$lang["datepicker_custom"] = "مخصص";
+$lang["datepicker_from"] = "من";
+$lang["datepicker_last_30"] = "أخر 30 يوم";
+$lang["datepicker_last_7"] = "أخر سبعة أيام";
+$lang["datepicker_last_financial_year"] = "السنة المالية الماضية";
+$lang["datepicker_last_month"] = "أخر شهر";
+$lang["datepicker_last_year"] = "السنة الماضية";
+$lang["datepicker_same_month_last_year"] = "نفس الشهر من العام الماضي";
+$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
+$lang["datepicker_this_financial_year"] = "السنة المالية الحالية";
+$lang["datepicker_this_month"] = "هذا الشهر";
+$lang["datepicker_this_year"] = "السنة الحالية";
+$lang["datepicker_to"] = "إلى";
+$lang["datepicker_today"] = "اليوم";
+$lang["datepicker_today_last_year"] = "نفس اليوم من السنة الماضية";
+$lang["datepicker_weekstart"] = "0";
+$lang["datepicker_yesterday"] = "أمس";

application/language/ar-LB/employees_lang.php

@@ -0,0 +1,37 @@
+<?php 
+
+$lang["employees_basic_information"] = "المعلومات الأساسية للموظف";
+$lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :).";
+$lang["employees_change_password"] = "تغيير كلمة المرور";
+$lang["employees_confirm_delete"] = "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟";
+$lang["employees_confirm_restore"] = "هل انت متاكد من استعادة الموظفين المحددين؟";
+$lang["employees_current_password"] = "كلمة المرور الحالية";
+$lang["employees_current_password_invalid"] = "كلمة المرور الحالية غير صحيحة.";
+$lang["employees_employee"] = "موظف";
+$lang["employees_error_adding_updating"] = "خطاء فى إضافة/تعديل موظف.";
+$lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخدم admin الخاص بنسخة العرض.";
+$lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض.";
+$lang["employees_language"] = "اللغة";
+$lang["employees_login_info"] = "معلومات دخول الموظف";
+$lang["employees_new"] = "موظف جديد";
+$lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف.";
+$lang["employees_one_or_multiple"] = "موظف/موظفين";
+$lang["employees_password"] = "كلمة السر";
+$lang["employees_password_minlength"] = "كلمة السر يجب أن تكون 8 حروف على الأقل.";
+$lang["employees_password_must_match"] = "كلمتى السر لا تتطابقان.";
+$lang["employees_password_not_must_match"] = "كلمة المرور الحالية والجديدة يجب ان يكونو فريدين.";
+$lang["employees_password_required"] = "كلمة السر مطلوبة.";
+$lang["employees_permission_desc"] = "قم بإضافة الصلاحيات بلإختيار من الأسفل.";
+$lang["employees_permission_info"] = "اذونات المستخدمين";
+$lang["employees_repeat_password"] = "كلمة السر مرة اخرى";
+$lang["employees_subpermission_required"] = "يجب إختيار صلاحية واحدة على الأقل لكل قسم.";
+$lang["employees_successful_adding"] = "لقد تم إضافة الموظف بنجاح.";
+$lang["employees_successful_change_password"] = "تم تغيير كلمة المرور بنجاح.";
+$lang["employees_successful_deleted"] = "لقد تم حذف الموظف بنجاح";
+$lang["employees_successful_updating"] = "لقد تم تحديث بيانات الموظف بنجاح";
+$lang["employees_system_language"] = "لغة النظام";
+$lang["employees_unsuccessful_change_password"] = "فشل في تغيير كلمة المرور.";
+$lang["employees_update"] = "تحديث بيانات موظف";
+$lang["employees_username"] = "اسم المستخدم";
+$lang["employees_username_minlength"] = "اسم المستخدم يجب أن يكون 5 حروف على الأقل.";
+$lang["employees_username_required"] = "اسم المستخدم مطلوب.";

application/language/ar-LB/enum_lang.php

@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "تقريب نصفي";
+$lang["enum_half_even"] = "نصف مزدوج";
+$lang["enum_half_five"] = "نصف الخمس";
+$lang["enum_half_odd"] = "نصف فردي";
+$lang["enum_half_up"] = "تقريب نصفي";
+$lang["enum_round_down"] = "التقريب";
+$lang["enum_round_up"] = "التقريب";