Compare commits

...

2 Commits
3.2.2 ... 3.2.3

Author SHA1 Message Date
FrancescoUK
f1cf3d3c87 Release 3.2.3 2018-06-13 21:37:15 +01:00
FrancescoUK
8138db1a80 Fix Item form issue (#2021) 2018-06-13 21:19:55 +01:00
10 changed files with 27 additions and 20 deletions

View File

@@ -30,6 +30,7 @@ The main features are:
* Selectable Boostrap (Bootswatch) based UI theme * Selectable Boostrap (Bootswatch) based UI theme
* Mailchimp integration * Mailchimp integration
* reCAPTCHA to protect login page from brute force attacks * reCAPTCHA to protect login page from brute force attacks
* GDPR ready
The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface. The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface.

View File

@@ -1,3 +1,8 @@
Version 3.2.3
-------------
+ Further revert of CSRF change causing regression
+ Code Igniter 3.1.9 upgrade
Version 3.2.2 Version 3.2.2
------------- -------------
+ Revert CSRF change causing regression + Revert CSRF change causing regression

View File

@@ -8,7 +8,7 @@
| |
| |
*/ */
$config['application_version'] = '3.2.2'; $config['application_version'] = '3.2.3';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@@ -379,7 +379,7 @@ $(document).ready(function()
type: 'POST', type: 'POST',
url: "<?php echo site_url('items/suggest_custom');?>", url: "<?php echo site_url('items/suggest_custom');?>",
dataType: 'json', dataType: 'json',
data: $.extend(request, {field_no: <?php echo $i; ?>}), data: $.extend(request, $extend(csrf_form_base(), {field_no: <?php echo $i; ?>})),
success: function(data) { success: function(data) {
response($.map(data, function(item) { response($.map(data, function(item) {
return { return {
@@ -439,12 +439,12 @@ $(document).ready(function()
{ {
url: "<?php echo site_url($controller_name . '/check_item_number')?>", url: "<?php echo site_url($controller_name . '/check_item_number')?>",
type: 'POST', type: 'POST',
data: { data: $.extend(csrf_form_base(), {
"item_id": "<?php echo $item_info->item_id; ?>", "item_id": "<?php echo $item_info->item_id; ?>",
"item_number": function() { "item_number": function() {
return $("#item_number").val(); return $("#item_number").val();
} }
} })
} }
}, },
cost_price: cost_price:

View File

@@ -72,10 +72,10 @@
<![endif]--> <![endif]-->
<!-- start mincss template tags --> <!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/> <link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=a9e24293b8"/> <link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=84371241b2"/>
<!-- end mincss template tags --> <!-- end mincss template tags -->
<!-- start minjs template tags --> <!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=2b33cdf0fb"></script> <script type="text/javascript" src="dist/opensourcepos.min.js?rel=c206fd4a9f"></script>
<!-- end minjs template tags --> <!-- end minjs template tags -->
<?php endif; ?> <?php endif; ?>

View File

@@ -1,7 +1,7 @@
{ {
"name": "opensourcepos", "name": "opensourcepos",
"description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface", "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
"version": "3.2.2", "version": "3.2.3",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
"jekkos <jeroen.peelaerts - at - gmail.com>", "jekkos <jeroen.peelaerts - at - gmail.com>",

21
composer.lock generated
View File

@@ -9,16 +9,16 @@
"packages": [ "packages": [
{ {
"name": "codeigniter/framework", "name": "codeigniter/framework",
"version": "3.1.8", "version": "3.1.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bcit-ci/CodeIgniter.git", "url": "https://github.com/bcit-ci/CodeIgniter.git",
"reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312" "reference": "30e2eafa86c4c7b6b39cea3e7089a90df9f603fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/71e647782764184e3aab4faffe6d99176758979f", "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/30e2eafa86c4c7b6b39cea3e7089a90df9f603fb",
"reference": "02a0518e1c56ba3506f370362ac5ebdb8a138312", "reference": "30e2eafa86c4c7b6b39cea3e7089a90df9f603fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -38,7 +38,7 @@
], ],
"description": "The CodeIgniter framework", "description": "The CodeIgniter framework",
"homepage": "https://codeigniter.com", "homepage": "https://codeigniter.com",
"time": "2018-01-13 11:57:11" "time": "2018-06-12 13:45:46"
}, },
{ {
"name": "dompdf/dompdf", "name": "dompdf/dompdf",
@@ -103,16 +103,16 @@
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v2.0.11", "version": "v2.0.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -144,10 +144,11 @@
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [ "keywords": [
"csprng", "csprng",
"polyfill",
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2017-09-27 21:40:39" "time": "2018-06-08 15:26:40"
}, },
{ {
"name": "phenx/php-font-lib", "name": "phenx/php-font-lib",

View File

@@ -14,7 +14,7 @@
"public_stats": true "public_stats": true
}, },
"version": { "version": {
"name": "3.2.2" "name": "3.2.3"
}, },
"files": [ "files": [
{"includePattern": "dist(.*)\\.(zip)", "uploadPattern": "$1.$2"} {"includePattern": "dist(.*)\\.(zip)", "uploadPattern": "$1.$2"}

View File

@@ -1,6 +1,6 @@
{ {
"name": "opensourcepos", "name": "opensourcepos",
"version": "3.2.2", "version": "3.2.3",
"description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.", "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
"main": "index.php", "main": "index.php",
"license": "MIT", "license": "MIT",

View File

@@ -1,6 +1,6 @@
{ {
"name": "OpenSourcePOS", "name": "OpenSourcePOS",
"version": "3.2.2", "version": "3.2.3",
"license": [ "license": [
"MIT" "MIT"
], ],