From 1037aae3c7a5c44c3a7e991fd4c16735f0a81ccf Mon Sep 17 00:00:00 2001 From: Luca <30728163+lucasalva87@users.noreply.github.com> Date: Fri, 28 Dec 2018 00:04:41 +0100 Subject: [PATCH] Migliorie minori --- mail.php | 2 +- modules/aggiornamenti/edit.php | 2 +- modules/banche/actions.php | 6 ++++-- modules/banche/add.php | 9 +++++++++ modules/banche/edit.php | 3 ++- modules/emails/edit.php | 8 ++++---- modules/fatture/edit.php | 6 +++--- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/mail.php b/mail.php index a12ca7459..a826d1eb1 100644 --- a/mail.php +++ b/mail.php @@ -81,7 +81,7 @@ echo '
- {[ "type": "checkbox", "label": "'.tr('Notifica di lettura').'", "name": "read_notify", "value": "'.$template['read_notify'].'" ]} + {[ "type": "checkbox", "label": "'.tr('Richiedi notifica di lettura').'", "name": "read_notify", "value": "'.$template['read_notify'].'" ]}
'; diff --git a/modules/aggiornamenti/edit.php b/modules/aggiornamenti/edit.php index 8c8cfad10..0376057d2 100644 --- a/modules/aggiornamenti/edit.php +++ b/modules/aggiornamenti/edit.php @@ -126,7 +126,7 @@ function search(button) { }, success: function(data){ if (data == "none") { - $("#update-search").html("'.tr('Nessun aggiornamento presente').'."); + $("#update-search").html("'.tr('Nessun aggiornamento disponibile').'."); } else { $("#update-search").html("'.tr("E' stato individuato un nuovo aggiornamento").': " + data + ".
'.tr('Scaricalo ora: _LINK_', [ '_LINK_' => "https://github.com/devcode-it/openstamanager/releases", diff --git a/modules/banche/actions.php b/modules/banche/actions.php index 005aaa3b3..42953cd19 100644 --- a/modules/banche/actions.php +++ b/modules/banche/actions.php @@ -20,7 +20,7 @@ switch (filter('op')) { $dbo->update('co_banche', $array, ['id' => $id_record]); } - flash()->info(tr('Salvataggio completato!')); + flash()->info(tr('Salvataggio completato.')); } else { flash()->error(tr('Ci sono stati alcuni errori durante il salvataggio!')); } @@ -29,9 +29,11 @@ switch (filter('op')) { case 'add': $nome = filter('nome'); + $bic = filter('bic'); + $iban = filter('iban'); if (isset($nome)) { - $dbo->query('INSERT INTO `co_banche` (`nome`) VALUES ('.prepare($nome).')'); + $dbo->query('INSERT INTO `co_banche` (`nome`, `bic`, `iban`) VALUES ('.prepare($nome).', '.prepare($bic).', '.prepare($iban).')'); $id_record = $dbo->lastInsertedID(); if (isAjaxRequest()) { diff --git a/modules/banche/add.php b/modules/banche/add.php index b69b8151a..41703d866 100644 --- a/modules/banche/add.php +++ b/modules/banche/add.php @@ -11,6 +11,15 @@ include_once __DIR__.'/../../core.php'; {[ "type": "text", "label": "", "name": "nome", "required": "1" ]} + +
+
+ {[ "type": "text", "label": "", "name": "iban", "required": "1", "class": "alphanumeric-mask", "maxlength": 32, "value": "$iban$" ]} +
+
+ {[ "type": "text", "label": "", "name": "bic", "class": "alphanumeric-mask", "maxlength": 11, "value": "$bic$" ]} +
+
diff --git a/modules/banche/edit.php b/modules/banche/edit.php index 824d78238..db5d51b53 100644 --- a/modules/banche/edit.php +++ b/modules/banche/edit.php @@ -48,7 +48,8 @@ include_once __DIR__.'/../../core.php'; fetchNum('SELECT idanagrafica FROM an_anagrafiche WHERE idbanca_vendite='.prepare($id_record).' -UNION SELECT idanagrafica FROM an_anagrafiche WHERE idbanca_acquisti='.prepare($id_record)); +UNION SELECT idanagrafica FROM an_anagrafiche WHERE idbanca_acquisti='.prepare($id_record).' +UNION SELECT idanagrafica FROM co_documenti WHERE idbanca='.prepare($id_record)); if (!empty($documenti)) { echo ' diff --git a/modules/emails/edit.php b/modules/emails/edit.php index 906dbccdc..f62df7306 100644 --- a/modules/emails/edit.php +++ b/modules/emails/edit.php @@ -30,7 +30,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "checkbox", "label": "", "name": "read_notify", "value": "$read_notify$", "placeholder": "" ]} + {[ "type": "checkbox", "label": "", "name": "read_notify", "value": "$read_notify$", "placeholder": "" ]}
@@ -47,15 +47,15 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "cc", "value": "$cc$" ]} + {[ "type": "text", "label": "", "name": "cc", "value": "$cc$", "help": "" ]}
- {[ "type": "text", "label": "", "name": "bcc", "value": "$bcc$" ]} + {[ "type": "text", "label": "", "name": "bcc", "value": "$bcc$", "help": "" ]}
- {[ "type": "email", "label": "", "name": "reply_to", "value": "$reply_to$" ]} + {[ "type": "email", "label": "", "name": "reply_to", "value": "$reply_to$", "help": "" ]}
diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index a77b9f0cf..05a6cd763 100644 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -168,7 +168,7 @@ if (empty($record['is_fiscale'])) {
- {[ "type": "select", "label": "", "name": "idbanca", "values": "query=SELECT id, CONCAT (nome, ' - ' , iban) AS descrizione FROM co_banche WHERE deleted_at IS NULL ORDER BY nome ASC", "value": "$idbanca$" ]} + {[ "type": "select", "label": "", "name": "idbanca", "values": "query=SELECT id, CONCAT (nome, ' - ' , iban) AS descrizione FROM co_banche WHERE deleted_at IS NULL ORDER BY nome ASC", "value": "$idbanca$", "icon-after": "add|" ]}
@@ -202,13 +202,13 @@ if (!empty($record['is_fiscale'])) { if (($n2 <= 0 && $record['stato'] == 'Emessa') || $differenza != 0) { ?> - ...

+ ...

- ... + ...