From beb18ff96b8b9cdc9858d244324ec5a94b8183e2 Mon Sep 17 00:00:00 2001 From: BudsieBuds Date: Tue, 28 Jan 2025 16:36:46 +0100 Subject: [PATCH] Random fixes (#4144) Random fixes in time for the 3.4.0 release. - corrects typo in the items controller - small update to login view - removes deprecated code from header view - ospos license updated to end 2024 - moved gulp packages to dev dependencies - updated gulp-zip and npm-check-updates to latest version - updated readme for consistency - makes ospos license in config fully readable - fixes composer libraries license view in config - gulp now updates composer libraries license and ospos license - updated other license views in config --- LICENSE | 26 +- README.md | 8 +- app/Controllers/Config.php | 6 +- app/Controllers/Items.php | 2 +- app/Views/login.php | 13 +- app/Views/partial/header.php | 2 +- gulpfile.js | 9 + package-lock.json | 4506 ++++-------------------- package.json | 17 +- public/license/LICENSE | 36 +- public/license/bootstrap-5.license | 3 +- public/license/bootstrap-5.version | 2 +- public/license/bootstrap-icons.license | 2 +- public/license/bootstrap-icons.version | 2 +- public/license/bootswatch-5.license | 21 - public/license/bootswatch-5.version | 1 - public/license/bootswatch.version | 2 +- public/license/composer.LICENSES | 68 +- 18 files changed, 808 insertions(+), 3918 deletions(-) delete mode 100644 public/license/bootswatch-5.license delete mode 100644 public/license/bootswatch-5.version diff --git a/LICENSE b/LICENSE index b5d196353..10a3cea9c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,30 @@ MIT License -Copyright (c) 2013-2023 jekkos +Copyright (c) 2013-2025 jekkos +Copyright (c) 2017-2025 objecttothis +Copyright (c) 2017-2024 Steve Ireland +Copyright (c) 2017-2025 odiea +Copyright (c) 2018-2024 WebShells +Copyright (c) 2021-2025 BudsieBuds Copyright (c) 2015-2023 FrancescoUK (aka daN4cat) -Copyright (c) 2017-2023 Steve Ireland -Copyright (c) 2017-2023 objecttothis -Copyright (c) 2017-2023 odiea -Copyright (c) 2017-2023 WebShells -Copyright (c) 2020-2021 Andriux1990 -Copyright (c) 2021 BudsieBuds +Copyright (c) 2015-2022 Aamir Shahzad (aka asakpke), RoshanTech, eSite.pk +Copyright (c) 2019-2020 Andriux1990 +Copyright (c) 2018-2019 Erasto Marroquin (aka Erastus) Copyright (c) 2019 Loyd Jayme (aka loydjayme25) -Copyright (c) 2018 Erasto Marroquin (aka Erastus) Copyright (c) 2018 Nathan Sas (aka nathanzky) Copyright (c) 2018 Emilio Silva (aka emi-silva) -Copyright (c) 2017 Jesus Guerrero Botella (aka i92guboj) +Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal) +Copyright (c) 2016-2017 Jorge Colmenarez (aka jlctmaster), frontuari.com +Copyright (c) 2016-2017 Jesus Guerrero Botella (aka i92guboj) Copyright (c) 2017 Deep Shah (aka deepshah) Copyright (c) 2017 Joshua Fernandez (aka joshua1234511) Copyright (c) 2017 asadjaved63 -Copyright (c) 2016-2017 Ramkrishna Mondal (aka RamkrishnaMondal) -Copyright (c) 2016-2017 Jorge Colmenarez (aka jlctmaster), frontuari.com Copyright (c) 2016 Rinaldy@dbarber (aka rnld26) -Copyright (c) 2015-2022 Aamir Shahzad (aka asakpke), RoshanTech, eSite.pk Copyright (c) 2015 Toni Haryanto (aka yllumi) +Copyright (c) 2012-2014 pappastech Copyright (c) 2013 Rob Garrison Copyright (c) 2013 Parq Copyright (c) 2013 Ramel -Copyright (c) 2012-2014 pappastech Copyright (c) 2012 Alain Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/README.md b/README.md index 5c68e4255..1d4f203b7 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Any person or company found breaching the license agreement might find a bunch o ## 🙏 Credits -|
DigitalOcean
|
JetBrains
|
Travis CI
| -|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- | -|
DigitalOcean Logo
|
IntelliJ IDEA Logo
|
Travis CI Logo
| -| Many thanks to [Digital Ocean](https://www.digitalocean.com) for providing the project with hosting credits | Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS. | Many thanks to [Travis CI](https://www.travis-ci.com/) for providing a free continuous integration service for open source projects. | +|
DigitalOcean
|
JetBrains
|
Travis CI
| +| --- | --- | --- | +|
DigitalOcean Logo
|
IntelliJ IDEA Logo
|
Travis CI Logo
| +| Many thanks to [DigitalOcean](https://www.digitalocean.com) for providing the project with hosting credits. | Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS. | Many thanks to [Travis CI](https://www.travis-ci.com/) for providing a free continuous integration service for open source projects. | diff --git a/app/Controllers/Config.php b/app/Controllers/Config.php index 24b04f358..a04da74f0 100644 --- a/app/Controllers/Config.php +++ b/app/Controllers/Config.php @@ -82,7 +82,7 @@ class Config extends Secure_Controller $license[$i]['title'] = 'Open Source Point Of Sale ' . config('App')->application_version; if (file_exists('license/LICENSE')) { - $license[$i]['text'] = file_get_contents('license/LICENSE', false, null, 0, 2000); + $license[$i]['text'] = file_get_contents('license/LICENSE', false, null, 0, 3000); } else { $license[$i]['text'] = 'LICENSE file must be in OSPOS license directory. You are not allowed to use OSPOS application until the distribution copy of LICENSE file is present.'; } @@ -139,13 +139,13 @@ class Config extends Secure_Controller $license[$i]['text'] .= "$val3 "; } - $license[$i]['text'] .= '\n'; + $license[$i]['text'] .= "\n"; } else { $license[$i]['text'] .= "$key2: $val2\n"; } } - $license[$i]['text'] .= '\n'; + $license[$i]['text'] .= "\n"; } else { $license[$i]['text'] .= "$key1: $val1\n"; } diff --git a/app/Controllers/Items.php b/app/Controllers/Items.php index d66d4808a..b0b8693ed 100644 --- a/app/Controllers/Items.php +++ b/app/Controllers/Items.php @@ -207,7 +207,7 @@ class Items extends Secure_Controller */ public function getSuggestLowSell(): void { - $suggestions = $this->item->get_low_sell_suggestions($this->request->getPo1stGet('name')); + $suggestions = $this->item->get_low_sell_suggestions($this->request->getPostGet('name')); echo json_encode($suggestions); } diff --git a/app/Views/login.php b/app/Views/login.php index 4a5765815..dbc1d1350 100644 --- a/app/Views/login.php +++ b/app/Views/login.php @@ -13,7 +13,7 @@ - + <?= $config['company'] . ' | ' . lang('Common.software_short') . ' | ' . lang('Login.login') ?> @@ -26,7 +26,7 @@ ? 'flatly' : $config['theme']); ?> - "> + /bootstrap.min.css"> @@ -107,10 +107,11 @@