Random fixes (opensourcepos#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
BudsieBuds · Jan 28, 2025 · beb18ff · beb18ff
1 parent 7ad1bfa
commit beb18ff
Show file tree

Hide file tree

Showing 18 changed files with 2,822 additions and 5,932 deletions.
diff --git 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
@@ -137,7 +137,7 @@ Any person or company found breaching the license agreement might find a bunch o
 
 ## 🙏 Credits
 
-| <div align="center">DigitalOcean</div>                                                                                                                                                                                                                                                    | <div align="center">JetBrains</div> | <div align="center">Travis CI</div> |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- |
-| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://www.travis-ci.com/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/71cc2b44-83af-4510-a543-6358285f43c6" alt="Travis CI Logo" height="50"></a></div> |
-| 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. |
+| <div align="center">DigitalOcean</div> | <div align="center">JetBrains</div> | <div align="center">Travis CI</div> |
+| --- | --- | --- |
+| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://github.com/user-attachments/assets/fbbf7433-ed35-407d-8946-fd03d236d350" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://www.travis-ci.com/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/71cc2b44-83af-4510-a543-6358285f43c6" alt="Travis CI Logo" height="50"></a></div> |
+| 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
@@ -82,7 +82,7 @@ private function _licenses(): array    //TODO: remove hungarian notation.  Super
         $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 @@ private function _licenses(): array    //TODO: remove hungarian notation.  Super
                                         $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
@@ -207,7 +207,7 @@ public function getSuggest(): void
 	 */
 	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
@@ -13,7 +13,7 @@
 <html lang="<?= current_language_code() ?>">
 
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta charset="utf-8">
 	<base href="<?= base_url() ?>">
 	<title><?= $config['company'] . '&nbsp;|&nbsp;' . lang('Common.software_short') . '&nbsp;|&nbsp;' .  lang('Login.login') ?></title>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -26,7 +26,7 @@
 		? 'flatly'
 		: $config['theme']);
 	?>
-	<link rel="stylesheet" type="text/css" href="<?= "resources/bootswatch5/$theme/bootstrap.min.css" ?>">
+	<link rel="stylesheet" type="text/css" href="resources/bootswatch5/<?= "$theme" ?>/bootstrap.min.css">
 	<!-- inject:login:css -->
 	<link rel="stylesheet" href="css/login.min.css">
 	<!-- endinject -->
@@ -107,10 +107,11 @@
 
 	<footer class="d-flex justify-content-center flex-shrink-0 text-center">
 		<div class="footer container-fluid bg-body rounded shadow p-3 mb-md-4 mx-md-3">
-			<span class="text-body-secondary">
-				<svg height="1em" role="img" viewBox="0 0 229.85 143.05001" xmlns="http://www.w3.org/2000/svg">
-					<title><?= lang('Common.software_short') . '&nbsp;' . lang('Common.logo_mark') ?></title>
-					<path fill="currentColor" d="M115.51 50.18c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63C90.2 7.71 74.93.04 57.77.04 25.91.04 0 25.95 0 57.81c0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zM57.76 88.51c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69S88.45 40.9 88.45 57.82 74.68 88.51 57.76 88.51zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54V27.07h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
+			<span class="text-primary">
+				<svg height="1.25em" role="img" viewBox="0 0 308.57998 308.57997" xmlns="http://www.w3.org/2000/svg">
+					<title><?= lang('Common.software_title') . '&nbsp;' . lang('Common.logo') ?></title>
+					<circle cx="154.28999" cy="154.28999" r="154.28999" fill="currentColor"/>
+					<path fill="#fff" d="M154.88998 145.66999c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63-10.59-11.92-25.86-19.59-43.02-19.59-31.86 0-57.77 25.91-57.77 57.77 0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zm-57.75 38.33c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69 30.69 13.77 30.69 30.69-13.77 30.69-30.69 30.69zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54v-61.47h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
 				</svg>
 			</span>
 			<span><?= lang('Common.software_title') ?></span>

diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php
@@ -56,7 +56,7 @@
 
 				<div class="navbar-right" style="margin:0">
 					<?= anchor("home/changePassword/$user_info->person_id", "$user_info->first_name $user_info->last_name", ['class' => 'modal-dlg', 'data-btn-submit' => lang('Common.submit'), 'title' => lang('Employees.change_password')]) ?>
-					<?= '  |  ' . ((ENVIRONMENT == 'development' || $request->getGet('debugdebug') == 'true') ? session('session_sha1') . '  |  ' : '') ?>
+					<span>&nbsp;|&nbsp;</span>
 					<?= anchor('home/logout', lang('Login.logout')) ?>
 				</div>
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -14,6 +14,7 @@ import header from 'gulp-header'
 import tar from 'gulp-tar'
 import gzip from 'gulp-gzip'
 import zip from 'gulp-zip'
+import run from 'gulp-run'
 
 import { Stream } from 'readable-stream'
 const {finished, pipeline} = Stream.promises
@@ -248,6 +249,13 @@ gulp.task('inject-login', function() {
 	);
 });
 
+
+gulp.task('update-licenses', function() {
+	run('composer licenses --format=json --no-dev > public/license/composer.LICENSES').exec();
+	return pipeline(gulp.src('LICENSE'),gulp.dest('public/license'));
+});
+
+
 gulp.task('build-database', function() {
 	return gulp.src(['./app/Database/tables.sql','./app/Database/constraints.sql'])
 		.pipe(header('-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'))
@@ -266,5 +274,6 @@ gulp.task('default',
 		'prod-css',
 		'copy-fonts',
 		'inject-login',
+		'update-licenses',
 		'build-database'
 	));