mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-06 23:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch develop/2.4 into master

Browse Source
This commit is contained in:
FrancescoUK
2016-03-08 19:14:36 +00:00
parent 1a1266a20c 9cd42e0614
commit d7df291b9a
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -21,7 +21,6 @@ RUN npm install -g grunt-cli
RUN ln -s /usr/local/bin/grunt /usr/bin/grunt
RUN ln -fs /app/* /var/www/html
RUN rm /var/www/html/index.html
ADD ./docker/start_container.sh /start_container.sh
RUN chmod 755 /start_container.sh
EXPOSE 80 3306

1
application/controllers/Sales.php
View File

@@ -300,6 +300,7 @@ class Sales extends Secure_area
$data['warning'] = $this->sale_lib->out_of_stock($item_id_or_number_or_item_kit_or_receipt,$item_location);
$this->_reload($data);
}

9
database/database.sql
View File

@@ -651,12 +651,11 @@ CREATE TABLE `ospos_sales_suspended_payments` (
--
CREATE TABLE `ospos_sessions` (
`session_id` varchar(40) NOT NULL DEFAULT '0',
`id` varchar(40) NOT NULL DEFAULT '0',
`ip_address` varchar(45) NOT NULL DEFAULT '0',
`user_agent` varchar(120) NOT NULL,
`last_activity` int(10) unsigned NOT NULL DEFAULT '0',
`user_data` text,
PRIMARY KEY (`session_id`)
`data` blob NOT NULL,
`timestamp` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--

9
database/migrate_phppos_dist.sql
View File

@@ -652,12 +652,11 @@ CREATE TABLE `ospos_sales_suspended_payments` (
--
CREATE TABLE `ospos_sessions` (
`session_id` varchar(40) NOT NULL DEFAULT '0',
`id` varchar(40) NOT NULL DEFAULT '0',
`ip_address` varchar(45) NOT NULL DEFAULT '0',
`user_agent` varchar(120) NOT NULL,
`last_activity` int(10) unsigned NOT NULL DEFAULT '0',
`user_data` text,
PRIMARY KEY (`session_id`)
`data` blob NOT NULL,
`timestamp` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--