Compare commits

..

7 Commits

Author SHA1 Message Date
valentina dc435e1037 Fix grafico 2024-09-27 12:53:31 +02:00
valentina 6ed5d66ac2 Fix minore 2024-09-27 12:11:26 +02:00
Beppe c24268f82c Merge branch 'master' of https://github.com/devcode-it/openstamanager 2024-09-27 10:02:34 +02:00
Beppe 1cfee92c8d Fix opzioni selettore mappa 2024-09-27 10:02:31 +02:00
valentina d35f534b49 Fix minore registrazione contabile 2024-09-27 09:37:59 +02:00
FabioL 37c6cd28c5 Modifica impostazione predefinita 2024-09-27 09:27:54 +02:00
FabioL 251cc7f892 Fix sezione impostazione 2024-09-27 09:15:53 +02:00
4 changed files with 9 additions and 9 deletions

View File

@ -63,7 +63,7 @@ echo '
</div>
<div class="col-md-6">
{[ "type": "text", "label": "'.tr('Nome').'", "name": "name", "required": 1, "value": "$title$" ]}
{[ "type": "text", "label": "'.tr('Nome').'", "name": "name", "required": 1, "value": "$name$" ]}
</div>
</div>

View File

@ -197,7 +197,7 @@ class Mastrino extends Model
}
foreach ($scadenze as $scadenza) {
$totale_da_distribuire += ($movimento['totale'] != 0 ? Movimento::where('id_scadenza', '=', $scadenza->id)
$totale_da_distribuire = ($movimento['totale'] != 0 ? Movimento::where('id_scadenza', '=', $scadenza)
->where('totale', '>', 0)
->sum('totale') : 0);
}

View File

@ -49,16 +49,16 @@ class EmailManager implements ManagerInterface
// Codice HTML
$result = '
<div class="box box-info collapsable collapsed-box">
<div class="box-header with-border">
<h3 class="box-title"><i class="fa fa-envelope"></i> '.tr('Email inviate: _NUM_', [
<div class="card card-info collapsable collapsed-card">
<div class="card-header with-border">
<h3 class="card-title"><i class="fa fa-envelope"></i> '.tr('Email inviate: _NUM_', [
'_NUM_' => $emails->count(),
]).'</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button>
<div class="card-tools pull-right">
<button type="button" class="btn btn-card-tool" data-card-widget="collapse"><i class="fa fa-plus"></i></button>
</div>
</div>
<div class="box-body">
<div class="card-body">
<ul>';
foreach ($emails as $email) {

View File

@ -17,7 +17,7 @@ ORDER BY
-- Geolocalizzazione automatica
INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `order`) VALUES
(NULL, 'Geolocalizzazione automatica', '1', 'boolean', '1', 'Anagrafiche', NULL),
(NULL, 'Gestore mappa', 'Google Maps', 'list[Google Maps, OpenStreetMap]', '1', 'Generale', NULL);
(NULL, 'Gestore mappa', 'OpenStreetMap', 'list[Google Maps,OpenStreetMap]', '1', 'Generali', NULL);
INSERT INTO `zz_settings_lang` (`id`, `id_lang`, `id_record`, `title`, `help`) VALUES (NULL, '1', (SELECT `zz_settings`.`id` FROM `zz_settings` WHERE `zz_settings`.`nome` = 'Geolocalizzazione automatica'), 'Geolocalizzazione automatica', '');