Skip to content

Commit b93cda4

Browse files
committed
fix: aggiunta causali movimenti
1 parent f040526 commit b93cda4

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

modules/articoli/src/CausaleMovimento.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ class CausaleMovimento extends Model
3434
protected static $translated_fields = [
3535
'title',
3636
];
37+
public static function build($name = null)
38+
{
39+
$model = new static();
40+
$model->name = $name;
41+
$model->save();
42+
43+
return $model;
44+
}
3745

3846
public function getModuleAttribute()
3947
{

modules/causali_movimenti/actions.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,14 @@
3030
$causale_new = Causale::where('id', '=', (new Causale())->getByField('title', $nome))->where('id', '!=', $id_record)->first();
3131
if (empty($causale_new)) {
3232
$causale->tipo_movimento = post('tipo_movimento');
33-
$causale->setTranslation('title', $nome);
33+
if (Models\Locale::getDefault()->id == Models\Locale::getPredefined()->id) {
34+
$causale->name = $nome;
35+
}
3436
$causale->setTranslation('description', $descrizione);
3537
$causale->save();
38+
39+
$causale->setTranslation('title', $nome);
40+
3641
flash()->info(tr('Salvataggio completato.'));
3742
} else {
3843
flash()->error(tr("E' già presente una causale con nome _NAME_.", [
@@ -46,15 +51,15 @@
4651
break;
4752

4853
case 'add':
54+
$nome = post('nome');
4955
$descrizione = post('descrizione');
50-
if (empty(Causale::where('id', '=', (new Causale())->getByField('title', $descrizione))->where('id', '!=', $id_record)->first())) {
51-
$causale = Causale::build();
56+
if (empty(Causale::where('id', '=', (new Causale())->getByField('title', $nome))->where('id', '!=', $id_record)->first())) {
57+
$causale = Causale::build($nome);
5258
$causale->tipo_movimento = post('tipo_movimento');
5359
$causale->save();
5460
$id_record = $dbo->lastInsertedID();
55-
$causale->setTranslation('title', post('nome'));
61+
5662
$causale->setTranslation('description', $descrizione);
57-
$causale->save();
5863

5964
if (isAjaxRequest()) {
6065
echo json_encode(['id' => $id_record, 'text' => $descrizione]);

update/2_9_3.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ ORDER BY
220220
`name`' WHERE `zz_modules`.`name` = 'Marche';
221221

222222
ALTER TABLE `in_fasceorarie` ADD `name` VARCHAR(255) NOT NULL AFTER `id`;
223+
ALTER TABLE `mg_causali_movimenti` ADD `name` VARCHAR(255) NOT NULL AFTER `id`;
223224

224225
-- Indici per categoria e sottocategoria
225226
ALTER TABLE `mg_articoli` ADD INDEX `idx_id_categoria` (`id_categoria`);

0 commit comments

Comments
 (0)