diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f0e3e2c..db77d6e8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.3.7...HEAD +[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.3.8...HEAD +[3.3.7]: https://github.com/opensourcepos/opensourcepos/compare/3.3.7...3.3.8 [3.3.6]: https://github.com/opensourcepos/opensourcepos/compare/3.3.6...3.3.7 [3.3.5]: https://github.com/opensourcepos/opensourcepos/compare/3.3.4...3.3.5 [3.3.4]: https://github.com/opensourcepos/opensourcepos/compare/3.3.3...3.3.4 @@ -32,6 +33,12 @@ List of changes in the `master` branch. - N/A +## [3.3.8] - 2022-04-26 + +- Translation updates (Flemish, Vietnamese, Thai, Azerbaijani, Spanish, French) +- Fix logo removal issue (CSRF regression) +- Substract refunds from total rewards as payment method + ## [3.3.7] - 2022-04-26 - Translation updates (Thai, Indonesian, Swedish, Italian) diff --git a/application/config/config.php b/application/config/config.php index cb0bf202d..e2bfb5ee8 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -8,7 +8,7 @@ | | */ -$config['application_version'] = '3.3.7'; +$config['application_version'] = '3.3.8'; /* |-------------------------------------------------------------------------- diff --git a/bower.json b/bower.json index fe0fa0d55..c6aee67d9 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "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", - "version": "3.3.7", + "version": "3.3.8", "license": "MIT", "authors": [ "jekkos ", diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index 59b56881b..6653cb0cf 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -14,7 +14,7 @@ networks: services: ospos: - image: jekkos/opensourcepos:3.3.7 + image: jekkos/opensourcepos:3.3.8 restart: always depends_on: - mysql diff --git a/docker-compose.yml b/docker-compose.yml index c3f7e3d99..19cfd1fb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: image: jekkos/opensourcepos:sqlscript command: /bin/sh -c 'exit 0' ospos: - image: jekkos/opensourcepos:3.3.7 + image: jekkos/opensourcepos:3.3.8 restart: always depends_on: - mysql diff --git a/package-lock.json b/package-lock.json index ebc876d1c..2f82e8b02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "opensourcepos", - "version": "3.3.7-master-564465", + "version": "3.3.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "opensourcepos", - "version": "3.3.7-master-564465", + "version": "3.3.8", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 1bfb55dd8..16d615297 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opensourcepos/opensourcepos", - "version": "3.3.7-master-564465", + "version": "3.3.8", "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.", "repository": { "type": "git",