From 70cf3401b4bc431ffdd405b0d40e2efbf44670f3 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 2 Mar 2018 16:57:14 +0100 Subject: [PATCH] Fix vari --- lib/functions.js | 3 ++- modules/anagrafiche/edit.php | 4 ++-- modules/stati_intervento/add.php | 2 +- update/2_4.sql | 6 +++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/functions.js b/lib/functions.js index e88930bc4..1a16f2421 100644 --- a/lib/functions.js +++ b/lib/functions.js @@ -1003,7 +1003,8 @@ function start_inputmask(element) { }); $(element+'.alphanumeric-mask').inputmask('Regex', { - regex: "[A-Za-z0-9]{10}", + regex: "[A-Za-z0-9]*", + casing: "upper", }); if (isMobile.any()) { diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php index 6c0b8dc31..9dd7b12eb 100644 --- a/modules/anagrafiche/edit.php +++ b/modules/anagrafiche/edit.php @@ -47,11 +47,11 @@ if (!$cliente) {
- {[ "type": "text", "label": "", "maxlength": 13, "name": "piva", "class": "text-center text-uppercase", "value": "$piva$" ]} + {[ "type": "text", "label": "", "maxlength": 13, "name": "piva", "class": "text-center alphanumeric-mask", "value": "$piva$" ]}
- {[ "type": "text", "label": "", "maxlength": 16, "name": "codice_fiscale", "class": "text-center text-uppercase", "value": "$codice_fiscale$" ]} + {[ "type": "text", "label": "", "maxlength": 16, "name": "codice_fiscale", "class": "text-center alphanumeric-mask", "value": "$codice_fiscale$" ]}
diff --git a/modules/stati_intervento/add.php b/modules/stati_intervento/add.php index 2d736bb4f..f4f6f659b 100644 --- a/modules/stati_intervento/add.php +++ b/modules/stati_intervento/add.php @@ -8,7 +8,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "idstatointervento", "class": "alphanumeric-mask", "required": 1, "value": "" ]} + {[ "type": "text", "label": "", "name": "idstatointervento", "maxlength": 10, "class": "alphanumeric-mask", "required": 1, "value": "" ]}
diff --git a/update/2_4.sql b/update/2_4.sql index a426ba39b..353353c9f 100644 --- a/update/2_4.sql +++ b/update/2_4.sql @@ -273,4 +273,8 @@ INSERT INTO `zz_email_print` (`id`, `id_email`, `id_print`) VALUES INSERT INTO `zz_settings` (`idimpostazione`, `nome`, `valore`, `tipo`, `editable`, `sezione`) VALUES (NULL, 'apilayer API key for Email', '', 'string', '1', 'Generali'); -- apilayer API key (per validazione piva) -INSERT INTO `zz_settings` (`idimpostazione`, `nome`, `valore`, `tipo`, `editable`, `sezione`) VALUES (NULL, 'apilayer API key for VAT number', '', 'string', '1', 'Generali'); \ No newline at end of file +INSERT INTO `zz_settings` (`idimpostazione`, `nome`, `valore`, `tipo`, `editable`, `sezione`) VALUES (NULL, 'apilayer API key for VAT number', '', 'string', '1', 'Generali'); + +-- +-- Aggiorno query modulo movimenti per ordinarli in funzione della data del movimento +UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `mg_movimenti` JOIN `mg_articoli` ON `mg_articoli`.id = `mg_movimenti`.`idarticolo` WHERE 1=1 HAVING 2=2 ORDER BY `Data` DESC' WHERE `zz_modules`.`name` = 'Movimenti';