From 81811ff293530d53e4f407ff8733e428bb2bfa6f Mon Sep 17 00:00:00 2001
From: Luca <lucasalva87@users.noreply.github.com>
Date: Fri, 2 Mar 2018 17:45:35 +0100
Subject: [PATCH] =?UTF-8?q?Aggiunta=20possibilit=C3=A0=20di=20aggiungere?=
 =?UTF-8?q?=20le=20zone=20dalla=20scheda=20anagrafica?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/anagrafiche/edit.php | 2 +-
 modules/emails/edit.php      | 6 +++---
 modules/zone/actions.php     | 6 ++++++
 modules/zone/add.php         | 2 +-
 modules/zone/edit.php        | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index 9dd7b12eb..4b5c2321e 100644
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -145,7 +145,7 @@ if (!$cliente) {
 				</div>
 
 				<div class="col-md-4">
-					{[ "type": "select", "label": "<?php echo tr('Zona'); ?>", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( ' - ', nome, descrizione) AS descrizione FROM an_zone ORDER BY descrizione ASC", "value": "$idzona$" ]}
+					{[ "type": "select", "label": "<?php echo tr('Zona'); ?>", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( ' - ', nome, descrizione) AS descrizione FROM an_zone ORDER BY descrizione ASC", "value": "$idzona$", "icon-after": "add|<?php echo Modules::get('Zone')['id']; ?>" ]}
 				</div>
 			</div>
 		</div>
diff --git a/modules/emails/edit.php b/modules/emails/edit.php
index 319656c6c..b8a772573 100644
--- a/modules/emails/edit.php
+++ b/modules/emails/edit.php
@@ -43,7 +43,7 @@ echo '
                 </div>
 
                 <div class="col-md-4">
-                    {[ "type": "text", "label": "<?php echo tr('Icona'); ?>", "name": "icon", "value": "$icon$" ]}
+                    {[ "type": "text", "label": "<?php echo tr('Icona'); ?>", "name": "icon", "value": "$icon$" ,"help":"<?php echo tr('Es. \'fa fa-envelope\''); ?>" ]}
                 </div>
             </div>
 
@@ -53,11 +53,11 @@ echo '
                 </div>
 
                 <div class="col-md-4">
-                    {[ "type": "text", "label": "<?php echo tr('BCC'); ?>", "name": "port", "value": "$bcc$" ]}
+                    {[ "type": "text", "label": "<?php echo tr('BCC'); ?>", "name": "bcc", "value": "$bcc$" ]}
                 </div>
 
                 <div class="col-md-4">
-                    {[ "type": "text", "label": "<?php echo tr('Reply to'); ?>", "name": "reply_to", "value": "$reply_to$" ]}
+                    {[ "type": "email", "label": "<?php echo tr('Reply to'); ?>", "name": "reply_to", "value": "$reply_to$" ]}
                 </div>
             </div>
 
diff --git a/modules/zone/actions.php b/modules/zone/actions.php
index 779631c45..e5348c92f 100644
--- a/modules/zone/actions.php
+++ b/modules/zone/actions.php
@@ -40,6 +40,12 @@ switch (post('op')) {
 
             $_SESSION['infos'][] = tr('Aggiunta una nuova zona!');
         }
+		
+		
+		if (isAjaxRequest()) {
+            echo json_encode(['id' => $id_record, 'text' => $nome.' - '.$descrizione]);
+        }
+		
         break;
 
     case 'delete':
diff --git a/modules/zone/add.php b/modules/zone/add.php
index 4d007eba2..dea2fd942 100644
--- a/modules/zone/add.php
+++ b/modules/zone/add.php
@@ -8,7 +8,7 @@ include_once __DIR__.'/../../core.php';
 
 	<div class="row">
 		<div class="col-md-4">
-			{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "nome", "required": 1, "value": "" ]}
+			{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "nome", "required": 1, "maxlength": 25, "class": "alphanumeric-mask", "value": "" ]}
 		</div>
 
 		<div class="col-md-8">
diff --git a/modules/zone/edit.php b/modules/zone/edit.php
index 01a5ba248..f6bcf9596 100644
--- a/modules/zone/edit.php
+++ b/modules/zone/edit.php
@@ -10,7 +10,7 @@ include_once __DIR__.'/../../core.php';
 
 	<div class="row">
 		<div class="col-md-4">
-			{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "nome", "required": 1, "value": "$nome$" ]}
+			{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "nome",  "required": 1,  "maxlength": 25, "class": "alphanumeric-mask", "value": "$nome$" ]}
 		</div>
 
 		<div class="col-md-8">