Merge branch 'ci3' into bootstrapUI

.travis.yml

@@ -10,8 +10,8 @@ services:
 
 before_install:
     - docker build -t jekkos/opensourcepos .
-    - docker run -d -p 127.0.0.1:80:80 jekkos/opensourcepos /bin/sh -c "cd /app; npm install"
+    - docker run -d jekkos/opensourcepos /bin/sh -c "cd /app; npm install"
     - docker ps -a
 
 script:
-    - grunt mochaWebdriver:test
+    - docker run -d -p 127.0.0.1:80:80 jekkos/opensourcepos /bin/sh -c "cd /app; grunt mochaWebdriver:test"

Dockerfile

@@ -17,6 +17,7 @@ RUN git clone https://github.com/jekkos/opensourcepos.git /app
 RUN ln -s /usr/bin/nodejs /usr/bin/node
 RUN cd app && npm install
 RUN npm install -g grunt-cli
+RUn ln -s /usr/local/bin/grunt /usr/bin/grunt
 
 RUN ln -fs /app/* /var/www/html
 ADD ./docker/start_container.sh /start_container.sh

Gruntfile.js

@@ -14,7 +14,7 @@ module.exports = function(grunt) {
         },
         sql: {
             options: {
-                banner: '-->> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly <<--'
+                banner: '-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'
             },
             files: {
                 'database/database.sql': ['database/tables.sql', 'database/constraints.sql'],

application/views/partial/header.php

@@ -35,7 +35,7 @@
 		<!-- end js template tags -->
 	<?php else : ?>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=45f4375544" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a8ae30ad50" language="javascript"></script>
 		<!-- end minjs template tags -->       
 	<?php endif; ?>
 

database/database.sql

@@ -1,4 +1,4 @@
--->> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly <<--
+-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --
 --
 -- Table structure for table `ospos_app_config`
 --

database/migrate_phppos_dist.sql

@@ -1,4 +1,4 @@
--->> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly <<--
+-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --
 --
 -- Table structure for table `ospos_app_config`
 --