Fix db upgrade script and prepare 3.1.0 release (#1242)

README.md

@@ -14,13 +14,13 @@ The main features are:
 * Stock management (Items and Kits)
 * VAT, customer and multi tiers taxation
 * Sale register with transactions logging
-* Quote and invoicing
+* Quotation and invoicing
 * Receipt and invoice printing and/or emailing
 * Barcode generation and printing
 * Suppliers and Customers database
 * Multiuser with permission control
 * Receivings
-* Gift card
+* Giftcard
 * Rewards
 * Restaurant tables
 * Messaging (SMS)

UPGRADE.txt

@@ -10,7 +10,7 @@ How to Upgrade
 7. Take the saved old database.php and change the new database.php to contain all the configuration you had in the old setup.
    Please try not to use the old layout, use the new one and just copy the content of the config variables
 8. Restore the content of the old uploads/ folder into public/uploads/ one
-9. Once new code is in place, database is updated and config files are sorted you are good to start the new OSPOS
+9. Once the new code is in place, database is updated and config files are sorted you are good to start the new OSPOS
 10. Once logged in in OSPOS go to Migrate (see Migrate button after Store Config) and run the Migrate script
 11. Now you can use OSPOS
 12. If any issue please check FAQ and/or GitHub issues as somebody else might have had your problem already or post a question

WHATS_NEW.txt

@@ -1,3 +1,32 @@
+Version 3.1.0
+-----------
++ MySQL 5.7 and PHP 7.x support
++ Advanced Tax support with customer tax categories and etc,
++ Better HORECA use case support with Dinner Table sale tagging
++ Customer Rewards support
++ Added quote support and better invoice support
++ Added integration with Mailchimp to connect Customer list with Mailchimp list
++ Prevent inserting two customers with same email address
++ Customer total spending and stats
++ Added reCAPTCHA to Login page to increase protection from Brute Force attacks
++ Added due payment for credit sale support
++ Gifcard numbering with two options: Series and Random
++ Extended Item Kits functionality
++ Employee allowed to change their own password clicking their name on top bar
++ Cash rounding support, extended decimals
++ Reworked Item Pictures and file name and storing
++ Financial year start date and selection from date range pickers
++ Date time range filters can be date & time or date only
++ Added two new Bootswatch themes
++ Receipts font size support
++ Fix automatically people's name first capital letter, emails in lower case only
++ Fixes to Receiving
++ Various amendments to database script updates from older versions
++ Added dotenv support
++ Updates to language translations (split English to American English and British English)
++ Various Dockers support improvements
++ Minor bugfixes
+
 Version 3.0.2
 -----------
 + Fixed error when performing scans multiple times in a row

database/3.0.2_to_3.1.0.sql

@@ -420,4 +420,4 @@ ALTER TABLE ospos_items
 
 -- Change language code en to be en-US
 
-UPDATE `ospos_app_config` SET `language_code` = 'en-US' WHERE `language_code` = 'en';
+UPDATE `ospos_app_config` SET `value` = 'en-US' WHERE `key` = 'language_code' AND `value` = 'en';