From 455b462d25cbf2a8c2dc23a88faad2135ed7b414 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 24 Dec 2017 18:11:09 +0000 Subject: [PATCH] Preparing 3.2.0 release --- UPGRADE.txt | 6 +++--- WHATS_NEW.txt | 18 ++++++++++++++++++ application/controllers/Login.php | 12 ++---------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 2a7e064ea..ad9786c2f 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -4,13 +4,13 @@ How to Upgrade 2. Make sure you have a copy of application/config/config.php and application/config/database.php 3. Remove all directories 4. Install the new OSPOS -5. Run the database upgrade scripts from database/ dir (check which ones you need according to the version you are upgrading from) +5. Run the database upgrade scripts from database/ dir (check which ones you need according to the version you are upgrading from and only applicable if upgrading from pre 3.0.0) 6. Take the saved old config.php and upgrade the new config.php with any additional changes you made in the old. Take time to understand if new config rules require some changes (e.g. encryption keys) 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 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 +10. The first login will take longer because OSPOS post 3.0.0 will upgrade automatically to the latest version 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 +12. If any issue please check README, FAQ and GitHub issues as somebody else might have had your problem already before creating a new issue diff --git a/WHATS_NEW.txt b/WHATS_NEW.txt index 7b58ec0d7..925afae3f 100644 --- a/WHATS_NEW.txt +++ b/WHATS_NEW.txt @@ -1,3 +1,21 @@ +Version 3.2.0 +------------- ++ CodeIgniter 3.1.6 Upgrade ++ Home and back Office menu switch support ++ Added Work orders ++ Made Sales having a state (e.g. suspended, cancel, proforma) ++ Restrict Sale delete with permission ++ Added ability to restore deleted Sale ++ Added Expenses support ++ Automatic upgrade at first login from 3.0.0 version onwards ++ Export all records and export to pdf ++ Added table sticky headers (header always visible during scrolling) ++ Allow duplicate barcodes (Config option) ++ Search suggestion formatting ++ Improved Items Kit ++ Added few other languages support ++ Various bugfixes (a.g. Tax, Rounding, Reports, Library circular dependency) + Version 3.1.1 ------------- + Updated en-US and en-GB translations, better grammar and consistency diff --git a/application/controllers/Login.php b/application/controllers/Login.php index b90bcbeb0..c3fc0c7b7 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -35,14 +35,6 @@ class Login extends CI_Controller $this->tracking_lib->track_event('Stats', 'Language', $this->config->item('language')); $this->tracking_lib->track_event('Stats', 'Timezone', $this->config->item('timezone')); $this->tracking_lib->track_event('Stats', 'Currency', $this->config->item('currency_symbol')); - $this->tracking_lib->track_event('Stats', 'Customer Sales Tax Support', $this->config->item('customer_sales_tax_support')); - $this->tracking_lib->track_event('Stats', 'Tax Included', $this->config->item('tax_included')); - $this->tracking_lib->track_event('Stats', 'Thousands Separator', $this->config->item('thousands_separator')); - $this->tracking_lib->track_event('Stats', 'Currency Decimals', $this->config->item('currency_decimals')); - $this->tracking_lib->track_event('Stats', 'Tax Decimals', $this->config->item('tax_decimals')); - $this->tracking_lib->track_event('Stats', 'Quantity Decimals', $this->config->item('quantity_decimals')); - $this->tracking_lib->track_event('Stats', 'Invoice Enable', $this->config->item('invoice_enable')); - $this->tracking_lib->track_event('Stats', 'Date or Time Format', $this->config->item('date_or_time_format')); } redirect('home'); @@ -102,7 +94,7 @@ class Login extends CI_Controller { // get PHP extensions and check that the required ones are installed $extensions = implode(', ', get_loaded_extensions()); - $keys = array('bcmath', 'intl', 'gd', 'sockets', 'mcrypt', 'mbstring'); + $keys = array('bcmath', 'intl', 'gd', 'sockets', 'mcrypt', 'mbstring', 'curl'); $pattern = '/'; foreach($keys as $key) { @@ -119,7 +111,7 @@ class Login extends CI_Controller } else { - $result = preg_match('~\b(Copyright|(c)|©|All rights reserved|Developed|Crafted|Implemented|Made|Powered|Code|Design|unblockUI|blockUI|blockOverlay|hide|opacity)\b~i', file_get_contents(APPPATH . 'views/partial/footer.php')) != TRUE; + $result = preg_match('~\b(Copyright|(c)|©|All rights reserved|Developed|Crafted|Implemented|Made|Powered|Code|Design|unblockUI|blockUI|blockOverlay|hide|opacity|NuNu|wMDA|Zhafirah|Zendher|WEDIDIT|websol|wazo|Water|Trulance|Vision|Unlock|United|Total|Coddz|Tormuz|Toko|TIS|Store|Sigma|SECC|Motor|Scooper|Satelit|Infotech|Shop|Computer|Cell|Mina|Mila|Megawheel|Restaurant|Bazar|Farma|Linux|ERP|Jeera|Hotel|eCommerce|Stock)\b~i', file_get_contents(APPPATH . 'views/partial/footer.php')) != TRUE; } return $result;