Merge branch 'master' into pos_bool

.travis.yml

@@ -7,24 +7,25 @@ branches:
 services:
   - docker
 before_install:
-  - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname
-    -s`-`uname -m` > docker-compose
+  - 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
   - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6
     HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
 script:
-  - docker run --rm -v $(pwd):/app composer/composer install
-  - docker run --rm -v $(pwd):/app -w /app lucor/php7-cli php bin/install.php translations
-    develop
+  - 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 digitallyseamless/nodejs-bower-grunt
     sh -c "npm install && bower install && grunt package"
-  - /bin/bash docker/install-local.sh
+  - docker-compose build
+  - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
 env:
-  - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
-after_success: '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-  && docker tag "opensourcepos_ospos:latest" "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"'
+  global:
+    - DOCKER_COMPOSE_VERSION=1.21.1 
+    - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+after_success: 
+  - 'docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "opensourcepos_ospos:latest" "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"'
 deploy:
   file: deployment.json
   provider: bintray

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.3-apache AS ospos
 MAINTAINER jekkos
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -16,4 +16,26 @@ 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 /app/application
 
-RUN [ ! -f test/ospos.js ] || sed -i -e "s/\(localhost\)/web/g" test/ospos.js
+FROM ospos AS ospos_test
+ 
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+ 
+RUN apt-get install -y libzip-dev wget
+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=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
+    && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini
+

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']

Gruntfile.js

@@ -230,7 +230,25 @@ module.exports = function(grunt) {
 					archive: 'dist/opensourcepos.zip'
 				},
 				files: [
-					{src: ['public/**', 'vendor/**', 'application/**', '!/public/images/menubar/png/', '!/public/dist/bootswatch/', '/public/dist/bootswatch/*/*.css', 'database/**', '*.txt', '*.md', 'LICENSE', 'docker*', 'Dockerfile', '**/.htaccess', '*.csv']}
+					{
+						src: [
+							'public/**',
+							'vendor/**',
+							'application/**',
+							'!/application/tests',
+							'!/public/images/menubar/png/',
+							'!/public/dist/bootswatch/',
+							'/public/dist/bootswatch/*/*.css',
+							'database/**',
+							'*.txt',
+							'*.md',
+							'LICENSE',
+							'docker*',
+							'Dockerfile',
+							'**/.htaccess',
+							'*.csv'
+						]
+					}
 				]
 			}
 		}

INSTALL.md

@@ -98,7 +98,7 @@ Cloud install
 -------------
 
 If you choose *DigitalOcean*:
-[Through this link](https://m.do.co/c/ac38c262507b), you will get a *$50 credit* for a first month. [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/DOCS-USERS-Getting-Started-installations#cloud-deploy-installation) for further instructions on how to install the necessary components.
+[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.
 
 
 cPanel & SSH Install

application/config/config.php

@@ -66,7 +66,7 @@ $config['db_log_enabled'] = FALSE;
 |
 */
 $config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true')) ? 'https' : 'http';
-$config['base_url'] .= '://' . $_SERVER['HTTP_HOST'];
+$config['base_url'] .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') ;
 $config['base_url'] .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 
 /*

application/config/hooks.php

@@ -27,7 +27,7 @@ $hook['post_controller'] = array(
                                 );
 
 $hook['pre_system'] = function() {
-    $config_path = APPPATH . 'config/';
+    $config_path = APPPATH . (ENVIRONMENT == 'testing') ? 'tests/' : 'config/';
 	try {
 		$dotenv = new Dotenv\Dotenv($config_path);
 		$dotenv->overload();

application/controllers/Employees.php

@@ -37,7 +37,7 @@ class Employees extends Persons
 	*/
 	public function suggest()
 	{
-		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->post('term'), TRUE));
+		$suggestions = $this->xss_clean($this->Employee->get_search_suggestions($this->input->get('term'), TRUE));
 
 		echo json_encode($suggestions);
 	}

application/controllers/Sales.php

@@ -423,7 +423,6 @@ class Sales extends Secure_Controller
 				$discount_type = $item_kit_info->kit_discount_type;
 			}
 
-			$price = NULL;
 			$print_option = PRINT_ALL; // Always include in list of items on invoice
 
 			if(!empty($kit_item_id))

application/controllers/Taxes.php

@@ -443,6 +443,8 @@ class Taxes extends Secure_Controller
 
 		$array_save = array();
 
+		$unique_tax_groups = [];
+
 		foreach($jurisdiction_id as $key => $val)
 		{
 			$array_save[] = array(
@@ -453,6 +455,19 @@ class Taxes extends Secure_Controller
 				'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);

application/helpers/locale_helper.php

@@ -66,7 +66,6 @@ function get_languages()
 		'es:spanish' => 'Spanish',
 		'es-MX:spanish' => 'Spanish (Mexico)',
 		'fr:french' => 'French',
-		'he:hebrew' => 'Hebrew',
 		'hr-HR:croatian' => 'Croatian (Croatia)',
 		'hu-HU:hungarian' => 'Hungarian (Hungary)',
 		'id:indonesian' => 'Indonesian',

application/helpers/tabular_helper.php

@@ -354,7 +354,7 @@ function get_items_manage_table_headers()
 
 	foreach($definition_names as $definition_id => $definition_name)
 	{
-		$headers[] = array($definition_id => $definition_name);
+		$headers[] = array($definition_id => $definition_name, 'sortable' => FALSE);
 	}
 
 	$headers[] = array('inventory' => '');

application/language/da/attributes_lang.php

@@ -0,0 +1,30 @@
+<?php
+$lang["attributes_attribute_value_invalid_chars"] = "Egenskabens værdi kan ikke indeholde ':' or '|'";
+$lang["attributes_confirm_delete"] = "Er du sikker på, at du vil slette de valgte egenskaber?";
+$lang["attributes_confirm_restore"] = "Er du sikker på, at du vil gendanne de valgte egenskaber?";
+$lang["attributes_definition_cannot_be_deleted"] = "De valgte egenskaber kunne ikke slettes";
+$lang["attributes_definition_error_adding_updating"] = "Egenskab %1 Kunne ikke tilføjes eller opdateres. Tjek venligst fejlprotokollen.";
+$lang["attributes_definition_flags"] = "Egenskabens Synlighed";
+$lang["attributes_definition_group"] = "Gruppe";
+$lang["attributes_definition_id"] = "Id";
+$lang["attributes_definition_name"] = "Tilføj egenskab";
+$lang["attributes_definition_name_required"] = "Egenskabens navn er et obligatorisk felt";
+$lang["attributes_definition_one_or_multiple"] = "Egenskab(er)";
+$lang["attributes_definition_successful_adding"] = "Du har tilføjet en genstand";
+$lang["attributes_definition_successful_deleted"] = "Du har slettet en genstand";
+$lang["attributes_definition_successful_updating"] = "Du har opdateret en egenskab";
+$lang["attributes_definition_type"] = "Egenskabs-type";
+$lang["attributes_definition_type_required"] = "Egenskabs-type er et obligatorisk felt";
+$lang["attributes_definition_unit"] = "Måleenhed";
+$lang["attributes_definition_values"] = "Egenskabens værdier";
+$lang["attributes_new"] = "Ny egenskab";
+$lang["attributes_no_attributes_to_display"] = "Ingen genstande at vise";
+$lang["attributes_receipt_visibility"] = "Kvittering";
+$lang["attributes_show_in_items"] = "Vis i genstande";
+$lang["attributes_show_in_items_visibility"] = "Genstande";
+$lang["attributes_show_in_receipt"] = "Vis i kvittering";
+$lang["attributes_show_in_receivings"] = "Vis i modtagelser";
+$lang["attributes_show_in_receivings_visibility"] = "Modtagelser";
+$lang["attributes_show_in_sales"] = "Vis i salg";
+$lang["attributes_show_in_sales_visibility"] = "Salg";
+$lang["attributes_update"] = "Opdater egenskab";

application/language/da/bootstrap_tables_lang.php

@@ -0,0 +1,9 @@
+<?php
+$lang["tables_all"] = "Alle";
+$lang["tables_columns"] = "Kolonner";
+$lang["tables_hide_show_pagination"] = "Gem/Vis sideinddeling";
+$lang["tables_loading"] = "Indlæser, vent venligst...";
+$lang["tables_page_from_to"] = "Viser {0} to {1} af {2} rækker";
+$lang["tables_refresh"] = "Opdater";
+$lang["tables_rows_per_page"] = "{0} rækker per side";
+$lang["tables_toggle"] = "Skift";

application/language/da/cashups_lang.php

@@ -0,0 +1,37 @@
+<?php
+$lang["cashups_amount"] = "Beløb/mængde?";
+$lang["cashups_amount_number"] = "Beløb/mængde skal være et tal";
+$lang["cashups_amount_required"] = "Beløb/mængde er et obligatorisk felt";
+$lang["cashups_cannot_be_deleted"] = "Cashup cannot be deleted";
+$lang["cashups_close_date"] = "Luk dato";
+$lang["cashups_close_employee"] = "Lukket af";
+$lang["cashups_closed_amount_card"] = "Kort";
+$lang["cashups_closed_amount_cash"] = "Lukkede kontanter";
+$lang["cashups_closed_amount_check"] = "Regninger";
+$lang["cashups_closed_amount_due"] = "Dues";
+$lang["cashups_closed_amount_total"] = "Total";
+$lang["cashups_closed_date"] = "Lukket dato";
+$lang["cashups_confirm_delete"] = "Er du sikker på, at du vil slette den valgte (Cashup)?";
+$lang["cashups_confirm_restore"] = "Er du sikker på, at du vil gendanne de valgte (Cashups)?";
+$lang["cashups_date_number"] = "Datoen skal være et tal";
+$lang["cashups_date_required"] = "Dato er et obligatorisk felt";
+$lang["cashups_description"] = "Beskrivelse";
+$lang["cashups_error_adding_updating"] = "Fejl ved at tilføje/opdatere (cashup)";
+$lang["cashups_id"] = "Id";
+$lang["cashups_info"] = "Cashups Info";
+$lang["cashups_is_deleted"] = "Slettet";
+$lang["cashups_new"] = "Ny (cashup)";
+$lang["cashups_no_cashups_to_display"] = "Der er ingen (cashups) at vise";
+$lang["cashups_none_selected"] = "Du har ikke valgt nogle (cashups)";
+$lang["cashups_note"] = "Noter";
+$lang["cashups_one_or_multiple"] = "Cashups(s)";
+$lang["cashups_open_amount_cash"] = "Åben kontanter";
+$lang["cashups_open_date"] = "Åben dato";
+$lang["cashups_open_employee"] = "Åbnet af";
+$lang["cashups_opened_date"] = "Åbnet dato";
+$lang["cashups_successful_adding"] = "Cashup tilføjet";
+$lang["cashups_successful_deleted"] = "Cashup er slettet";
+$lang["cashups_successful_updating"] = "Cashup er opdateret";
+$lang["cashups_total"] = "Total";
+$lang["cashups_transfer_amount_cash"] = "";
+$lang["cashups_update"] = "Opdater Cashup";

application/language/da/common_lang.php

@@ -0,0 +1,69 @@
+<?php
+$lang["common_address_1"] = "Address 1";
+$lang["common_address_2"] = "Address 2";
+$lang["common_city"] = "City";
+$lang["common_close"] = "Close";
+$lang["common_comments"] = "Comments";
+$lang["common_common"] = "common";
+$lang["common_confirm_search"] = "You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?";
+$lang["common_correct_errors"] = "Please correct identified errors before saving";
+$lang["common_country"] = "Country";
+$lang["common_date"] = "Date";
+$lang["common_delete"] = "Delete";
+$lang["common_det"] = "details";
+$lang["common_download_import_template"] = "Download Import CSV Template (CSV)";
+$lang["common_edit"] = "edit";
+$lang["common_email"] = "Email";
+$lang["common_email_invalid_format"] = "The email address is not in the correct format.";
+$lang["common_export_csv"] = "CSV Export";
+$lang["common_export_csv_no"] = "No";
+$lang["common_export_csv_yes"] = "Yes";
+$lang["common_fields_required_message"] = "Fields in red are required";
+$lang["common_first_name"] = "First Name";
+$lang["common_first_name_required"] = "First Name is a required field.";
+$lang["common_first_page"] = "First";
+$lang["common_gender"] = "Gender";
+$lang["common_gender_female"] = "F";
+$lang["common_gender_male"] = "M";
+$lang["common_id"] = "Id";
+$lang["common_import"] = "Import";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_csv"] = "CSV Import";
+$lang["common_import_full_path"] = "Full path to csv file required";
+$lang["common_import_remove_file"] = "Remove";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_inv"] = "inv";
+$lang["common_last_name"] = "Last Name";
+$lang["common_last_name_required"] = "Last Name is a required field.";
+$lang["common_last_page"] = "Last";
+$lang["common_learn_about_project"] = "to learn the latest information about the project.";
+$lang["common_list_of"] = "List of";
+$lang["common_logout"] = "Logout";
+$lang["common_migration_needed"] = "A database migration to %1 will start after login.";
+$lang["common_new"] = "New";
+$lang["common_no_persons_to_display"] = "There are no people to display.";
+$lang["common_none_selected_text"] = "[Select]";
+$lang["common_or"] = "OR";
+$lang["common_phone_number"] = "Phone Number";
+$lang["common_phone_number_required"] = "";
+$lang["common_please_visit_my"] = "Please visit the";
+$lang["common_powered_by"] = "Powered by";
+$lang["common_price"] = "Price";
+$lang["common_print"] = "Print";
+$lang["common_remove"] = "Remove";
+$lang["common_required"] = "Required";
+$lang["common_restore"] = "Restore";
+$lang["common_return_policy"] = "Return Policy";
+$lang["common_search"] = "Search";
+$lang["common_search_options"] = "Search options";
+$lang["common_searched_for"] = "Searched for";
+$lang["common_state"] = "State";
+$lang["common_submit"] = "Submit";
+$lang["common_total_spent"] = "Total Spent";
+$lang["common_unknown"] = "Unknown";
+$lang["common_view_recent_sales"] = "View Recent Sales";
+$lang["common_website"] = "website";
+$lang["common_welcome"] = "Welcome";
+$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started.";
+$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version";
+$lang["common_zip"] = "Postal Code";

application/language/da/config_lang.php

@@ -0,0 +1,281 @@
+<?php
+$lang["config_address"] = "Company Address";
+$lang["config_address_required"] = "Company address is a required field.";
+$lang["config_allow_duplicate_barcodes"] = "Allow Duplicate Barcodes";
+$lang["config_apostrophe"] = "apostrophe";
+$lang["config_backup_button"] = "Backup";
+$lang["config_backup_database"] = "Backup Database";
+$lang["config_barcode"] = "Barcode";
+$lang["config_barcode_company"] = "Company Name";
+$lang["config_barcode_configuration"] = "Barcode Configuration";
+$lang["config_barcode_content"] = "Barcode Content";
+$lang["config_barcode_first_row"] = "Row 1";
+$lang["config_barcode_font"] = "Font";
+$lang["config_barcode_formats"] = "Input Formats";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty.";
+$lang["config_barcode_height"] = "Height (px)";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_info"] = "Barcode Configuration Information";
+$lang["config_barcode_layout"] = "Barcode Layout";
+$lang["config_barcode_name"] = "Name";
+$lang["config_barcode_number"] = "Barcode";
+$lang["config_barcode_number_in_row"] = "Number in row";
+$lang["config_barcode_page_cellspacing"] = "Display page cellspacing.";
+$lang["config_barcode_page_width"] = "Display page width";
+$lang["config_barcode_price"] = "Price";
+$lang["config_barcode_second_row"] = "Row 2";
+$lang["config_barcode_third_row"] = "Row 3";
+$lang["config_barcode_tooltip"] = "Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.";
+$lang["config_barcode_type"] = "Barcode Type";
+$lang["config_barcode_width"] = "Width (px)";
+$lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "Cash Decimals";
+$lang["config_cash_decimals_tooltip"] = "If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.";
+$lang["config_cash_rounding"] = "Cash Rounding";
+$lang["config_center"] = "Center";
+$lang["config_comma"] = "comma";
+$lang["config_company"] = "Company Name";
+$lang["config_company_change_image"] = "Change Image";
+$lang["config_company_logo"] = "Company Logo";
+$lang["config_company_remove_image"] = "Remove Image";
+$lang["config_company_required"] = "Company name is a required field";
+$lang["config_company_select_image"] = "Select Image";
+$lang["config_company_website_url"] = "Company website is not a valid URL (http://...).";
+$lang["config_country_codes"] = "Country Codes";
+$lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
+$lang["config_currency_code"] = "Currency Code";
+$lang["config_currency_decimals"] = "Currency Decimals";
+$lang["config_currency_symbol"] = "Currency Symbol";
+$lang["config_customer_reward"] = "Reward";
+$lang["config_customer_reward_duplicate"] = "Reward must be unique.";
+$lang["config_customer_reward_enable"] = "Enable Customer Rewards";
+$lang["config_customer_reward_invalid_chars"] = "Reward can not contain '_'";
+$lang["config_customer_reward_required"] = "Reward is a required field";
+$lang["config_customer_sales_tax_support"] = "";
+$lang["config_date_or_time_format"] = "Date and Time Filter";
+$lang["config_datetimeformat"] = "Date and Time Format";
+$lang["config_decimal_point"] = "Decimal Point";
+$lang["config_default_barcode_font_size_number"] = "Default Barcode Font Size must be a number.";
+$lang["config_default_barcode_font_size_required"] = "Default Barcode Font Size is a required field.";
+$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number.";
+$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field.";
+$lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in Row must be a number.";
+$lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in Row is a required field.";
+$lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number.";
+$lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field.";
+$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number.";
+$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field.";
+$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number.";
+$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field.";
+$lang["config_default_item_columns"] = "Default Visible Item Columns";
+$lang["config_default_origin_tax_code"] = "Default Origin Tax Code";
+$lang["config_default_receivings_discount"] = "Default Receivings Discount";
+$lang["config_default_receivings_discount_number"] = "Default Receivings Discount must be a number.";
+$lang["config_default_receivings_discount_required"] = "Default Receivings Discount is a required field.";
+$lang["config_default_sales_discount"] = "Default Sales Discount";
+$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number.";
+$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field.";
+$lang["config_default_tax_category"] = "Default Tax Category";
+$lang["config_default_tax_code"] = "Default Tax Code";
+$lang["config_default_tax_jurisdiction"] = "Default Tax Jurisdiction";
+$lang["config_default_tax_name_number"] = "Default Tax Name must be a string.";
+$lang["config_default_tax_name_required"] = "Default Tax Name is a required field.";
+$lang["config_default_tax_rate"] = "Default Tax Rate %";
+$lang["config_default_tax_rate_1"] = "Tax 1 Rate";
+$lang["config_default_tax_rate_2"] = "Tax 2 Rate";
+$lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number.";
+$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field.";
+$lang["config_derive_sale_quantity"] = "Allow Derived Sale Quantity";
+$lang["config_derive_sale_quantity_tooltip"] = "If checked then a new item type will provided for items ordered by extended amount";
+$lang["config_dinner_table"] = "Table";
+$lang["config_dinner_table_duplicate"] = "Table must be unique.";
+$lang["config_dinner_table_enable"] = "Enable Dinner Tables";
+$lang["config_dinner_table_invalid_chars"] = "Table Name can not contain '_'.";
+$lang["config_dinner_table_required"] = "Table is a required field.";
+$lang["config_dot"] = "dot";
+$lang["config_email"] = "Email";
+$lang["config_email_configuration"] = "Email Configuration";
+$lang["config_email_mailpath"] = "Path to Sendmail";
+$lang["config_email_protocol"] = "Protocol";
+$lang["config_email_receipt_check_behaviour"] = "Email Receipt checkbox";
+$lang["config_email_receipt_check_behaviour_always"] = "Always checked";
+$lang["config_email_receipt_check_behaviour_last"] = "Remember last selection";
+$lang["config_email_receipt_check_behaviour_never"] = "Always unchecked";
+$lang["config_email_smtp_crypto"] = "SMTP Encryption";
+$lang["config_email_smtp_host"] = "SMTP Server";
+$lang["config_email_smtp_pass"] = "SMTP Password";
+$lang["config_email_smtp_port"] = "SMTP Port";
+$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
+$lang["config_email_smtp_user"] = "SMTP Username";
+$lang["config_enforce_privacy"] = "Enforce privacy";
+$lang["config_enforce_privacy_tooltip"] = "Protect Customers privacy enforcing data scrambling in case of their data being deleted";
+$lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "Fiscal Year Start";
+$lang["config_financial_year_apr"] = "1st of April";
+$lang["config_financial_year_aug"] = "1st of August";
+$lang["config_financial_year_dec"] = "1st of December";
+$lang["config_financial_year_feb"] = "1st of February";
+$lang["config_financial_year_jan"] = "1st of January";
+$lang["config_financial_year_jul"] = "1st of July";
+$lang["config_financial_year_jun"] = "1st of June";
+$lang["config_financial_year_mar"] = "1st of March";
+$lang["config_financial_year_may"] = "1st of May";
+$lang["config_financial_year_nov"] = "1st of November";
+$lang["config_financial_year_oct"] = "1st of October";
+$lang["config_financial_year_sep"] = "1st of September";
+$lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
+$lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
+$lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
+$lang["config_gcaptcha_site_key"] = "reCAPTCHA Site Key";
+$lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key is a required field";
+$lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.";
+$lang["config_general"] = "General";
+$lang["config_general_configuration"] = "General Configuration";
+$lang["config_giftcard_number"] = "Gift Card Number";
+$lang["config_giftcard_random"] = "Generate Random";
+$lang["config_giftcard_series"] = "Generate in Series";
+$lang["config_include_hsn"] = "Include Support for HSN Codes";
+$lang["config_info"] = "Information";
+$lang["config_info_configuration"] = "Store Information";
+$lang["config_integrations"] = "Integrations";
+$lang["config_integrations_configuration"] = "Third Party Integrations";
+$lang["config_invoice"] = "Invoice";
+$lang["config_invoice_configuration"] = "Invoice Print Settings";
+$lang["config_invoice_default_comments"] = "Default Invoice Comments";
+$lang["config_invoice_email_message"] = "Invoice Email Template";
+$lang["config_invoice_enable"] = "Enable Invoicing";
+$lang["config_invoice_printer"] = "Invoice Printer";
+$lang["config_invoice_type"] = "Invoice Type";
+$lang["config_jsprintsetup_required"] = "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
+$lang["config_language"] = "Language";
+$lang["config_last_used_invoice_number"] = "Last used Invoice Number";
+$lang["config_last_used_quote_number"] = "Last used Quote Number";
+$lang["config_last_used_work_order_number"] = "Last used W/O Number";
+$lang["config_left"] = "Left";
+$lang["config_license"] = "License";
+$lang["config_license_configuration"] = "License Statement";
+$lang["config_line_sequence"] = "Line Sequence";
+$lang["config_lines_per_page"] = "Lines per Page";
+$lang["config_lines_per_page_number"] = "Lines per Page must be a number.";
+$lang["config_lines_per_page_required"] = "Lines per Page is a required field.";
+$lang["config_locale"] = "Localization";
+$lang["config_locale_configuration"] = "Localization Configuration";
+$lang["config_locale_info"] = "Localization Configuration Information";
+$lang["config_location"] = "Stock";
+$lang["config_location_configuration"] = "Stock Locations";
+$lang["config_location_info"] = "Location Configuration Information";
+$lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
+$lang["config_mailchimp"] = "Mailchimp";
+$lang["config_mailchimp_api_key"] = "Mailchimp API Key";
+$lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
+$lang["config_mailchimp_key_successfully"] = "API Key is valid.";
+$lang["config_mailchimp_key_unsuccessfully"] = "API Key is invalid.";
+$lang["config_mailchimp_lists"] = "Mailchimp List(s)";
+$lang["config_mailchimp_tooltip"] = "Click the icon for an API Key.";
+$lang["config_message"] = "Message";
+$lang["config_message_configuration"] = "Message Configuration";
+$lang["config_msg_msg"] = "Saved Text Message";
+$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here, otherwise leave the box blank.";
+$lang["config_msg_pwd"] = "SMS-API Password";
+$lang["config_msg_pwd_required"] = "SMS-API Password is a required field";
+$lang["config_msg_src"] = "SMS-API Sender ID";
+$lang["config_msg_src_required"] = "SMS-API Sender ID is a required field";
+$lang["config_msg_uid"] = "SMS-API Username";
+$lang["config_msg_uid_required"] = "SMS-API Username is a required field";
+$lang["config_multi_pack_enabled"] = "Multiple Packages per Item";
+$lang["config_none"] = "none";
+$lang["config_notify_alignment"] = "Notification Popup Position";
+$lang["config_number_format"] = "Number Format";
+$lang["config_number_locale"] = "Localization";
+$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a valid locale.";
+$lang["config_number_locale_required"] = "Number Locale is a required field.";
+$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link.";
+$lang["config_ospos_info"] = "OSPOS Installation Info";
+$lang["config_payment_options_order"] = "Payment Options Order";
+$lang["config_phone"] = "Company Phone";
+$lang["config_phone_required"] = "Company Phone is a required field.";
+$lang["config_print_bottom_margin"] = "Margin Bottom";
+$lang["config_print_bottom_margin_number"] = "Margin Bottom must be a number.";
+$lang["config_print_bottom_margin_required"] = "Margin Bottom is a required field.";
+$lang["config_print_delay_autoreturn"] = "Autoreturn to Sale delay";
+$lang["config_print_delay_autoreturn_number"] = "Autoreturn to Sale delay is a required field.";
+$lang["config_print_delay_autoreturn_required"] = "Autoreturn to Sale delay must be a number.";
+$lang["config_print_footer"] = "Print Browser Footer";
+$lang["config_print_header"] = "Print Browser Header";
+$lang["config_print_left_margin"] = "Margin Left";
+$lang["config_print_left_margin_number"] = "Margin Left must be a number.";
+$lang["config_print_left_margin_required"] = "Margin Left is a required field.";
+$lang["config_print_receipt_check_behaviour"] = "Print Receipt checkbox";
+$lang["config_print_receipt_check_behaviour_always"] = "Always checked";
+$lang["config_print_receipt_check_behaviour_last"] = "Remember last selection";
+$lang["config_print_receipt_check_behaviour_never"] = "Always unchecked";
+$lang["config_print_right_margin"] = "Margin Right";
+$lang["config_print_right_margin_number"] = "Margin Right must be a number.";
+$lang["config_print_right_margin_required"] = "Margin Right is a required field.";
+$lang["config_print_silently"] = "Show Print Dialog";
+$lang["config_print_top_margin"] = "Margin Top";
+$lang["config_print_top_margin_number"] = "Margin Top must be a number.";
+$lang["config_print_top_margin_required"] = "Margin Top is a required field.";
+$lang["config_quantity_decimals"] = "Quantity Decimals";
+$lang["config_quote_default_comments"] = "Default Quote Comments";
+$lang["config_receipt"] = "Receipt";
+$lang["config_receipt_configuration"] = "Receipt Print Settings";
+$lang["config_receipt_default"] = "Default";
+$lang["config_receipt_font_size"] = "Font Size";
+$lang["config_receipt_font_size_number"] = "Font Size must be a number.";
+$lang["config_receipt_font_size_required"] = "Font Size is a required field.";
+$lang["config_receipt_info"] = "Receipt Configuration Information";
+$lang["config_receipt_printer"] = "Ticket Printer";
+$lang["config_receipt_short"] = "Short";
+$lang["config_receipt_show_company_name"] = "Show Company Name";
+$lang["config_receipt_show_description"] = "Show Description";
+$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
+$lang["config_receipt_show_tax_ind"] = "Show Tax Indicator";
+$lang["config_receipt_show_taxes"] = "Show Taxes";
+$lang["config_receipt_show_total_discount"] = "Show Total Discount";
+$lang["config_receipt_template"] = "Receipt Template";
+$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
+$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
+$lang["config_register_mode_default"] = "Default Register Mode";
+$lang["config_return_policy_required"] = "Return policy is a required field.";
+$lang["config_reward"] = "Reward";
+$lang["config_reward_configuration"] = "Reward Configuration";
+$lang["config_right"] = "Right";
+$lang["config_sales_invoice_format"] = "Sales Invoice Format";
+$lang["config_sales_quote_format"] = "Sales Quote Format";
+$lang["config_saved_successfully"] = "Configuration save successful.";
+$lang["config_saved_unsuccessfully"] = "Configuration save failed.";
+$lang["config_server_notice"] = "Please use the below info for issue reporting.";
+$lang["config_show_office_group"] = "Show office icon";
+$lang["config_statistics"] = "Send Statistics";
+$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes.";
+$lang["config_stock_location"] = "Stock location";
+$lang["config_stock_location_duplicate"] = "Stock Location must be unique.";
+$lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'.";
+$lang["config_stock_location_required"] = "Stock location is a required field.";
+$lang["config_suggestions_first_column"] = "Column 1";
+$lang["config_suggestions_layout"] = "Search Suggestions Layout";
+$lang["config_suggestions_second_column"] = "Column 2";
+$lang["config_suggestions_third_column"] = "Column 3";
+$lang["config_system_info"] = "System Info";
+$lang["config_table"] = "Table";
+$lang["config_table_configuration"] = "Table Configuration";
+$lang["config_takings_printer"] = "Receipt Printer";
+$lang["config_tax"] = "Tax";
+$lang["config_tax_category"] = "Tax Category";
+$lang["config_tax_category_duplicate"] = "The entered tax category already exists.";
+$lang["config_tax_category_invalid_chars"] = "The entered tax category is invalid.";
+$lang["config_tax_category_required"] = "The tax category is required.";
+$lang["config_tax_category_used"] = "Tax category cannot be deleted because it is being used.";
+$lang["config_tax_configuration"] = "Tax Configuration";
+$lang["config_tax_decimals"] = "Tax Decimals";
+$lang["config_tax_id"] = "Tax Id";
+$lang["config_tax_included"] = "Tax Included";
+$lang["config_theme"] = "Theme";
+$lang["config_thousands_separator"] = "Thousands Separator";
+$lang["config_timezone"] = "Timezone";
+$lang["config_top"] = "Top";
+$lang["config_use_destination_based_tax"] = "Use Destination Based Tax";
+$lang["config_website"] = "Website";
+$lang["config_work_order_enable"] = "Work Order Support";
+$lang["config_work_order_format"] = "Work Order Format";

application/language/en-GB/taxes_lang.php

@@ -54,6 +54,7 @@ $lang["taxes_tax_codes_saved_successfully"] = "Tax Code changes saved";
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "Tax Code changes not saved";
 $lang["taxes_tax_excluded"] = "Tax excluded";
 $lang["taxes_tax_group"] = "Tax Group";
+$lang["taxes_tax_group_not_unique"] = "Tax Group %1 is not unique";
 $lang["taxes_tax_group_sequence"] = "Tax Group Sequence";
 $lang["taxes_tax_included"] = "Tax included";
 $lang["taxes_tax_jurisdiction"] = "Tax Jurisdiction";

application/language/en-US/taxes_lang.php

@@ -54,6 +54,7 @@ $lang["taxes_tax_codes_saved_successfully"] = "Tax Code changes saved";
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "Tax Code changes not saved";
 $lang["taxes_tax_excluded"] = "Tax excluded";
 $lang["taxes_tax_group"] = "Tax Group";
+$lang["taxes_tax_group_not_unique"] = "Tax Group %1 is not unique";
 $lang["taxes_tax_group_sequence"] = "Tax Group Sequence";
 $lang["taxes_tax_included"] = "Tax included";
 $lang["taxes_tax_jurisdiction"] = "Tax Jurisdiction";

application/language/es/config_lang.php

@@ -47,7 +47,7 @@ $lang["config_currency_code"] = "Código de Moneda";
 $lang["config_currency_decimals"] = "Decimales de moneda";
 $lang["config_currency_symbol"] = "Símbolo de moneda";
 $lang["config_customer_reward"] = "Premio";
-$lang["config_customer_reward_duplicate"] = "Introduzca un nombre de premio único.";
+$lang["config_customer_reward_duplicate"] = "El nombre de premio debe ser único";
 $lang["config_customer_reward_enable"] = "Activar los premios para los consumidores";
 $lang["config_customer_reward_invalid_chars"] = "El nombre del premio no puede contener el carácter '_'";
 $lang["config_customer_reward_required"] = "El premio es un campo obligatorio";
@@ -58,9 +58,9 @@ $lang["config_decimal_point"] = "Punto Decimal";
 $lang["config_default_barcode_font_size_number"] = "Tamaño de fuente de código de barras debe ser número.";
 $lang["config_default_barcode_font_size_required"] = "Tamaño de fuente de código de barras es requerido.";
 $lang["config_default_barcode_height_number"] = "Alto del código de barras debe ser un número.";
-$lang["config_default_barcode_height_required"] = "Alto del código de barras es requerido.";
+$lang["config_default_barcode_height_required"] = "Altura del código de barras es requerido.";
 $lang["config_default_barcode_num_in_row_number"] = "Número por fila del código de barras debe ser un número.";
-$lang["config_default_barcode_num_in_row_required"] = "Número por fila del código de barras es requerido.";
+$lang["config_default_barcode_num_in_row_required"] = "El número de código de barras por defecto en la fila es un campo requerido";
 $lang["config_default_barcode_page_cellspacing_number"] = "Espacios de celdas por página del código de barras debe ser un número.";
 $lang["config_default_barcode_page_cellspacing_required"] = "Espacios de celdas por página del código de barras es requerido.";
 $lang["config_default_barcode_page_width_number"] = "Ancho de página del código de barras debe ser un número.";
@@ -128,7 +128,7 @@ $lang["config_gcaptcha_secret_key"] = "Llave secreta reCAPTCHA";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key es requerida si se usa";
 $lang["config_gcaptcha_site_key"] = "Llave del sitio reCAPTCHA";
 $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key es requerida si se usa";
-$lang["config_gcaptcha_tooltip"] = "Proteja la página de inicio de sesión con Google reCAPTCHA, haga clic en el icono de un par de claves API.";
+$lang["config_gcaptcha_tooltip"] = "Proteja la página de inicio de sesión con Google reCAPTCHA, haga clic en el icono y de un par de llaves de la API";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "Configuración General";
 $lang["config_giftcard_number"] = "Número de tarjeta de regalo";

application/language/es/sales_lang.php

@@ -12,7 +12,7 @@ $lang["sales_cash"] = "Efectivo";
 $lang["sales_cash_deposit"] = "Deposito Efectivo";
 $lang["sales_cash_filter"] = "Efectivo";
 $lang["sales_change_due"] = "Cambio";
-$lang["sales_check"] = "Cheque";
+$lang["sales_check"] = "Comprobación de ventas";
 $lang["sales_check_balance"] = "Balance de Cheque";
 $lang["sales_check_filter"] = "Comprobar";
 $lang["sales_comment"] = "Comentario";
@@ -173,3 +173,7 @@ $lang["sales_work_order_number"] = "Numero Orden Trabajo";
 $lang["sales_work_order_number_duplicate"] = "El numero de orden de trabajo debe ser unico.";
 $lang["sales_work_order_sent"] = "Orden de trabajo enviada a";
 $lang["sales_work_order_unsent"] = "Orden de trabajo fallida al enviar a";
+$lang["sales_change_price"] = "Cambiar el precio de venta";
+$lang["sales_nontaxed_ind"] = " Ventas no gravadas ";
+$lang["sales_refund"] = "Tipo de reembolso";
+$lang["sales_taxed_ind"] = "Ventas gravadas";

application/language/es/taxes_lang.php

@@ -76,3 +76,4 @@ $lang["taxes_tax_rounding"] = "Redondeo de Impuestos";
 $lang["taxes_tax_type"] = "Tipo de Impuesto";
 $lang["taxes_update"] = "Actualizar Tasa de Impuesto";
 $lang["taxes_vat_tax"] = "IVA";
+$lang["taxes_tax_group_not_unique"] = "El grupo de impuestos %1 no es único";

application/language/nb_NO/attributes_lang.php

@@ -0,0 +1,30 @@
+<?php
+$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain ':' or '|'";
+$lang["attributes_confirm_delete"] = "Are you sure you want to delete the selected attribute(s)?";
+$lang["attributes_confirm_restore"] = "Are you sure you want to restore the selected attribute(s)?";
+$lang["attributes_definition_cannot_be_deleted"] = "Could not delete selected attribute(s)";
+$lang["attributes_definition_error_adding_updating"] = "Attribute %1 could not be added or updated. Please check the error log.";
+$lang["attributes_definition_flags"] = "Attribute Visibility";
+$lang["attributes_definition_group"] = "Group";
+$lang["attributes_definition_id"] = "Id";
+$lang["attributes_definition_name"] = "Add Attribute";
+$lang["attributes_definition_name_required"] = "Attribute name is a required field";
+$lang["attributes_definition_one_or_multiple"] = "attribute(s)";
+$lang["attributes_definition_successful_adding"] = "You have successfully added item";
+$lang["attributes_definition_successful_deleted"] = "You have successfully deleted";
+$lang["attributes_definition_successful_updating"] = "You have successfully updated attribute";
+$lang["attributes_definition_type"] = "Attribute Type";
+$lang["attributes_definition_type_required"] = "Attribute type is a required field";
+$lang["attributes_definition_unit"] = "Measurement Unit";
+$lang["attributes_definition_values"] = "Attribute Values";
+$lang["attributes_new"] = "New Attribute";
+$lang["attributes_no_attributes_to_display"] = "No Items to display";
+$lang["attributes_receipt_visibility"] = "Receipt";
+$lang["attributes_show_in_items"] = "Show in items";
+$lang["attributes_show_in_items_visibility"] = "Items";
+$lang["attributes_show_in_receipt"] = "Show in receipt";
+$lang["attributes_show_in_receivings"] = "Show in receivings";
+$lang["attributes_show_in_receivings_visibility"] = "Receivings";
+$lang["attributes_show_in_sales"] = "Show in sales";
+$lang["attributes_show_in_sales_visibility"] = "Sales";
+$lang["attributes_update"] = "Update Attribute";

application/language/th/common_lang.php

@@ -29,7 +29,7 @@ $lang["common_id"] = "Id";
 $lang["common_import"] = "นำเข้า";
 $lang["common_import_change_file"] = "เปลี่ยน";
 $lang["common_import_csv"] = "CSV Import";
-$lang["common_import_full_path"] = "ต้องระบุบที่อยู่ของไฟล์เอ็กซ์เซล";
+$lang["common_import_full_path"] = "ต้องระบุบที่อยู่ของไฟล์ซีเอสวี";
 $lang["common_import_remove_file"] = "นำออก";
 $lang["common_import_select_file"] = "เลือกไฟล์";
 $lang["common_inv"] = "ยอด";

application/language/th/config_lang.php

@@ -67,25 +67,25 @@ $lang["config_default_barcode_page_width_number"] = "The default barcode page wi
 $lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field";
 $lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
 $lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
-$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"] = "Default Sales Discount %";
+$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"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
-$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_category"] = "หมวดหมู่ภาษีที่เป็นค่าเริ่มต้น";
+$lang["config_default_tax_code"] = "รหัสภาษีที่เป็นค่าเริ่มต้น";
+$lang["config_default_tax_jurisdiction"] = "ภาษีตามกฏหมายที่เป็นค่าเริ่มต้น";
+$lang["config_default_tax_name_number"] = "ชื่อภาษีที่เป็นค่าเริ่มต้นจะต้องเป็นตัวอักษร";
 $lang["config_default_tax_name_required"] = "The default tax name is a required field";
 $lang["config_default_tax_rate"] = "อัตราภาษีเริ่มต้น %";
-$lang["config_default_tax_rate_1"] = "อัตราภาษี 1";
-$lang["config_default_tax_rate_2"] = "อัตราภาษี 2";
+$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"] = "จำนวนปริมาณการขายที่ได้รับ";
 $lang["config_derive_sale_quantity_tooltip"] = "";
 $lang["config_dinner_table"] = "";
 $lang["config_dinner_table_duplicate"] = "";

application/language/th/employees_lang.php

@@ -1,37 +1,36 @@
-<?php 
-
+<?php
 $lang["employees_basic_information"] = "ข้อมูลพื้นฐานของพนักงาน";
-$lang["employees_cannot_be_deleted"] = "ไม่สามารถลบข้อมูลพนักงานที่กำลังปฏิบัติงานอยู่ได้";
-$lang["employees_change_password"] = "";
+$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_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"] = "You can not delete the demo admin user";
-$lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
-$lang["employees_language"] = "";
-$lang["employees_login_info"] = "Login";
+$lang["employees_error_adding_updating"] = "การเพิ่มหรือปรับปรุงข้อมูลพนักงานผิดพลาด";
+$lang["employees_error_deleting_demo_admin"] = "คุณไม่สามารถลบผู้ใช้งานสำหรับการเดโม้ได้";
+$lang["employees_error_updating_demo_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"] = "Password";
-$lang["employees_password_minlength"] = "รหัสผ่านต้องยาวเกิน 8 อักษร";
+$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"] = "Check the boxes below to grant access to modules";
-$lang["employees_permission_info"] = "Permissions";
-$lang["employees_repeat_password"] = "Password Again";
-$lang["employees_subpermission_required"] = "Add at least one grant for each module";
+$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_change_password"] = "ทำการเปลี่ยนรหัสผ่านเรียบร้อยแล้ว";
 $lang["employees_successful_deleted"] = "ลบข้อมูลสำเร็จ";
 $lang["employees_successful_updating"] = "ปรับปรุงข้อมูลพนักงานเรียบร้อยแล้ว";
-$lang["employees_system_language"] = "";
-$lang["employees_unsuccessful_change_password"] = "";
+$lang["employees_system_language"] = "ภาษาของระบบ";
+$lang["employees_unsuccessful_change_password"] = "เปลี่ยนรหัสผ่านไม่สำเร็จ";
 $lang["employees_update"] = "แก้ไขข้อมูลพนักงาน";
-$lang["employees_username"] = "Username";
-$lang["employees_username_minlength"] = "ชื่อผู้ใช้งานต้องยาวเกิน 5 อักษร";
-$lang["employees_username_required"] = "จำเป็นต้องกรอกชื่อผู้ใช้งาน";
+$lang["employees_username"] = "ชื่อผู้ใช้งาน";
+$lang["employees_username_minlength"] = "ชื่อผู้ใช้งานต้องยาวอย่างน้อย 5 อักษร";
+$lang["employees_username_required"] = "จำเป็นต้องระบุชื่อผู้ใช้งาน";

application/language/th/sales_lang.php

@@ -1,55 +1,55 @@
 <?php
 $lang["customers_available_points"] = "คะแนนที่มี";
 $lang["rewards_package"] = "รีวอด";
-$lang["rewards_remaining_balance"] = "";
+$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_authorized_signature"] = "ลายเซ็นผู้มีอำนาจ";
 $lang["sales_cancel_sale"] = "ยกเลิกการขาย";
 $lang["sales_cash"] = "เงินสด";
-$lang["sales_cash_deposit"] = "";
+$lang["sales_cash_deposit"] = "ฝากเงินสด";
 $lang["sales_cash_filter"] = "เงินสด";
 $lang["sales_change_due"] = "เงินทอน";
 $lang["sales_check"] = "เช็ค";
 $lang["sales_check_balance"] = "เช็คยอดคงเหลือ";
-$lang["sales_check_filter"] = "";
+$lang["sales_check_filter"] = "ตรวจสอบ";
 $lang["sales_comment"] = "หมายเหตุ";
 $lang["sales_comments"] = "หมายเหตุ";
 $lang["sales_complete_sale"] = "จบการขาย";
 $lang["sales_confirm_cancel_sale"] = "แน่ใจหรือไม่ที่จะล้างรายการขาย? สินค้าทุกอย่างจะถูกลบจากบอร์ด.";
 $lang["sales_confirm_delete"] = "โปรดยืนยันการลบรายการขายที่เลือกไว้";
-$lang["sales_confirm_restore"] = "";
+$lang["sales_confirm_restore"] = "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการขายที่เลือกไว้?";
 $lang["sales_credit"] = "เครดิตการ์ด";
-$lang["sales_credit_deposit"] = "";
+$lang["sales_credit_deposit"] = "เงินฝากเครดิต";
 $lang["sales_customer"] = "ลูกค้า";
 $lang["sales_customer_address"] = "Customer Address";
 $lang["sales_customer_discount"] = "Discount";
 $lang["sales_customer_email"] = "Customer Email";
 $lang["sales_customer_location"] = "Customer Location";
-$lang["sales_customer_mailchimp_status"] = "";
-$lang["sales_customer_optional"] = "";
-$lang["sales_customer_required"] = "";
+$lang["sales_customer_mailchimp_status"] = "สถานะของโปรแกรมเมล์ชิม";
+$lang["sales_customer_optional"] = "(ต้องระบุวันที่ชำระเงิน)";
+$lang["sales_customer_required"] = "(ต้องระบุ)";
 $lang["sales_customer_total"] = "Total";
 $lang["sales_date"] = "วันที่ขาย";
 $lang["sales_date_range"] = "ระหว่างวันที่";
 $lang["sales_date_required"] = "กรุณากรอกวันที่ให้ถูกต้อง";
 $lang["sales_date_type"] = "กรุณากรอกข้อมูลในช่องวันที่";
 $lang["sales_debit"] = "เดบิตการ์ด";
-$lang["sales_delete"] = "";
+$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_discard"] = "";
+$lang["sales_discard"] = "ยกเลิก";
 $lang["sales_discard_quote"] = "";
 $lang["sales_discount"] = "ส่วนลด %";
 $lang["sales_discount_included"] = "% Discount";
-$lang["sales_discount_short"] = "";
-$lang["sales_due"] = "";
-$lang["sales_due_filter"] = "";
+$lang["sales_discount_short"] = "%";
+$lang["sales_due"] = "วันครบกำหนด";
+$lang["sales_due_filter"] = "วันที่ครบกำหนด";
 $lang["sales_edit"] = "แก้ไข";
 $lang["sales_edit_item"] = "แก้ไขสินค้า";
 $lang["sales_edit_sale"] = "แก้ไขการขาย";
@@ -59,28 +59,28 @@ $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"] = "Gift Card";
-$lang["sales_giftcard_balance"] = "Giftcard Balance";
-$lang["sales_giftcard_number"] = "เลขที่ Gift Card";
-$lang["sales_group_by_category"] = "";
-$lang["sales_group_by_type"] = "";
-$lang["sales_hsn"] = "";
+$lang["sales_giftcard"] = "บัตรของขวัญ";
+$lang["sales_giftcard_balance"] = "ยอดคงเหลือบัตรของขวัญ";
+$lang["sales_giftcard_number"] = "เลขที่บัตรของขวัญ";
+$lang["sales_group_by_category"] = "กลุ่มตามหมวดหมู่";
+$lang["sales_group_by_type"] = "กลุ่มตามประเภท";
+$lang["sales_hsn"] = "HSN";
 $lang["sales_id"] = "เลขที่ขาย";
-$lang["sales_include_prices"] = "";
+$lang["sales_include_prices"] = "รวมในราคา?";
 $lang["sales_invoice"] = "ใบแจ้งหนี้";
-$lang["sales_invoice_confirm"] = "This invoice will be sent to";
+$lang["sales_invoice_confirm"] = "ใบแจ้งหนี้นี้จะถูกส่งไปที่";
 $lang["sales_invoice_enable"] = "ออกใบแจ้งหนี้";
 $lang["sales_invoice_filter"] = "ใบแจ้งหนี้";
-$lang["sales_invoice_no_email"] = "This customer does not have a valid email address";
-$lang["sales_invoice_number"] = "เลขใบแจ้งหนี้";
-$lang["sales_invoice_number_duplicate"] = "Please enter an unique invoice number";
-$lang["sales_invoice_sent"] = "Invoice sent to";
-$lang["sales_invoice_total"] = "";
-$lang["sales_invoice_type_custom_invoice"] = "";
-$lang["sales_invoice_type_custom_tax_invoice"] = "";
-$lang["sales_invoice_type_invoice"] = "";
-$lang["sales_invoice_type_tax_invoice"] = "";
-$lang["sales_invoice_unsent"] = "Invoice failed to be sent to";
+$lang["sales_invoice_no_email"] = "ลูกค้ารายนี้ไม่มีที่อยู่อีเมล";
+$lang["sales_invoice_number"] = "เลขใบแจ้งหนี้ #";
+$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_name"] = "ชื่อสินค้า";
@@ -88,19 +88,19 @@ $lang["sales_item_number"] = "สินค้า #";
 $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_giftcard"] = "เลขที่บัตรของขวัญ ต้องใส่ตัวเลขเท่านั้น";
 $lang["sales_new_customer"] = "ลูกค้าใหม่";
 $lang["sales_new_item"] = "สินค้าใหม่";
-$lang["sales_no_description"] = "ไม่มี";
-$lang["sales_no_filter"] = "All";
+$lang["sales_no_description"] = "ไม่ระบุรายละเอียด";
+$lang["sales_no_filter"] = "ทั้งหมด";
 $lang["sales_no_items_in_cart"] = "ไม่พบสินค้าในตระกร้า";
-$lang["sales_no_sales_to_display"] = "No sales to display";
-$lang["sales_none_selected"] = "กรุณาเลือสินค้าที่ต้องการแก้ไข";
-$lang["sales_not_authorized"] = "";
-$lang["sales_one_or_multiple"] = "";
+$lang["sales_no_sales_to_display"] = "ไม่มีการขายที่จะแสดง";
+$lang["sales_none_selected"] = "คุณยังไม่ได้เลือกการขายที่จะลบ";
+$lang["sales_not_authorized"] = "การกระทำนี้ไม่ได้รับอนุญาต";
+$lang["sales_one_or_multiple"] = "การขาย";
 $lang["sales_payment"] = "รูปแบบชำระเงิน";
-$lang["sales_payment_amount"] = "";
-$lang["sales_payment_not_cover_total"] = " ปริมาณการจ่ายที่ไม่เพียงพอกะยอดรวม";
+$lang["sales_payment_amount"] = "จำนวน";
+$lang["sales_payment_not_cover_total"] = "จำนวนเงินที่ชำระต้องมากกว่าหรือเท่ากับยอดรวม";
 $lang["sales_payment_type"] = "ชำระโดย";
 $lang["sales_payments_total"] = "ยอดชำระแล้ว";
 $lang["sales_price"] = "ราคา";
@@ -108,10 +108,10 @@ $lang["sales_print_after_sale"] = "พิมพ์บิลหลังการ
 $lang["sales_quantity"] = "จำนวน";
 $lang["sales_quantity_less_than_reorder_level"] = "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง";
 $lang["sales_quantity_less_than_zero"] = "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง";
-$lang["sales_quantity_of_items"] = "";
-$lang["sales_quote"] = "";
-$lang["sales_quote_number"] = "";
-$lang["sales_quote_number_duplicate"] = "";
+$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"] = "บิลขาย";
@@ -173,3 +173,5 @@ $lang["sales_work_order_number"] = "";
 $lang["sales_work_order_number_duplicate"] = "";
 $lang["sales_work_order_sent"] = "";
 $lang["sales_work_order_unsent"] = "";
+$lang["sales_change_price"] = "เปลี่ยนราคาขาย";
+$lang["sales_nontaxed_ind"] = " . ";

application/language/tr/sales_lang.php

@@ -18,7 +18,7 @@ $lang["sales_check_filter"] = "Çek";
 $lang["sales_comment"] = "Yorum";
 $lang["sales_comments"] = "Yorumlar";
 $lang["sales_complete_sale"] = "Satışı Tamamla";
-$lang["sales_confirm_cancel_sale"] = "Bu satışı iptal etmek istiyor musunuz? Tüm ürünler çıkarılacak.";
+$lang["sales_confirm_cancel_sale"] = "Bu satışı temizlemek istiyor musunuz? Tüm ürünler temizlenecek.";
 $lang["sales_confirm_delete"] = "Seçilen satışları silmek istediğinize emin misiniz?";
 $lang["sales_confirm_restore"] = "Seçilen satışları kurtarmak istediğinize emin misiniz?";
 $lang["sales_credit"] = "Kredi Kartı";
@@ -176,3 +176,4 @@ $lang["sales_work_order_unsent"] = "İş Emri gönderilemedi:";
 $lang["sales_nontaxed_ind"] = " ";
 $lang["sales_taxed_ind"] = "T";
 $lang["sales_refund"] = "Geri Ödeme Türü";
+$lang["sales_change_price"] = "Satış Fiyatını Değiştir";

application/language/tr/taxes_lang.php

@@ -52,7 +52,7 @@ $lang["taxes_tax_codes_configuration"] = "Vergi Kodları Yapılandırması";
 $lang["taxes_tax_codes_saved_successfully"] = "Vergi Kodu değişiklikleri kaydedildi";
 $lang["taxes_tax_codes_saved_unsuccessfully"] = "Vergi Kodu değişiklikleri kaydedilmedi";
 $lang["taxes_tax_excluded"] = "Vergi hariç";
-$lang["taxes_tax_group"] = "Vergi Grubu";
+$lang["taxes_tax_group"] = "Vergi Kümesi";
 $lang["taxes_tax_group_sequence"] = "Vergi Kümesi Sırası";
 $lang["taxes_tax_included"] = "Vergi dahil";
 $lang["taxes_tax_jurisdiction"] = "Vergi Yargı Yetkisi";
@@ -76,3 +76,4 @@ $lang["taxes_tax_rounding"] = "Vergi Yuvarlama";
 $lang["taxes_tax_type"] = "Tür";
 $lang["taxes_update"] = "Vergi Oranını Güncelle";
 $lang["taxes_vat_tax"] = "KDV Vergisi";
+$lang["taxes_tax_group_not_unique"] = "%1 Vergi Kümesi eşsiz değil";

application/language/zh-Hans/attributes_lang.php

@@ -24,7 +24,7 @@ $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_receivings_visibility"] = "收据";
 $lang["attributes_show_in_sales"] = "在销售中显示";
 $lang["attributes_show_in_sales_visibility"] = "销售";
 $lang["attributes_update"] = "更新属性";

application/language/zh-Hans/common_lang.php

@@ -2,68 +2,68 @@
 $lang["common_address_1"] = "地址 1";
 $lang["common_address_2"] = "地址 2";
 $lang["common_city"] = "城市";
-$lang["common_close"] = "Close";
-$lang["common_comments"] = "評論";
+$lang["common_close"] = "关闭";
+$lang["common_comments"] = "备注";
 $lang["common_common"] = "一般";
-$lang["common_confirm_search"] = "您已經選擇一行或多行，在搜索後這些紀錄將不能再被選取。您確定要提交這個搜索？";
+$lang["common_confirm_search"] = "你已经选择了 一行或多行，之后的搜索结果不再被选取。你确定要提交本次搜索吗？";
 $lang["common_correct_errors"] = "信息有误，请修正后保存";
-$lang["common_country"] = "國家";
-$lang["common_date"] = "Date";
+$lang["common_country"] = "国家";
+$lang["common_date"] = "日期";
 $lang["common_delete"] = "刪除";
 $lang["common_det"] = "更多";
-$lang["common_download_import_template"] = "Download Import CSV Template (CSV)";
-$lang["common_edit"] = "編輯";
-$lang["common_email"] = "郵箱";
-$lang["common_email_invalid_format"] = "Email格式錯誤";
-$lang["common_export_csv"] = "CSV Export";
-$lang["common_export_csv_no"] = "No";
-$lang["common_export_csv_yes"] = "Yes";
-$lang["common_fields_required_message"] = "紅色欄位為必填";
+$lang["common_download_import_template"] = "下载CSV模板（CSV）";
+$lang["common_edit"] = "编辑";
+$lang["common_email"] = "邮箱";
+$lang["common_email_invalid_format"] = "Email格式错误。";
+$lang["common_export_csv"] = "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"] = "First";
-$lang["common_gender"] = "Gender";
-$lang["common_gender_female"] = "V";
-$lang["common_gender_male"] = "M";
+$lang["common_first_name_required"] = "名为必填项。";
+$lang["common_first_page"] = "首页";
+$lang["common_gender"] = "性别";
+$lang["common_gender_female"] = "女";
+$lang["common_gender_male"] = "男";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Import";
-$lang["common_import_change_file"] = "Change";
-$lang["common_import_csv"] = "CSV Import";
-$lang["common_import_full_path"] = "Full path to csv file required";
-$lang["common_import_remove_file"] = "Remove";
-$lang["common_import_select_file"] = "Select file";
-$lang["common_inv"] = "庫存";
+$lang["common_import_change_file"] = "更改";
+$lang["common_import_csv"] = "CSV 导入";
+$lang["common_import_full_path"] = "需要CSV文件的完整路径";
+$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"] = "Last";
-$lang["common_learn_about_project"] = "了解系統開展進度";
+$lang["common_last_name_required"] = "姓氏为必填项。";
+$lang["common_last_page"] = "尾页";
+$lang["common_learn_about_project"] = "了解项目最新进度。";
 $lang["common_list_of"] = "列表";
 $lang["common_logout"] = "登出";
 $lang["common_migration_needed"] = "登录后，数据库将会迁移到%1。";
-$lang["common_new"] = "New";
-$lang["common_no_persons_to_display"] = "沒有使用者資料可以顯示";
-$lang["common_none_selected_text"] = "请选择";
+$lang["common_new"] = "新建";
+$lang["common_no_persons_to_display"] = "沒有使用者资料可以展示。";
+$lang["common_none_selected_text"] = "【请选择】";
 $lang["common_or"] = "或";
-$lang["common_phone_number"] = "電話";
+$lang["common_phone_number"] = "电话号码";
 $lang["common_phone_number_required"] = "";
-$lang["common_please_visit_my"] = "請造訪";
-$lang["common_powered_by"] = "Powered by";
-$lang["common_price"] = "價值";
-$lang["common_print"] = "Print";
+$lang["common_please_visit_my"] = "请造访";
+$lang["common_powered_by"] = "供应";
+$lang["common_price"] = "价格";
+$lang["common_print"] = "打印";
 $lang["common_remove"] = "移除";
-$lang["common_required"] = "Required";
+$lang["common_required"] = "需要";
 $lang["common_restore"] = "恢复";
-$lang["common_return_policy"] = "退貨政策";
-$lang["common_search"] = "搜尋";
-$lang["common_search_options"] = "Search options";
+$lang["common_return_policy"] = "退货政策";
+$lang["common_search"] = "搜索";
+$lang["common_search_options"] = "搜索选项";
 $lang["common_searched_for"] = "查找";
-$lang["common_state"] = "州";
-$lang["common_submit"] = "送出";
+$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_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_zip"] = "郵遞區號";
+$lang["common_zip"] = "邮政编码";

application/language/zh-Hans/customers_lang.php

@@ -1,11 +1,10 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "帳號 #";
 $lang["customers_account_number_duplicate"] = "This account number is already present in the database";
-$lang["customers_available_points"] = "";
+$lang["customers_available_points"] = "可用积分";
 $lang["customers_average"] = "";
 $lang["customers_avg_discount"] = "";
-$lang["customers_basic_information"] = "";
+$lang["customers_basic_information"] = "个人信息";
 $lang["customers_cannot_be_deleted"] = "無法刪除選定的客戶，選定的客戶存有銷售紀錄。";
 $lang["customers_company_name"] = "Company";
 $lang["customers_confirm_delete"] = "你確定要刪除選定的客戶？";
@@ -13,13 +12,13 @@ $lang["customers_confirm_restore"] = "";
 $lang["customers_consent"] = "";
 $lang["customers_consent_required"] = "";
 $lang["customers_customer"] = "客戶";
-$lang["customers_date"] = "";
+$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_discount_percent"] = "折扣率";
+$lang["customers_discount_type"] = "优惠类型";
+$lang["customers_email_duplicate"] = "email地址已被使用";
+$lang["customers_employee"] = "员工";
 $lang["customers_error_adding_updating"] = "添加/更新客戶錯誤";
 $lang["customers_csv_import_failed"] = "CSV匯入失敗";
 $lang["customers_csv_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";

application/language/zh-Hans/login_lang.php

@@ -3,7 +3,7 @@ $lang["login_gcaptcha"] = "我不是机器人。";
 $lang["login_go"] = "登入";
 $lang["login_invalid_gcaptcha"] = "无效，我不是机器人。";
 $lang["login_invalid_installation"] = "安装不正确，请检查您的php.ini文件。";
-$lang["login_invalid_username_and_password"] = "錯誤的帳號或密碼";
+$lang["login_invalid_username_and_password"] = "无效的用户名或密码。";
 $lang["login_login"] = "登入";
-$lang["login_password"] = "密碼";
-$lang["login_username"] = "帳號";
+$lang["login_password"] = "密码";
+$lang["login_username"] = "用户名";

application/language/zh-Hans/receivings_lang.php

@@ -1,54 +1,53 @@
-<?php 
-
-$lang["receivings_cancel_receiving"] = "";
-$lang["receivings_cannot_be_deleted"] = "";
-$lang["receivings_comments"] = "";
+<?php
+$lang["receivings_cancel_receiving"] = "取消";
+$lang["receivings_cannot_be_deleted"] = "收获记录删除失败。";
+$lang["receivings_comments"] = "备注";
 $lang["receivings_complete_receiving"] = "完成";
 $lang["receivings_confirm_cancel_receiving"] = "您確定要刪除此進貨資料嗎？本資料中所有的產品資料也將會被清空。";
-$lang["receivings_confirm_delete"] = "";
+$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_delete_entire_sale"] = "Delete entire sale";
-$lang["receivings_discount"] = "折古 %";
-$lang["receivings_edit"] = "編輯";
-$lang["receivings_edit_sale"] = "Edit Receiving";
-$lang["receivings_employee"] = "Employee";
-$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_item_name"] = "產品名稱";
-$lang["receivings_mode"] = "進貨模式";
-$lang["receivings_new_supplier"] = "新供應商";
-$lang["receivings_one_or_multiple"] = "";
+$lang["receivings_date"] = "收货日期";
+$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_find_or_scan_item"] = "查找 / 扫面商品";
+$lang["receivings_find_or_scan_item_or_receipt"] = "查找 / 扫描商品或收据";
+$lang["receivings_id"] = "进货ID";
+$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_receipt"] = "收貨憑證";
-$lang["receivings_receipt_number"] = "";
+$lang["receivings_receipt"] = "收货凭证";
+$lang["receivings_receipt_number"] = "收据单号";
 $lang["receivings_receiving"] = "收貨";
-$lang["receivings_reference"] = "Reference";
-$lang["receivings_register"] = "產品進貨";
-$lang["receivings_requisition"] = "";
+$lang["receivings_reference"] = "进货参考";
+$lang["receivings_register"] = "进货";
+$lang["receivings_requisition"] = "收货单";
 $lang["receivings_return"] = "退貨";
 $lang["receivings_select_supplier"] = "選擇供應商 (Optional)";
 $lang["receivings_ship_pack"] = "";
 $lang["receivings_start_typing_supplier_name"] = "開始輸入供應商名稱...";
-$lang["receivings_stock"] = "";
+$lang["receivings_stock"] = "库存";
 $lang["receivings_stock_destination"] = "Stock destination";
 $lang["receivings_stock_locaiton"] = "倉庫地址";
 $lang["receivings_stock_source"] = "Stock source";
-$lang["receivings_successfully_deleted"] = "You have successfully deleted";
-$lang["receivings_successfully_updated"] = "Receiving successfully updated";
+$lang["receivings_successfully_deleted"] = "删除成功";
+$lang["receivings_successfully_updated"] = "进货记录更新成功";
 $lang["receivings_supplier"] = "供應商";
 $lang["receivings_supplier_address"] = "地址";
 $lang["receivings_supplier_email"] = "郵箱";
 $lang["receivings_supplier_location"] = "地方";
 $lang["receivings_total"] = "總數量";
-$lang["receivings_transaction_failed"] = "進貨交易失敗";
-$lang["receivings_unable_to_add_item"] = "無法新增進貨資料";
-$lang["receivings_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["receivings_transaction_failed"] = "进货交易失败。";
+$lang["receivings_unable_to_add_item"] = "无法新增进货商品。";
+$lang["receivings_unsuccessfully_updated"] = "进货记录更新失败。";
 $lang["receivings_update"] = "編輯";

application/language/zh-Hans/sales_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["customers_available_points"] = "";
+<?php
+$lang["customers_available_points"] = "可用积分";
 $lang["rewards_package"] = "";
 $lang["rewards_remaining_balance"] = "";
 $lang["sales_account_number"] = "";

application/language/zh-Hans/taxes_lang.php

@@ -1,21 +1,20 @@
-<?php 
-
+<?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_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_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"] = "";
@@ -25,29 +24,29 @@ $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_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"] = "";

application/libraries/Token_lib.php

@@ -78,12 +78,46 @@ class Token_lib
 		return $token_tree;
 	}
 
+	public function parse($string, $pattern, $tokens = array())
+	{
+		$token_tree = $this->scan($pattern);
+
+		$found_tokens = array();
+		foreach ($token_tree as $token_id => $token_length)
+		{
+			foreach ($tokens as $token)
+			{
+				if ($token->token_id() == $token_id)
+				{
+					$found_tokens[] = $token;
+					$keys = array_keys($token_length);
+					$length = array_shift($keys);
+					$pattern = str_replace(array_shift($token_length), "({$token->get_value()}{".$length."})", $pattern);
+				}
+			}
+		}
+
+		$results = array();
+
+		if (preg_match("/$pattern/", $string, $matches))
+		{
+			foreach($found_tokens as $token)
+			{
+				$index = array_search($token, $found_tokens);
+				$match = $matches[$index+1];
+				$results[$token->token_id()] = $match;
+			}
+		}
+
+		return $results;
+	}
+
 	public function generate($used_tokens, &$tokens_to_replace, &$token_values, $tokens)
 	{
 		foreach($used_tokens as $token_code => $token_info)
 		{
 			// Generate value here based on the key value
-			$token_value = $this->resolveToken($token_code);
+			$token_value = $this->resolve_token($token_code);
 
 			foreach($token_info as $length => $token_spec)
 			{
@@ -102,7 +136,7 @@ class Token_lib
 		return $token_values;
 	}
 
-	private function resolveToken($token_code, $tokens = array())
+	private function resolve_token($token_code, $tokens = array())
 	{
 		foreach(array_merge($tokens, Token::get_tokens()) as $token)
 		{

application/migrations/20200215100000_taxgroupconstraint.php

@@ -0,0 +1,20 @@
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Migration_taxgroupconstraint extends CI_Migration
+{
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function up()
+	{
+		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('tax_jurisdictions') . ' ADD CONSTRAINT tax_jurisdictions_uq1 UNIQUE (tax_group)');
+	}
+
+	public function down()
+	{
+		$this->db->query('ALTER TABLE ' . $this->db->dbprefix('tax_jurisdictions') . ' DROP INDEX tax_jurisdictions_uq1');
+	}
+}
+?>

application/models/Attribute.php

@@ -618,7 +618,19 @@ class Attribute extends CI_Model
 		else
 		{
 			$this->db->where('attribute_id', $attribute_id);
-			$this->db->update('attribute_values', array('attribute_value' => $attribute_value));
+
+			if(in_array($definition_type, [TEXT, DROPDOWN], TRUE))
+			{
+				$this->db->update('attribute_values', array('attribute_value' => $attribute_value));
+			}
+			else if($definition_type == DECIMAL)
+			{
+				$this->db->update('attribute_values', array('attribute_decimal' => $attribute_value));
+			}
+			else
+			{
+				$this->db->update('attribute_values', array('attribute_date' => date('Y-m-d', strtotime($attribute_value))));
+			}
 		}
 		
 		$this->db->trans_complete();

application/models/Item.php

@@ -177,19 +177,22 @@ class Item extends CI_Model
 
 		if(!empty($search))
 		{
-			$this->db->group_start();
-				$this->db->like('name', $search);
-				$this->db->or_like('item_number', $search);
-				$this->db->or_like('items.item_id', $search);
-				$this->db->or_like('company_name', $search);
-				$this->db->or_like('items.category', $search);
-				if ($filters['search_custom'] && $attributes_enabled)
-				{
-					$this->db->or_like('attribute_value', $search);
-					$this->db->or_like('attribute_date', $search);
-					$this->db->or_like('attribute_decimal', $search);
-				}
-			$this->db->group_end();
+			if ($attributes_enabled && $filters['search_custom'])
+			{
+				$this->db->having("attribute_values LIKE '%$search%'");
+				$this->db->or_having("attribute_dtvalues LIKE '%$search%'");
+				$this->db->or_having("attribute_dvalues LIKE '%$search%'");
+			}
+			else
+			{
+				$this->db->group_start();
+					$this->db->like('name', $search);
+					$this->db->or_like('item_number', $search);
+					$this->db->or_like('items.item_id', $search);
+					$this->db->or_like('company_name', $search);
+					$this->db->or_like('items.category', $search);
+				$this->db->group_end();
+			}
 		}
 
 		if($attributes_enabled)

application/models/reports/Detailed_sales.php

@@ -145,7 +145,7 @@ class Detailed_sales extends Report
 		foreach($data['summary'] as $key=>$value)
 		{
 			$this->db->select('
-				MAX(name) AS name, 
+				name, 
 				category, 
 				quantity_purchased, 
 				item_location, 

application/models/tokens/Token.php

@@ -25,6 +25,11 @@ abstract class Token
 		$this->value = $value;
 	}
 
+	static function get_barcode_tokens()
+	{
+		return array();
+	}
+
 	static function get_tokens()
 	{
 		return array(new Token_customer(), new Token_invoice_count(), new Token_invoice_sequence(),

application/models/tokens/Token_barcode_ean.php

@@ -0,0 +1,22 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Token_barcode_price class
+ */
+
+class Token_barcode_ean extends Token
+{
+
+    public function token_id()
+    {
+        return 'I';
+    }
+
+    public function get_value()
+    {
+        return '\w';
+    }
+
+}
+
+?>

application/models/tokens/Token_barcode_price.php

@@ -0,0 +1,22 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Token_barcode_price class
+ */
+
+class Token_barcode_price extends Token
+{
+
+    public function token_id()
+    {
+        return 'P';
+    }
+
+    public function get_value()
+    {
+        return '\d';
+    }
+
+}
+
+?>

application/models/tokens/Token_barcode_weight.php

@@ -0,0 +1,22 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Token_barcode_price class
+ */
+
+class Token_barcode_weight extends Token
+{
+
+    public function token_id()
+    {
+        return 'W';
+    }
+
+    public function get_value()
+    {
+        return '\d';
+    }
+
+}
+
+?>

application/tests/.gitignore

@@ -0,0 +1 @@
+_ci_phpunit_test/tmp/

application/tests/helpers/Locale_helper_test.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @backupGlobals disabled
+ */
+class Locale_helper_test extends UnitTestCase
+{
+    public function test_parse_decimals_precision()
+    {
+        $decimals = parse_decimals(2.22, 2);
+
+        $this->assertEquals(2.22, $decimals);
+    }
+
+    public function test_format_decimals()
+    {
+        $decimals = to_decimals(5, 2);
+
+        $this->assertEquals(5.00, $decimals);
+    }
+
+
+}

application/tests/libraries/Barcode_lib_test.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @backupGlobals disabled
+ */
+class Barcode_lib_test extends UnitTestCase
+{
+	public function setUp()
+	{
+		$this->resetInstance();
+
+		$this->obj = $this->newLibrary('Barcode_lib');
+	}
+
+	public function test_barcode_weight_first()
+	{
+        $this->CI->config->set_item('barcode_formats', json_encode(array("02(\d{5})(\w{6})")));
+
+		$item_number = "0250000123456";
+		$quantity = 0;
+		$this->obj->parse_barcode_fields($quantity, $item_number);
+
+		echo $quantity;
+		$this->assertEquals(123.456, $quantity);
+		$this->assertEquals("50000", $item_number);
+	}
+
+	public function test_barcode_weight_last()
+	{
+        $this->CI->config->set_item('barcode_formats', json_encode(array("02(\w{6})(\d{5})")));
+
+		$item_number = "0212345650001";
+		$quantity = 0;
+		$this->obj->parse_barcode_fields($quantity, $item_number);
+
+		$this->assertEquals(50.001, $quantity);
+		$this->assertEquals(123456, $item_number);
+	}
+}

application/views/attributes/form.php

@@ -128,7 +128,7 @@ $(document).ready(function()
 		}
 		else
 		{
-			$.post('<?php echo site_url($controller_name . "/delete_attribute_value/");?>' + value, {definition_id: definition_id});
+			$.post('<?php echo site_url($controller_name . "/delete_attribute_value/");?>' + escape(value), {definition_id: definition_id});
 		}
 		$(this).parents("li").remove();
 	};
@@ -137,7 +137,7 @@ $(document).ready(function()
 	{
 		var is_event = typeof(value) !== 'string';
 
-        if ($("#definition_value").val().match(/(\||:)/g) != null)
+        if ($("#definition_value").val().match(/(\||_)/g) != null)
         {
             return;
         }
@@ -157,7 +157,7 @@ $(document).ready(function()
 			}
 			else
 			{
-				$.post('<?php echo site_url("attributes/save_attribute_value/");?>' + value, {definition_id: definition_id});
+				$.post('<?php echo site_url("attributes/save_attribute_value/");?>' + escape(value), {definition_id: definition_id});
 			}
 		}
 

application/views/sales/form.php

@@ -160,14 +160,13 @@ $(document).ready(function()
 	
 	<?php $this->load->view('partial/datepicker_locale'); ?>
 
-	var fill_value_customer =  function(event, ui) {
+	var fill_value_customer = function(event, ui) {
 		event.preventDefault();
 		$("input[name='customer_id']").val(ui.item.value);
 		$("input[name='customer_name']").val(ui.item.label);
 	};
 
-	$('#customer_name').autocomplete(
-	{
+	$('#customer_name').autocomplete( {
 		source: "<?php echo site_url('customers/suggest'); ?>",
 		minChars: 0,
 		delay: 15, 
@@ -177,14 +176,13 @@ $(document).ready(function()
 		focus: fill_value_customer
 	});
 
-	var fill_value_employee =  function(event, ui) {
+	var fill_value_employee = function(event, ui) {
 		event.preventDefault();
 		$("input[name='employee_id']").val(ui.item.value);
 		$("input[name='employee_name']").val(ui.item.label);
 	};
 
-	$('#employee_name').autocomplete(
-	{
+	$('#employee_name').autocomplete( {
 		source: "<?php echo site_url('employees/suggest'); ?>",
 		minChars: 0,
 		delay: 15, 
@@ -204,8 +202,7 @@ $(document).ready(function()
 		table_support.do_restore("<?php echo site_url($controller_name); ?>", <?php echo $sale_info['sale_id']; ?>);
 	});
 
-	$('#sales_edit_form').validate($.extend(
-	{
+	$('#sales_edit_form').validate($.extend( {
 		submitHandler: function(form) {
 			$(form).ajaxSubmit({
 				success: function(response)

bin/install.php

@@ -253,7 +253,7 @@ class Installer
         
         foreach ($iterator as $file) {
             if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName(), 0777, TRUE);
+                @mkdir($dst . '/' . $iterator->getSubPathName(), 0775, TRUE);
             } else {
 
                 $success = copy($file, $dst . '/' . $iterator->getSubPathName());

composer.json

@@ -16,15 +16,23 @@
 		"POS"
 	],
 	"homepage": "https://github.com/opensourcepos/opensourcepos",
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/kenjis/ci-phpunit-test"
+		}
+	],
 	"require": {
 		"php": "^5.6 || ^7.0",
 		"codeigniter/framework": "^3.1.11",
 		"dompdf/dompdf": "^0.7",
 		"tamtamchik/namecase": "^1.0",
-		"paragonie/random_compat": "^2.0"
+		"paragonie/random_compat": "^2.0",
+		"vlucas/phpdotenv": "^2.4"
 	},
 	"require-dev": {
-		"mikey179/vfsStream": "1.1.*",
-		"vlucas/phpdotenv": "^2.4"
+		"mikey179/vfsstream": "1.1.*",
+		"phpunit/phpunit": "7.5.6",
+		"kenjis/ci-phpunit-test": "dev-master"
 	}
 }

database/Dockerfile

@@ -1,5 +0,0 @@
-FROM alpine
-MAINTAINER jekkos
-
-ADD database.sql /docker-entrypoint-initdb.d/database.sql
-VOLUME /docker-entrypoint-initdb.d

docker-compose.dev.yml

@@ -1,20 +1,16 @@
-version: '2'
+version: '3.4'
 
 volumes:
     uploads:
         driver: local
   
 services:
-    sqlscript:
-        build:
-            context: database/
-            dockerfile: Dockerfile
 
     ospos:
         build:
             context: .
-            dockerfile: Dockerfile.dev
-        container_name: ospos
+            target: ospos_dev
+        container_name: ospos_dev
         restart: always
         depends_on:
           - mysql
@@ -31,13 +27,13 @@ services:
           - XDEBUG_CONFIG=remote_host=172.17.0.1
 
     mysql:
-        image: mariadb:10.1.21
+        image: mariadb:10.3
         container_name: mysql
         restart: always
         ports:
           - "3306:3306"
-        volumes_from:
-          - sqlscript
+        volumes:
+          - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
         environment:
           - MYSQL_ROOT_PASSWORD=pointofsale
           - MYSQL_DATABASE=ospos

docker-compose.test.yml

@@ -1,38 +1,28 @@
-version: '2'
+version: '3.4'
   
 services:
     test: 
         build:
             context: .
-            dockerfile: Dockerfile.test
-
-    sqlscript:
-        build:
-            context: database/
-            dockerfile: Dockerfile
-
-    ospos:
-        build:
-            context: .
-            dockerfile: Dockerfile
-        container_name: ospos
-        restart: always
-        depends_on:
+            target: ospos_test
+        depends_on: 
           - mysql
-        ports:
-          - "80:80"
+        container_name: ospos_test
         environment:
+          - CI_ENV=testing
+          - ENCRYPTION_KEY=
+          - MYSQL_HOST_NAME=mysql
+          - MYSQL_DATABASE=ospos
           - MYSQL_USERNAME=admin
           - MYSQL_PASSWORD=pointofsale
-          - MYSQL_DB_NAME=ospos
-          - MYSQL_HOST_NAME=mysql
+        command: ["/bin/wait-for-it.sh", "mysql:3306", "--", "/app/vendor/phpunit/phpunit/phpunit"]
+        ports:
+          - "80:80"
 
     mysql:
-        image: mysql:5.7
+        image: mariadb:10.3
         container_name: mysql
         restart: always
-        ports:
-          - "3306:3306"
         volumes:
           - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
         environment:

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.4'
 
 volumes:
     uploads:
@@ -11,15 +11,10 @@ networks:
     db_net:
 
 services:
-    sqlscript:
-        build:
-            context: database/
-            dockerfile: Dockerfile
-
     ospos:
         build:
             context: .
-            dockerfile: Dockerfile
+            target: ospos
         container_name: ospos
         restart: always
         depends_on:
@@ -49,8 +44,8 @@ services:
           - "3306"
         networks:
           - db_net
-        volumes_from:
-          - sqlscript
+        volumes:
+          - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
         environment:
           - MYSQL_ROOT_PASSWORD=${OSPOS_MYSQL_ROOT_PASSWORD}
           - MYSQL_DATABASE=ospos