loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00
Code Issues Releases Activity

Correzione generazione stampe

Browse Source
This commit is contained in:
Thomas Zilio
2019-12-20 11:40:22 +01:00
parent 5efdb80fcf
commit 00cb2eb2da
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/categorie_documenti/src/Categoria.php
View File

@@ -19,12 +19,12 @@ class Categoria extends Model
$model->save();
$gruppi = database()->fetchArray('SELECT `id` FROM `zz_groups`');
foreach($gruppi as $array) {
foreach($array as $k=>$v) {
foreach ($gruppi as $array) {
foreach ($array as $k => $v) {
$newArray[$k] = $v;
}
}
$model->syncPermessi($newArray);
return $model;
@@ -33,7 +33,7 @@ class Categoria extends Model
public function syncPermessi(array $groups)
{
$groups[] = 1;
$database = database();
$database->sync('do_permessi', ['id_categoria' => $this->id], [
'id_gruppo' => $groups,

2
modules/dashboard/edit.php
View File

@@ -590,7 +590,7 @@ if (empty($domenica)) {
echo "
minTime: '".setting('Inizio orario lavorativo')."',
maxTime: '".((setting('Fine orario lavorativo') != '00:00:00' and !empty(setting('Fine orario lavorativo'))) ? setting('Fine orario lavorativo'):'23:59:59')."',
maxTime: '".((setting('Fine orario lavorativo') != '00:00:00' and !empty(setting('Fine orario lavorativo'))) ? setting('Fine orario lavorativo') : '23:59:59')."',
";
?>

28
src/Prints.php
View File

@@ -125,23 +125,25 @@ class Prints
$dbo = $database = database();
$infos = self::get($print);
Permissions::addModule($infos['id_module']);
if (!$return_string) {
Permissions::addModule($infos['id_module']);
$has_access = true;
if (!empty($infos['is_record'])) {
$module = Modules::get($infos['id_module']);
$has_access = true;
if (!empty($infos['is_record'])) {
$module = Modules::get($infos['id_module']);
Util\Query::setSegments(false);
$query = Util\Query::getQuery($module, [
'id' => $id_record,
]);
Util\Query::setSegments(true);
Util\Query::setSegments(false);
$query = Util\Query::getQuery($module, [
'id' => $id_record,
]);
Util\Query::setSegments(true);
$has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true;
}
$has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true;
}
if (empty($infos) || empty($infos['enabled']) || !Permissions::check([], false) || !$has_access) {
return false;
if (empty($infos) || empty($infos['enabled']) || !Permissions::check([], false) || !$has_access) {
return false;
}
}
// Individuazione della configurazione

2
update/v2_4_10/Article.php
View File

@@ -2,8 +2,8 @@
namespace Update\v2_4_10;
use Common\Document;
use Common\Components\Row;
use Common\Document;
use Illuminate\Database\Eloquent\Builder;
use Modules\Articoli\Articolo as Original;
use UnexpectedValueException;

2
update/v2_4_10/Components/Articolo.php
View File

@@ -2,8 +2,8 @@
namespace Update\v2_4_10\Components;
use Update\v2_4_10\Article;
use Modules\Articoli\Articolo as Original;
use Update\v2_4_10\Article;
use Update\v2_4_10\Fattura;
class Articolo extends Article