mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-09 17:39:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

For #3741. Manual migration of commits from master to branch through April 22, 2023.

Browse Source
This commit is contained in:
Steve Ireland
2023-04-27 21:45:13 -04:00
parent 3c931a91e7
commit e7218b2904
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.md
View File

@@ -1,6 +1,6 @@
## Server Requirements
- PHP version `7.2` to `7.4` are supported, PHP version `≤5.6` and `8.0` are NOT supported. Please note that PHP needs to have the extensions `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring` and `php-curl` installed and enabled.
- PHP version `7.2` to `7.4` are supported, PHP version `≤5.6` and `8.0` are NOT supported. Please note that PHP needs to have the extensions `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring` , `php-curl` and `php-xml` installed and enabled.
- MySQL `5.5`, `5.6` and `5.7` are supported, also MariaDB replacement `10.x` is supported and might offer better performance.
- Apache `2.2` and `2.4` are supported. Nginx should work fine too, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP).
- Raspberry PI based installations proved to work, see [wiki page here](<https://github.com/opensourcepos/opensourcepos/wiki/Installing-on-Raspberry-PI---Orange-PI-(Headless-OSPOS)>).

2
app/Controllers/Secure_Controller.php
View File

@@ -30,7 +30,7 @@ class Secure_Controller extends BaseController
if(!$this->employee->is_logged_in())
{
return redirect()->to('login');
header("Location:".base_url('login'));
}
$logged_in_employee_info = $this->employee->get_logged_in_employee_info();

2
app/Models/Employee.php
View File

@@ -493,7 +493,7 @@ class Employee extends Person
/**
* Returns the menu group designation that this module is to appear in
*/
public function get_menu_group(string $permission_id, int $person_id): string
public function get_menu_group(string $permission_id, ?int $person_id): string
{
$builder = $this->db->table('grants');
$builder->select('menu_group');

6
app/Views/configs/system_info.php
View File

@@ -13,7 +13,7 @@
<div class="row">
<div class="col-sm-2" style="text-align: left;"><br>
<p style="min-height:14.7em;"><strong>General Info </p>
<p style="min-height:9.9em;">User Setup</p>
<p style="min-height:9.9em;">User Setup</p><br>
<p>Permissions</p></strong>
</div>
<div class="col-sm-8" id="issuetemplate" style="text-align: left;"><br>
@@ -25,11 +25,11 @@
<?php
echo "&#187; GD: ", extension_loaded('gd') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
echo "&#187; BC Math: ", extension_loaded('bcmath') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; XML: ", extension_loaded('xml') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; INTL: ", extension_loaded('intl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; MBString: ", extension_loaded('mbstring') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br> <br>';
echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br>';
echo "&#187; Xml: ", extension_loaded('xml') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red">Disabled &#x2717</span>', '<br><br>';
?>
User Configuration:<br>
.Browser:

2
app/Views/employees/form.php
View File

@@ -139,7 +139,7 @@
{
$lang_key = $module->module_id . '_' . $exploded_permission[1];
$lang_line = lang($lang_key);
$lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? ucwords(str_replace("_", " ",$exploded_permission[1])) : $lang_line;
$lang_line = (lang($lang_key) == $lang_line) ? ucwords(str_replace("_", " ",$exploded_permission[1])) : $lang_line;
if(!empty($lang_line))
{
?>