diff --git a/Dockerfile b/Dockerfile index 494239a33..b5258d91b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 8edada581..89c061c70 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -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); } diff --git a/database/database.sql b/database/database.sql index 8d4cb0791..7404d8e9d 100644 --- a/database/database.sql +++ b/database/database.sql @@ -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; -- diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index 321a9cd67..4b67245ca 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -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; --