Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer

.gitignore

@@ -1,5 +1,6 @@
 node_modules
-bower_components
+public/bower_components
+tmp/
 public/bower_components
 tmp/
 application/config/email.php

.htaccess

@@ -0,0 +1,75 @@
+RewriteEngine On
+
+# To redirect a subdomain to a subdir because of https not supporting wildcards
+# replace values between <> with your ones
+# RewriteCond %{HTTP_HOST} ^<OSPOS subdomain>\.<my web domain>\.com$ [OR]
+# RewriteCond %{HTTP_HOST} ^www\.<OSPOS subdomain>\.<my web domain>\.com$
+# RewriteRule ^/?$ "https\:\/\/www\.<my web domain>\.com\/<OSPOS path>" [R=301,L]
+
+# To rewrite "domain.com -> www.domain.com" uncomment the following lines.
+# RewriteCond %{HTTPS} !=on
+# RewriteCond %{HTTP_HOST} !^www\..+$ [NC]
+# RewriteCond %{HTTP_HOST} (.+)$ [NC]
+# RewriteRule ^(.*)$ http://www.%1/$1 [R=301,L]
+
+# Suppress index.php from OSPOS URL
+# Remember to set in application/config/config.php  $config['index_page'] = '';
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+# if in web root
+RewriteRule ^(.*)$ index.php?/$1 [L]
+# if in subdir comment above line, uncomment below one and replace <OSPOS path> with your path
+# RewriteRule ^(.*)$ /<OSPOS path>/index.php?/$1 [L]
+
+# disable directory browsing
+# For security reasons, Option all cannot be overridden.
+#Options All -Indexes
+Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
+
+# prevent folder listing
+IndexIgnore *
+
+# secure htaccess file
+<Files .htaccess>
+  Order allow,deny
+  Deny from all
+</Files>
+
+# prevent access to PHP error log
+<Files error_log>
+  Order allow,deny
+  Deny from all
+  Satisfy all
+</Files>
+
+# prevent access to COPYING
+<Files COPYING>
+  Order allow,deny
+  Deny from all
+  Satisfy all
+</Files>
+
+# prevent access to csv and txt files
+<FilesMatch "\.(csv|txt)$">
+  Order allow,deny
+  Deny from all
+  Satisfy all
+</FilesMatch>
+
+# control access to generate_languages.php
+<Files generate_languages.php>
+  Order deny,allow
+  Deny from all
+
+  Allow from 127.0.0.1
+
+# My IP(s)
+#  Allow from xxx.xxx.xxx.xxx
+</Files>
+
+<IfModule mod_expires.c>
+  <FilesMatch "\.(jpe?g|png|gif|js|css)$">
+    ExpiresActive On
+    ExpiresDefault "access plus 1 week"
+  </FilesMatch>
+</IfModule>

.travis.yml

@@ -9,7 +9,9 @@ before_install:
 script:
     - docker-compose build
     - docker-compose up -d
-
+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:${TRAVIS_BRANCH} && docker tag opensourcepos_sqlscript jekkos/opensourcepos:sqlscript && docker push jekkos/opensourcepos:master && docker push jekkos/opensourcepos:sqlscript'
+    - 
+    - '[ -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'
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM jekkos/opensourcepos:master
+FROM jekkos/opensourcepos:composer
 MAINTAINER jekkos
 
 RUN mkdir -p /app/bower_components && ln -s /app/bower_components /var/www/html/bower_components

Gruntfile.js

@@ -69,7 +69,15 @@ module.exports = function(grunt) {
 					'yeti/bootstrap.min.css': 'yeti/bootstrap.min.css',
 					'fonts': 'fonts'
 				}
-			}
+			},
+			targetlicense: {
+				options: {
+					srcPrefix: './'
+				},
+				files: {
+					'license': 'COPYING'
+				}
+			},
 		},
 		cssmin: {
 			target: {

application/controllers/Config.php

@@ -22,13 +22,13 @@ class Config extends Secure_Controller
 
 		$license[$i]['title'] = 'Open Source Point Of Sale ' . $this->config->item('application_version');
 
-		if(file_exists('COPYING'))
+		if(file_exists('license/COPYING'))
 		{
-			$license[$i]['text'] = $this->xss_clean(file_get_contents('COPYING', NULL, NULL, 0, 2000));
+			$license[$i]['text'] = $this->xss_clean(file_get_contents('license/COPYING', NULL, NULL, 0, 2000));
 		}
 		else
 		{
-			$license[$i]['text'] = 'COPYING file must be in OSPOS root directory. You are not allowed to use OSPOS application until the distribution copy of COPYING file is present.';
+			$license[$i]['text'] = 'COPYING file must be in OSPOS license directory. You are not allowed to use OSPOS application until the distribution copy of COPYING file is present.';
 		}
 
 		// read all the files in the dir license

application/controllers/Login.php

@@ -28,10 +28,10 @@ class Login extends CI_Controller
 				{
 					$this->load->library('tracking_lib');
 
-					$login_info = current_language() . ' | ' . $this->config->item('timezone') . ' | ' . $this->config->item('currency_symbol') . ' | ' . $this->config->item('theme') . ' | ' . $this->config->item('website');
+					$login_info = current_language() . ' | ' . $this->config->item('timezone') . ' | ' . $this->config->item('currency_symbol') . ' | ' . $this->config->item('theme') . ' | ' . $this->config->item('website') . ' | ' . $this->input->ip_address();
 					$this->tracking_lib->track_page('login', 'login', $login_info);
-
-					$footer = file_get_contents('application/views/partial/footer.php');
+					
+					$footer = file_get_contents('../application/views/partial/footer.php');
 					$footer = strip_tags($footer);
 					$footer = preg_replace('/\s+/', '', $footer);
 

application/controllers/Secure_Controller.php

@@ -18,7 +18,7 @@ class Secure_Controller extends CI_Controller
 			redirect('login');
 		}
 
-		$this->track_page($module_id, $submodule_id);
+		$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) || 
@@ -62,6 +62,7 @@ class Secure_Controller extends CI_Controller
 			if(empty($path))
 			{
 				$path = 'home';
+				$page = 'home';
 			}
 
 			$this->tracking_lib->track_page('controller/' . $path, $page);

application/views/partial/header.php

@@ -67,11 +67,11 @@
 		<![endif]-->
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3e479ff055"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=e20169f5b0"/>
 		<link rel="stylesheet" type="text/css" href="dist/style.css"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=45d262797a"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=fccbeb6daf"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 

bower.json

@@ -32,7 +32,7 @@
     "jasny-bootstrap": "^3.1.3",
     "bootswatch": "^3.3.7",
     "smalot-bootstrap-datetimepicker": "^2.3.11",
-    "bootstrap-select": "^1.10.0",
+    "bootstrap-select": "^1.11.0",
     "bootstrap-table": "^1.11.0",
     "bootstrap-daterangepicker": "^2.1.24",
     "tableExport.jquery.plugin": "1.5.1",

package.json

@@ -30,7 +30,7 @@
     "grunt-contrib-watch": "~0.5.3",
     "grunt-license-bower": "~1.0.1",
     "grunt-mocha-webdriver": "^1.2.2",
-    "grunt-script-link-tags": "git://github.com/jekkos/grunt-script-link-tags.git#master",
+    "grunt-script-link-tags": "git://github.com/jekkos/grunt-script-link-tags.git#c87d3e1d",
     "grunt-wiredep": "^2.0.0",
     "load-grunt-tasks": "^3.4.0",
     "mocha": "^2.2.1",

vendor/codeigniter/framework/index.php

@@ -53,7 +53,8 @@
  *
  * NOTE: If you change these, also change the error_reporting() code below
  */
-	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+//	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'production');
 
 /*
  *---------------------------------------------------------------

vendor/codeigniter/framework/system/language/german/calendar_lang.php

@@ -1,56 +0,0 @@
-<?php
-/**
- * System messages translation for CodeIgniter(tm)
- *
- * @author	CodeIgniter community
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$lang['cal_su']			= 'So';
-$lang['cal_mo']			= 'Mo';
-$lang['cal_tu']			= 'Di';
-$lang['cal_we']			= 'Mi';
-$lang['cal_th']			= 'Do';
-$lang['cal_fr']			= 'Fr';
-$lang['cal_sa']			= 'Sa';
-$lang['cal_sun']		= 'Son';
-$lang['cal_mon']		= 'Mon';
-$lang['cal_tue']		= 'Die';
-$lang['cal_wed']		= 'Mit';
-$lang['cal_thu']		= 'Don';
-$lang['cal_fri']		= 'Fre';
-$lang['cal_sat']		= 'Sam';
-$lang['cal_sunday']		= 'Sonntag';
-$lang['cal_monday']		= 'Montag';
-$lang['cal_tuesday']	= 'Dienstag';
-$lang['cal_wednesday']	= 'Mittwoch';
-$lang['cal_thursday']	= 'Donnerstag';
-$lang['cal_friday']		= 'Freitag';
-$lang['cal_saturday']	= 'Samstag';
-$lang['cal_jan']		= 'Jan';
-$lang['cal_feb']		= 'Feb';
-$lang['cal_mar']		= 'Mär';
-$lang['cal_apr']		= 'Apr';
-$lang['cal_may']		= 'Mai';
-$lang['cal_jun']		= 'Jun';
-$lang['cal_jul']		= 'Jul';
-$lang['cal_aug']		= 'Aug';
-$lang['cal_sep']		= 'Sep';
-$lang['cal_oct']		= 'Okt';
-$lang['cal_nov']		= 'Nov';
-$lang['cal_dec']		= 'Dez';
-$lang['cal_january']	= 'Januar';
-$lang['cal_february']	= 'Februar';
-$lang['cal_march']		= 'März';
-$lang['cal_april']		= 'April';
-$lang['cal_mayl']		= 'Mai';
-$lang['cal_june']		= 'Juni';
-$lang['cal_july']		= 'Juli';
-$lang['cal_august']		= 'August';
-$lang['cal_september']	= 'September';
-$lang['cal_october']	= 'Oktober';
-$lang['cal_november']	= 'November';
-$lang['cal_december']	= 'Dezember';

vendor/codeigniter/framework/system/language/german/profiler_lang.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * System messages translation for CodeIgniter(tm)
- *
- * @author	CodeIgniter community
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$lang['profiler_database']		= 'DATABASE';
-$lang['profiler_controller_info'] = 'CLASS/METHOD';
-$lang['profiler_benchmarks']	= 'BENCHMARKS';
-$lang['profiler_queries']		= 'QUERIES';
-$lang['profiler_get_data']		= 'GET-Daten';
-$lang['profiler_post_data']		= 'POST-Daten';
-$lang['profiler_uri_string']	= 'URI STRING';
-$lang['profiler_memory_usage']	= 'VERWENDETER ARBEITSSPEICHER';
-$lang['profiler_config']		= 'CONFIG VARIABLES';
-$lang['profiler_session_data']	= 'SESSION DATA';
-$lang['profiler_headers']		= 'HTTP HEADERS';
-$lang['profiler_no_db']			= 'Der Datenbanktreiber wurde aktuell nicht geladen.';
-$lang['profiler_no_queries']	= 'Es wurde bisher keine Abfrage gestartet.';
-$lang['profiler_no_post']		= 'Es sind keine POST-Daten vorhanden.';
-$lang['profiler_no_get']		= 'Es sind keine GET-Daten vorhanden.';
-$lang['profiler_no_uri']		= 'Es sind keine URI-Daten vorhanden.';
-$lang['profiler_no_memory']		= 'Es sind keine Angaben für die Verwendung des Arbeitsspeichers verfügbar.';
-$lang['profiler_no_profiles']	= 'E sind keine Profiler-Daten verfügbar, da alle Bereiche dazu deaktiviert wurden.';
-$lang['profiler_section_hide']	= 'Verstecken';
-$lang['profiler_section_show']	= 'Anzeigen';
-$lang['profiler_seconds']		= 'Sekunden';