diff --git a/assets/src/js/functions/input.js b/assets/src/js/functions/input.js index c840a2047..f35c14e1b 100644 --- a/assets/src/js/functions/input.js +++ b/assets/src/js/functions/input.js @@ -20,6 +20,10 @@ function start_inputmask(element) { regex: "[A-Za-z0-9#_|\/\\-.]*", }).addClass('bound'); + $(element + '.math-mask').not('.bound').inputmask('Regex', { + regex: "[0-9,.+\-]*", + }).addClass('bound'); + if (globals.is_mobile) { $(element + '.inputmask-decimal, ' + element + '.date-mask, ' + element + '.timestamp-mask').each(function () { $(this).attr('type', 'tel'); diff --git a/config/namespaces.php b/config/namespaces.php index 82d49225c..47f2c87d7 100644 --- a/config/namespaces.php +++ b/config/namespaces.php @@ -30,6 +30,7 @@ return [ 'modules/stati_contratto' => 'Modules\StatiContratto', 'modules/tipi_intervento' => 'Modules\TipiIntervento', 'modules/categorie_documenti' => 'Modules\CategorieDocumentali', + 'modules/listini' => 'Modules\Listini', 'plugins/exportFE' => 'Plugins\ExportFE', 'plugins/importFE' => 'Plugins\ImportFE', 'plugins/receiptFE' => 'Plugins\ReceiptFE', diff --git a/modules/listini/actions.php b/modules/listini/actions.php index 5593ddba4..76a7898f1 100644 --- a/modules/listini/actions.php +++ b/modules/listini/actions.php @@ -2,40 +2,35 @@ include_once __DIR__.'/../../core.php'; +use Modules\Listini\Listino; + switch (post('op')) { case 'update': - $nome = post('nome'); - $prc_guadagno = post('prc_guadagno'); - $note = post('note'); + $listino->nome = post('nome'); + $listino->note = post('note'); - if (abs($prc_guadagno) > 100) { - $prc_guadagno = ($prc_guadagno > 0) ? 100 : -100; - } + $listino->percentuale = post('prc_guadagno'); + $listino->percentuale_combinato = post('prc_combinato'); - $query = 'UPDATE mg_listini SET nome='.prepare($nome).', prc_guadagno='.prepare($prc_guadagno).', note='.prepare($note).' WHERE id='.prepare($id_record); - $dbo->query($query); + $listino->save(); flash()->info(tr('Informazioni salvate correttamente!')); break; case 'add': - $nome = post('nome'); - $prc_guadagno = post('prc_guadagno'); + $listino = Listino::build(post('nome'), post('prc_guadagno')); - if (abs($prc_guadagno) > 100) { - $prc_guadagno = ($prc_guadagno > 0) ? 100 : -100; - } + $listino->percentuale_combinato = post('prc_combinato'); - if (isset($nome)) { - $dbo->query('INSERT INTO mg_listini( nome, prc_guadagno ) VALUES ('.prepare($nome).', '.prepare($prc_guadagno).')'); - $id_record = $dbo->lastInsertedID(); + $listino->save(); + $id_record = $listino->id; - flash()->info(tr('Nuovo listino aggiunto!')); - } + flash()->info(tr('Nuovo listino aggiunto!')); break; case 'delete': - $dbo->query('DELETE FROM mg_listini WHERE id='.prepare($id_record)); + $listino->delete(); + flash()->info(tr('Listino eliminato!')); break; } diff --git a/modules/listini/add.php b/modules/listini/add.php index d10f21812..e25d9137a 100644 --- a/modules/listini/add.php +++ b/modules/listini/add.php @@ -7,11 +7,15 @@ include_once __DIR__.'/../../core.php';