Fix build after rebase with master

Enable php socket extension in Dockerfile

Dockerfile

@@ -6,12 +6,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libgd-dev
 
 RUN a2enmod rewrite
-RUN docker-php-ext-install mysql mysqli bcmath intl gd
+RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets
 RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
 COPY . /app
-RUN rm -rf /var/www && ln -s /app/*[^public] /var/www && ln -nsf /app/public /var/www/html
+RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
 
 RUN cp application/config/database.php.tmpl application/config/database.php && \
     sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \

Gruntfile.js

@@ -45,27 +45,12 @@ module.exports = function(grunt) {
 					'invoice_email.css': '../../css/invoice_email.css',
 					'barcode_font.css': '../../css/barcode_font.css',
 					'jquery-ui.css': 'jquery-ui/themes/base/jquery-ui.css',
-					'bootswatch/cerulean/bootstrap.min.css': 'bootswatch/cerulean/bootstrap.min.css',
-					'bootswatch/cosmo/bootstrap.min.css': 'bootswatch/cosmo/bootstrap.min.css',
-					'bootswatch/cyborg/bootstrap.min.css': 'bootswatch/cyborg/bootstrap.min.css',
-					'bootswatch/darkly/bootstrap.min.css': 'bootswatch/darkly/bootstrap.min.css',
-					'bootswatch/flatly/bootstrap.min.css': 'bootswatch/flatly/bootstrap.min.css',
-					'bootswatch/journal/bootstrap.min.css': 'bootswatch/journal/bootstrap.min.css',
-					'bootswatch/paper/bootstrap.min.css': 'bootswatch/paper/bootstrap.min.css',
-					'bootswatch/readable/bootstrap.min.css': 'bootswatch/readable/bootstrap.min.css',
-					'bootswatch/sandstone/bootstrap.min.css': 'bootswatch/sandstone/bootstrap.min.css',
-					'bootswatch/slate/bootstrap.min.css': 'bootswatch/slate/bootstrap.min.css',
-					'bootswatch/spacelab/bootstrap.min.css': 'bootswatch/spacelab/bootstrap.min.css',
-					'bootswatch/superhero/bootstrap.min.css': 'bootswatch/superhero/bootstrap.min.css',
-					'bootswatch/united/bootstrap.min.css': 'bootswatch/united/bootstrap.min.css',
-					'bootswatch/yeti/bootstrap.min.css': 'bootswatch/yeti/bootstrap.min.css',
-					'bootswatch/fonts': 'bootswatch/fonts'
 				}
 			},
 			targetdistbootswatch: {
 				options: {
-					srcPrefix: 'bower_components/bootswatch',
-					destPrefix: 'dist/bootswatch'
+					srcPrefix: 'public/bower_components/bootswatch',
+					destPrefix: 'public/dist/bootswatch'
 				},
 				files: {
 					'cerulean/bootstrap.min.css': 'cerulean/bootstrap.min.css',

application/views/partial/header.php

@@ -71,7 +71,7 @@
 		<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=0042fb0766"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=45d262797a"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>