diff --git a/public/userarea/quotations.php b/public/userarea/quotations.php
index f2d9b43..067fe1c 100644
--- a/public/userarea/quotations.php
+++ b/public/userarea/quotations.php
@@ -1,15 +1,15 @@
 <?php
-// Abilita errori per debug
+// Debug
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 error_reporting(E_ALL);
 ini_set('log_errors', 1);
 ini_set('error_log', __DIR__ . '/quotations_debug.log');
+
 if (!file_exists(__DIR__ . '/quotations_debug.log')) {
     file_put_contents(__DIR__ . '/quotations_debug.log', "Inizio operazioni alle " . date('Y-m-d H:i:s') . "\n", FILE_APPEND);
 }
 
-// Log iniziale
 error_log("Inizio operazioni alle " . date('Y-m-d H:i:s'));
 
 include('include/headscript.php');
@@ -17,86 +17,201 @@ include('include/headscript.php');
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
 
-// Recupera l'ID dell'utente loggato
 $user_id = $iduserlogin ?? 1;
 
-// Gestione creazione nuova quotation (crea record vuoto su conferma)
-if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'create') {
-    $description = '';
-    $customer = '';
+/**
+ * Helper redirect
+ */
+function redirectWithMessage($status, $message, $extraQuery = '')
+{
+    $url = 'quotations.php?status=' . urlencode($status) . '&message=' . urlencode($message);
+
+    if ($extraQuery !== '') {
+        $url .= '&' . ltrim($extraQuery, '&');
+    }
+
+    header("Location: " . $url);
+    exit;
+}
+
+/**
+ * CREATE quotation
+ * Ora description e customer vengono salvati subito dal modale.
+ */
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && ($_POST['action'] ?? '') === 'create') {
+    $description = trim($_POST['description'] ?? '');
+    $customer = trim($_POST['customer'] ?? '');
+
+    if ($description === '' || $customer === '') {
+        redirectWithMessage('error', 'Descrizione e Cliente sono obbligatori');
+    }
 
     try {
-        $stmt = $pdo->prepare("INSERT INTO quotations (description, customer, iduser) VALUES (?, ?, ?)");
-        $success = $stmt->execute([$description, $customer, $user_id]);
+        $stmt = $pdo->prepare("
+            INSERT INTO quotations 
+                (description, customer, iduser) 
+            VALUES 
+                (?, ?, ?)
+        ");
+
+        $success = $stmt->execute([
+            $description,
+            $customer,
+            $user_id
+        ]);
+
         if ($success) {
             $newId = $pdo->lastInsertId();
-            error_log("Creata nuova quotation ID: $newId");
-            header("Location: quotations.php?edit_id=" . $newId . "&status=success&message=" . urlencode("Quotation creata con successo"));
-        } else {
-            error_log("Errore: Impossibile creare la quotation, nessun ID generato.");
-            header("Location: quotations.php?status=error&message=" . urlencode("Errore durante la creazione della quotation"));
+            error_log("Creata nuova quotation ID: " . $newId);
+
+            redirectWithMessage('success', 'Quotation creata con successo');
         }
+
+        error_log("Errore: impossibile creare la quotation");
+        redirectWithMessage('error', 'Errore durante la creazione della quotation');
     } catch (PDOException $e) {
         error_log("Errore PDO durante la creazione della quotation: " . $e->getMessage());
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+        redirectWithMessage('error', 'Errore database: ' . $e->getMessage());
     }
-    exit;
 }
 
-// Gestione modifica quotation
-if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'update' && isset($_POST['id'])) {
+/**
+ * UPDATE quotation
+ * Gestisce sia form normale sia salvataggio inline AJAX.
+ */
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && ($_POST['action'] ?? '') === 'update' && isset($_POST['id'])) {
     $id = intval($_POST['id']);
-    $description = $_POST['description'] ?? '';
-    $customer = $_POST['customer'] ?? '';
+    $description = trim($_POST['description'] ?? '');
+    $customer = trim($_POST['customer'] ?? '');
+    $isAjax = isset($_POST['ajax']) && $_POST['ajax'] === '1';
+
+    if ($description === '' || $customer === '') {
+        if ($isAjax) {
+            header('Content-Type: application/json');
+            echo json_encode([
+                'success' => false,
+                'message' => 'Descrizione e Cliente sono obbligatori'
+            ]);
+            exit;
+        }
+
+        redirectWithMessage('error', 'Descrizione e Cliente sono obbligatori');
+    }
 
     try {
-        $stmt = $pdo->prepare("UPDATE quotations SET description = ?, customer = ? WHERE id = ? AND iduser = ?");
-        $stmt->execute([$description, $customer, $id, $user_id]);
-        error_log("Modificata quotation ID: $id");
-        header("Location: quotations.php?status=success&message=" . urlencode("Quotation modificata con successo"));
+        $stmt = $pdo->prepare("
+            UPDATE quotations 
+            SET description = ?, customer = ? 
+            WHERE id = ? AND iduser = ?
+        ");
+
+        $stmt->execute([
+            $description,
+            $customer,
+            $id,
+            $user_id
+        ]);
+
+        error_log("Modificata quotation ID: " . $id);
+
+        if ($isAjax) {
+            header('Content-Type: application/json');
+            echo json_encode([
+                'success' => true,
+                'message' => 'Quotation modificata con successo'
+            ]);
+            exit;
+        }
+
+        redirectWithMessage('success', 'Quotation modificata con successo');
     } catch (PDOException $e) {
         error_log("Errore PDO durante la modifica della quotation: " . $e->getMessage());
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+
+        if ($isAjax) {
+            header('Content-Type: application/json');
+            echo json_encode([
+                'success' => false,
+                'message' => 'Errore database: ' . $e->getMessage()
+            ]);
+            exit;
+        }
+
+        redirectWithMessage('error', 'Errore database: ' . $e->getMessage());
     }
-    exit;
 }
 
-// Gestione cancellazione quotation
-if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'delete' && isset($_POST['id'])) {
+/**
+ * DELETE quotation
+ */
+if ($_SERVER['REQUEST_METHOD'] === 'POST' && ($_POST['action'] ?? '') === 'delete' && isset($_POST['id'])) {
     $id = intval($_POST['id']);
 
     try {
-        $stmt = $pdo->prepare("DELETE FROM quotations WHERE id = ? AND iduser = ?");
-        $stmt->execute([$id, $user_id]);
-        error_log("Cancellata quotation ID: $id");
-        header("Location: quotations.php?status=success&message=" . urlencode("Quotation cancellata con successo"));
+        $stmt = $pdo->prepare("
+            DELETE FROM quotations 
+            WHERE id = ? AND iduser = ?
+        ");
+
+        $stmt->execute([
+            $id,
+            $user_id
+        ]);
+
+        error_log("Cancellata quotation ID: " . $id);
+
+        redirectWithMessage('success', 'Quotation cancellata con successo');
     } catch (PDOException $e) {
         error_log("Errore PDO durante la cancellazione della quotation: " . $e->getMessage());
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+        redirectWithMessage('error', 'Errore database: ' . $e->getMessage());
     }
-    exit;
 }
 
-// Recupera tutte le quotations per l'utente
+/**
+ * Recupera tutte le quotations dell'utente.
+ * Ultima creata in alto.
+ */
 try {
-    $stmt = $pdo->prepare("SELECT * FROM quotations WHERE iduser = ? ORDER BY creation_date DESC");
-    $stmt->execute([$user_id]);
+    $stmt = $pdo->prepare("
+        SELECT * 
+        FROM quotations 
+        WHERE iduser = ? 
+        ORDER BY creation_date DESC, id DESC
+    ");
+
+    $stmt->execute([
+        $user_id
+    ]);
+
     $quotations = $stmt->fetchAll(PDO::FETCH_ASSOC);
 } catch (PDOException $e) {
     error_log("Errore PDO durante il recupero delle quotations: " . $e->getMessage());
     $quotations = [];
 }
 
-// Verifica se è richiesta la modifica di una quotation
+/**
+ * Recupera quotation in modifica dettagliata
+ */
 $editQuotation = null;
+
 if (isset($_GET['edit_id'])) {
     $editId = intval($_GET['edit_id']);
+
     try {
-        $stmt = $pdo->prepare("SELECT * FROM quotations WHERE id = ? AND iduser = ?");
-        $stmt->execute([$editId, $user_id]);
+        $stmt = $pdo->prepare("
+            SELECT * 
+            FROM quotations 
+            WHERE id = ? AND iduser = ?
+        ");
+
+        $stmt->execute([
+            $editId,
+            $user_id
+        ]);
+
         $editQuotation = $stmt->fetch(PDO::FETCH_ASSOC);
+
         if (!$editQuotation) {
-            error_log("Nessuna quotation trovata per id: $editId");
+            error_log("Nessuna quotation trovata per id: " . $editId);
         }
     } catch (PDOException $e) {
         error_log("Errore PDO durante il recupero della quotation per modifica: " . $e->getMessage());
@@ -112,10 +227,14 @@ if (isset($_GET['edit_id'])) {
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
+
     <?php include('cssinclude.php'); ?>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2Lw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
+
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
+
     <style>
         .cell-changed {
             background-color: #fff3b0 !important;
@@ -123,12 +242,14 @@ if (isset($_GET['edit_id'])) {
         }
 
         input.manual-input,
-        select.manual-input {
+        select.manual-input,
+        textarea.manual-input {
             background-color: #fff3cd;
         }
 
         input.required-input,
-        select.required-input {
+        select.required-input,
+        textarea.required-input {
             background-color: #f8d7da;
         }
 
@@ -143,6 +264,10 @@ if (isset($_GET['edit_id'])) {
             font-size: 14px;
         }
 
+        textarea {
+            resize: vertical;
+        }
+
         .action-btn {
             padding: 6px 8px;
             margin-right: 5px;
@@ -150,7 +275,12 @@ if (isset($_GET['edit_id'])) {
             border-radius: 5px;
             cursor: pointer;
             width: 35px;
+            height: 35px;
             box-sizing: border-box;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            text-decoration: none;
         }
 
         .save-btn {
@@ -170,6 +300,11 @@ if (isset($_GET['edit_id'])) {
 
         .parts-btn {
             background-color: #ffc107;
+            color: #212529;
+        }
+
+        .edit-detail-btn {
+            background-color: #6c757d;
             color: white;
         }
 
@@ -184,8 +319,7 @@ if (isset($_GET['edit_id'])) {
         }
 
         .form-group textarea {
-            height: 100px;
-            resize: vertical;
+            min-height: 100px;
         }
 
         .flash-success {
@@ -197,43 +331,6 @@ if (isset($_GET['edit_id'])) {
             margin-top: 20px;
         }
 
-        .modal {
-            display: none;
-            position: fixed;
-            z-index: 1050;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            overflow: auto;
-            background-color: rgba(0, 0, 0, 0.5);
-        }
-
-        .modal-content {
-            background-color: #fefefe;
-            margin: 15% auto;
-            padding: 20px;
-            border: 1px solid #888;
-            width: 80%;
-            max-width: 600px;
-            border-radius: 8px;
-            position: relative;
-        }
-
-        .close-btn {
-            color: #aaa;
-            float: right;
-            font-size: 28px;
-            font-weight: bold;
-            cursor: pointer;
-        }
-
-        .close-btn:hover,
-        .close-btn:focus {
-            color: #000;
-            text-decoration: none;
-        }
-
         .modal.fade {
             z-index: 1060 !important;
         }
@@ -263,7 +360,83 @@ if (isset($_GET['edit_id'])) {
             color: #721c24;
             border: 1px solid #f5c6cb;
         }
+
+        #quotationsTable textarea {
+            min-height: 60px;
+        }
+
+        .modal-body textarea {
+            min-height: 120px;
+        }
+
+        /* =========================================================
+   FIX PHOTOS MODAL
+   The photos modal used by photos.js is not a standard Bootstrap modal.
+   Without this scoped CSS it can appear full screen.
+   ========================================================= */
+
+        #photosModal,
+        #photoModal,
+        #imageModal,
+        #annotationsModal {
+            display: none;
+            position: fixed;
+            z-index: 1070 !important;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+            background-color: rgba(0, 0, 0, 0.5);
+        }
+
+        #photosModal .modal-content,
+        #photoModal .modal-content,
+        #imageModal .modal-content,
+        #annotationsModal .modal-content {
+            background-color: #ffffff;
+            margin: 5% auto;
+            padding: 20px;
+            border: 1px solid #888;
+            width: 90%;
+            max-width: 900px;
+            border-radius: 8px;
+            position: relative;
+        }
+
+        /* If the modal contains images/canvas, avoid overflow */
+        #photosModal img,
+        #photoModal img,
+        #imageModal img,
+        #annotationsModal img,
+        #photosModal canvas,
+        #photoModal canvas,
+        #imageModal canvas,
+        #annotationsModal canvas {
+            max-width: 100%;
+            height: auto;
+        }
+
+        /* Close button used by custom photo modal */
+        #photosModal .close-btn,
+        #photoModal .close-btn,
+        #imageModal .close-btn,
+        #annotationsModal .close-btn {
+            color: #aaa;
+            float: right;
+            font-size: 28px;
+            font-weight: bold;
+            cursor: pointer;
+        }
+
+        #photosModal .close-btn:hover,
+        #photoModal .close-btn:hover,
+        #imageModal .close-btn:hover,
+        #annotationsModal .close-btn:hover {
+            color: #000;
+        }
     </style>
+
     <title>Gestione Quotations - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
 
@@ -271,50 +444,100 @@ if (isset($_GET['edit_id'])) {
     <div class="wrapper">
         <?php include('include/navbar.php'); ?>
         <?php include('include/topbar.php'); ?>
+
         <div class="page-wrapper">
             <div class="page-content">
                 <div class="card radius-10">
                     <div class="card-header">
-                        <div class="d-flex align-items-center">
+                        <div class="d-flex align-items-center justify-content-between">
                             <div>
                                 <h6 class="mb-0">Gestione Quotations</h6>
                             </div>
+
+                            <?php if (!$editQuotation): ?>
+                                <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal">
+                                    <i class="fas fa-plus me-1"></i> Crea Nuova Quotation
+                                </button>
+                            <?php endif; ?>
                         </div>
                     </div>
+
                     <div class="card-body">
+
                         <?php if (isset($_GET['status']) && isset($_GET['message'])): ?>
-                            <div class="alert alert-<?= $_GET['status'] === 'success' ? 'success' : 'danger' ?>">
-                                <?= htmlspecialchars(urldecode($_GET['message'])) ?>
+                            <div class="alert alert-<?= $_GET['status'] === 'success' ? 'success' : 'danger' ?> temp-alert">
+                                <?= htmlspecialchars(urldecode($_GET['message']), ENT_QUOTES, 'UTF-8') ?>
                             </div>
                         <?php endif; ?>
+
                         <?php if ($editQuotation): ?>
-                            <!-- Modifica Quotation -->
-                            <h6 class="mb-3">Modifica Quotation ID: <?= $editQuotation['id'] ?></h6>
-                            <form id="editForm" method="post">
+
+                            <h6 class="mb-3">
+                                Modifica Quotation ID: <?= htmlspecialchars($editQuotation['id'], ENT_QUOTES, 'UTF-8') ?>
+                            </h6>
+
+                            <form id="editForm" method="post" action="quotations.php">
                                 <input type="hidden" name="action" value="update">
-                                <input type="hidden" name="id" value="<?= $editQuotation['id'] ?>">
+                                <input type="hidden" name="id" value="<?= htmlspecialchars($editQuotation['id'], ENT_QUOTES, 'UTF-8') ?>">
+
                                 <div class="form-group">
                                     <label for="description">Descrizione</label>
-                                    <textarea id="description" name="description" class="manual-input required-input" required><?= htmlspecialchars($editQuotation['description']) ?></textarea>
+                                    <textarea
+                                        id="description"
+                                        name="description"
+                                        class="manual-input required-input"
+                                        required><?= htmlspecialchars($editQuotation['description'] ?? '', ENT_QUOTES, 'UTF-8') ?></textarea>
                                 </div>
+
                                 <div class="form-group">
                                     <label for="customer">Cliente</label>
-                                    <input type="text" id="customer" name="customer" class="manual-input required-input" value="<?= htmlspecialchars($editQuotation['customer']) ?>" required>
+                                    <input
+                                        type="text"
+                                        id="customer"
+                                        name="customer"
+                                        class="manual-input required-input"
+                                        value="<?= htmlspecialchars($editQuotation['customer'] ?? '', ENT_QUOTES, 'UTF-8') ?>"
+                                        required>
                                 </div>
-                                <button type="submit" class="btn btn-primary">Salva Modifiche</button>
-                                <a href="quotations.php" class="btn btn-secondary">Torna alla Lista</a>
+
+                                <button type="submit" class="btn btn-primary">
+                                    Salva Modifiche
+                                </button>
+
+                                <a href="quotations.php" class="btn btn-secondary">
+                                    Torna alla Lista
+                                </a>
                             </form>
+
                             <div class="quotation-actions">
                                 <h6 class="mb-3">Azioni</h6>
-                                <button type="button" class="photos-btn action-btn" data-row="0" data-idquotations="<?= $editQuotation['id'] ?>" style="background: #007bff; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-camera"></i></button>
-                                <button type="button" class="parts-btn action-btn" data-iddatadb="" data-idquotations="<?= $editQuotation['id'] ?>" data-row="0">Parti</button>
+
+                                <button
+                                    type="button"
+                                    class="photos-btn action-btn"
+                                    data-entity-type="quotation"
+                                    data-row="0"
+                                    data-idquotations="<?= htmlspecialchars($editQuotation['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                    title="Photos">
+                                    <i class="fas fa-camera"></i>
+                                </button>
+
+                                <button
+                                    type="button"
+                                    class="parts-btn action-btn"
+                                    data-entity-type="quotation"
+                                    data-iddatadb=""
+                                    data-idquotations="<?= htmlspecialchars($editQuotation['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                    data-row="0"
+                                    title="Parts">
+                                    <i class="fas fa-puzzle-piece"></i>
+                                </button>
                             </div>
+
                         <?php else: ?>
-                            <!-- Lista Quotations -->
-                            <div class="mb-3">
-                                <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal">Crea Nuova Quotation</button>
-                            </div>
+
                             <h6 class="mb-3">Quotations Esistenti</h6>
+
                             <table id="quotationsTable" class="table table-striped table-bordered">
                                 <thead>
                                     <tr>
@@ -325,110 +548,246 @@ if (isset($_GET['edit_id'])) {
                                         <th>Azioni</th>
                                     </tr>
                                 </thead>
+
                                 <tbody>
                                     <?php foreach ($quotations as $index => $row): ?>
-                                        <tr data-id="<?= $row['id'] ?>">
-                                            <td><?= htmlspecialchars($row['id']) ?></td>
-                                            <td><?= htmlspecialchars($row['creation_date']) ?></td>
+                                        <tr data-id="<?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?>">
+                                            <td><?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?></td>
+
+                                            <td><?= htmlspecialchars($row['creation_date'] ?? '', ENT_QUOTES, 'UTF-8') ?></td>
+
                                             <td>
-                                                <textarea name="description" class="cell-input manual-input form-control"><?= htmlspecialchars($row['description']) ?></textarea>
+                                                <textarea
+                                                    name="description"
+                                                    class="cell-input manual-input form-control"
+                                                    required><?= htmlspecialchars($row['description'] ?? '', ENT_QUOTES, 'UTF-8') ?></textarea>
                                             </td>
+
                                             <td>
-                                                <input type="text" name="customer" class="cell-input manual-input form-control" value="<?= htmlspecialchars($row['customer']) ?>">
+                                                <input
+                                                    type="text"
+                                                    name="customer"
+                                                    class="cell-input manual-input form-control"
+                                                    value="<?= htmlspecialchars($row['customer'] ?? '', ENT_QUOTES, 'UTF-8') ?>"
+                                                    required>
                                             </td>
+
                                             <td>
-                                                <button type="button" class="save-btn action-btn edit-btn" data-id="<?= $row['id'] ?>" title="Salva Modifiche"><i class="fas fa-save"></i></button>
-                                                <button type="button" class="delete-btn action-btn" data-id="<?= $row['id'] ?>" title="Cancella" data-bs-toggle="modal" data-bs-target="#deleteModal"><i class="fas fa-trash"></i></button>
-                                                <button type="button" class="photos-btn action-btn" data-entity-type="quotation" data-idquotations="<?= $row['id'] ?>" data-row="<?= $index ?>" title="Photos"><i class="fas fa-camera"></i></button>
-                                                <button type="button" class="parts-btn action-btn" data-entity-type="quotation" data-idquotations="<?= $row['id'] ?>" data-row="<?= $index ?>" title="Parts"><i class="fas fa-puzzle-piece"></i></button>
-                                                <a href="quotations.php?edit_id=<?= $row['id'] ?>" class="btn btn-secondary action-btn" title="Modifica Dettagliata"><i class="fas fa-edit"></i></a>
+                                                <button
+                                                    type="button"
+                                                    class="save-btn action-btn edit-btn"
+                                                    data-id="<?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                                    title="Salva Modifiche">
+                                                    <i class="fas fa-save"></i>
+                                                </button>
+
+                                                <button
+                                                    type="button"
+                                                    class="delete-btn action-btn"
+                                                    data-id="<?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                                    title="Cancella"
+                                                    data-bs-toggle="modal"
+                                                    data-bs-target="#deleteModal">
+                                                    <i class="fas fa-trash"></i>
+                                                </button>
+
+                                                <button
+                                                    type="button"
+                                                    class="photos-btn action-btn"
+                                                    data-entity-type="quotation"
+                                                    data-idquotations="<?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                                    data-row="<?= htmlspecialchars($index, ENT_QUOTES, 'UTF-8') ?>"
+                                                    title="Photos">
+                                                    <i class="fas fa-camera"></i>
+                                                </button>
+
+                                                <button
+                                                    type="button"
+                                                    class="parts-btn action-btn"
+                                                    data-entity-type="quotation"
+                                                    data-idquotations="<?= htmlspecialchars($row['id'], ENT_QUOTES, 'UTF-8') ?>"
+                                                    data-row="<?= htmlspecialchars($index, ENT_QUOTES, 'UTF-8') ?>"
+                                                    title="Parts">
+                                                    <i class="fas fa-puzzle-piece"></i>
+                                                </button>
+
+                                                <a
+                                                    href="quotations.php?edit_id=<?= urlencode($row['id']) ?>"
+                                                    class="edit-detail-btn action-btn"
+                                                    title="Modifica Dettagliata">
+                                                    <i class="fas fa-edit"></i>
+                                                </a>
                                             </td>
                                         </tr>
                                     <?php endforeach; ?>
                                 </tbody>
                             </table>
+
                         <?php endif; ?>
+
                     </div>
                 </div>
             </div>
         </div>
-        <!-- Modal per conferma creazione nuova quotation -->
+
+        <!-- Modal creazione nuova quotation -->
         <div class="modal fade" id="createModal" tabindex="-1" aria-labelledby="createModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
+            <div class="modal-dialog modal-lg">
                 <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="createModalLabel">Conferma Creazione Nuova Quotation</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>Vuoi creare una nuova quotation?</p>
-                        <form id="createModalForm" method="post">
-                            <input type="hidden" name="action" value="create">
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annulla</button>
-                        <button type="button" class="btn btn-primary" id="confirmCreate">Conferma</button>
-                    </div>
+
+                    <form id="createModalForm" method="post" action="quotations.php">
+                        <input type="hidden" name="action" value="create">
+
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="createModalLabel">
+                                Crea Nuova Quotation
+                            </h5>
+
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                        </div>
+
+                        <div class="modal-body">
+                            <div class="form-group">
+                                <label for="create_description">Descrizione</label>
+                                <textarea
+                                    id="create_description"
+                                    name="description"
+                                    class="manual-input required-input"
+                                    required
+                                    placeholder="Inserisci la descrizione della quotation"></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <label for="create_customer">Cliente</label>
+                                <input
+                                    type="text"
+                                    id="create_customer"
+                                    name="customer"
+                                    class="manual-input required-input"
+                                    required
+                                    placeholder="Inserisci il nome del cliente">
+                            </div>
+                        </div>
+
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+                                Annulla
+                            </button>
+
+                            <button type="submit" class="btn btn-primary">
+                                Crea Quotation
+                            </button>
+                        </div>
+                    </form>
+
                 </div>
             </div>
         </div>
-        <!-- Modal per conferma cancellazione -->
+
+        <!-- Modal cancellazione quotation -->
         <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="deleteModalLabel">Conferma Cancellazione</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>Sicuro di voler cancellare questa quotation?</p>
-                        <form id="deleteForm" method="post">
-                            <input type="hidden" name="action" value="delete">
-                            <input type="hidden" name="id" id="deleteQuotationId">
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annulla</button>
-                        <button type="button" class="btn btn-danger" id="confirmDelete">Conferma</button>
-                    </div>
+
+                    <form id="deleteForm" method="post" action="quotations.php">
+                        <input type="hidden" name="action" value="delete">
+                        <input type="hidden" name="id" id="deleteQuotationId">
+
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="deleteModalLabel">
+                                Conferma Cancellazione
+                            </h5>
+
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                        </div>
+
+                        <div class="modal-body">
+                            <p>Sicuro di voler cancellare questa quotation?</p>
+                        </div>
+
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+                                Annulla
+                            </button>
+
+                            <button type="submit" class="btn btn-danger">
+                                Conferma
+                            </button>
+                        </div>
+                    </form>
+
                 </div>
             </div>
         </div>
+
         <div class="overlay toggle-icon"></div>
-        <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
+
+        <a href="javaScript:;" class="back-to-top">
+            <i class='bx bxs-up-arrow-alt'></i>
+        </a>
+
         <?php include('include/footer.php'); ?>
     </div>
+
     <div id="partsModalContainer"></div>
     <div id="annotationsModalContainer"></div>
+
     <?php include 'photos_functions.php'; ?>
 
     <?php include('jsinclude.php'); ?>
+
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+
     <script src="photos.js"></script>
     <script src="annotationsModal.js"></script>
     <script src="partsTable.js"></script>
 
     <script>
         document.addEventListener("DOMContentLoaded", function() {
-            // Mostra messaggi di stato se presenti
-            const urlParams = new URLSearchParams(window.location.search);
-            const status = urlParams.get('status');
-            const message = urlParams.get('message');
-            if (status && message) {
-                const alertDiv = document.createElement('div');
-                alertDiv.className = `alert alert-${status === 'success' ? 'success' : 'danger'} temp-alert`;
-                alertDiv.textContent = decodeURIComponent(message);
-                document.querySelector('.card-body').prepend(alertDiv);
-                setTimeout(() => {
-                    alertDiv.remove();
-                }, 5000);
+
+            // Rimuove automaticamente gli alert dopo 5 secondi
+            setTimeout(function() {
+                document.querySelectorAll('.temp-alert').forEach(function(el) {
+                    el.remove();
+                });
+            }, 5000);
+
+            // Inizializza DataTables solo nella lista
+            if (!document.querySelector('#editForm') && document.querySelector('#quotationsTable')) {
+                $('#quotationsTable').DataTable({
+                    paging: true,
+                    searching: true,
+                    ordering: true,
+                    info: true,
+                    autoWidth: false,
+                    responsive: true,
+                    order: [
+                        [1, 'desc'],
+                        [0, 'desc']
+                    ]
+                });
             }
 
+            // Nasconde overlay template quando si apre il modal create
+            $('#createModal').on('show.bs.modal', function() {
+                $('.overlay.toggle-icon').css('display', 'none');
+            });
+
+            $('#createModal').on('hide.bs.modal', function() {
+                $('.overlay.toggle-icon').css('display', '');
+            });
+
+            // Apertura modal Parts
             $(document).on('click', '.parts-btn', function() {
                 const idquotations = $(this).data('idquotations');
+
+                if (!idquotations) {
+                    alert('ID quotation mancante.');
+                    return;
+                }
+
                 $.ajax({
                     url: 'modal_partsTable.php',
                     method: 'GET',
@@ -437,15 +796,25 @@ if (isset($_GET['edit_id'])) {
                     },
                     success: function(response) {
                         $('#partsModalContainer').html(response);
+
                         const modalElement = document.getElementById('partsModal');
-                        if (!modalElement) return;
+                        if (!modalElement) {
+                            alert('Modale parts non trovato.');
+                            return;
+                        }
+
                         $("#trfHeader").text(`Quotation #${idquotations}`);
                         $("#partsModal").data("idquotations", idquotations);
+
                         let modal = bootstrap.Modal.getInstance(modalElement) || new bootstrap.Modal(modalElement, {
                             backdrop: true
                         });
+
                         modal.show();
-                        if (typeof window.loadParts === 'function') window.loadParts(null, idquotations);
+
+                        if (typeof window.loadParts === 'function') {
+                            window.loadParts(null, idquotations);
+                        }
                     },
                     error: function(xhr, status, error) {
                         alert('Errore nel caricamento del modale: ' + error);
@@ -453,6 +822,7 @@ if (isset($_GET['edit_id'])) {
                 });
             });
 
+            // Pulizia modal dinamici
             $(document).on('hidden.bs.modal', '#partsModal', function() {
                 $('#partsModalContainer').empty();
                 $('.modal-backdrop').remove();
@@ -465,110 +835,53 @@ if (isset($_GET['edit_id'])) {
                 $('body').removeClass('modal-open').css('padding-right', '');
             });
 
+            // Salvataggio inline
+            $(document).on('click', '.edit-btn', function() {
+                const row = this.closest('tr');
+                const id = row.dataset.id;
+                const description = row.querySelector('textarea[name="description"]').value.trim();
+                const customer = row.querySelector('input[name="customer"]').value.trim();
 
-            // Inizializza DataTables se non siamo in modalità modifica
-            if (!document.querySelector('#editForm')) {
-                $('#quotationsTable').DataTable({
-                    paging: true,
-                    searching: true,
-                    ordering: true,
-                    info: true,
-                    autoWidth: false,
-                    responsive: true
-                });
-            }
+                if (!description || !customer) {
+                    alert('Descrizione e Cliente sono obbligatori.');
+                    return;
+                }
 
-            // Quando il modale di creazione si apre, nascondi l'overlay
-            $('#createModal').on('show.bs.modal', function() {
-                $('.overlay.toggle-icon').css('display', 'none');
-            });
-
-            // Quando il modale si chiude, ripristina l'overlay
-            $('#createModal').on('hide.bs.modal', function() {
-                $('.overlay.toggle-icon').css('display', '');
-            });
-
-            // Gestione conferma creazione nel modal
-            document.getElementById('confirmCreate').addEventListener('click', function() {
-                const createModal = bootstrap.Modal.getInstance(document.getElementById('createModal'));
-                createModal.hide();
-                const form = document.getElementById('createModalForm');
-                const formData = new FormData(form);
+                const formData = new FormData();
+                formData.append('action', 'update');
+                formData.append('ajax', '1');
+                formData.append('id', id);
+                formData.append('description', description);
+                formData.append('customer', customer);
 
                 fetch('quotations.php', {
-                    method: 'POST',
-                    body: formData
-                }).then(response => {
-                    if (!response.ok) {
-                        throw new Error('Errore HTTP: ' + response.status);
-                    }
-                    return response.text();
-                }).then(() => {
-                    window.location.href = 'quotations.php?status=success&message=' + encodeURIComponent('Quotation creata con successo');
-                }).catch(error => {
-                    console.error('Errore durante la creazione della quotation:', error);
-                    const alertDiv = document.createElement('div');
-                    alertDiv.className = 'alert alert-danger temp-alert';
-                    alertDiv.textContent = 'Errore durante la creazione della quotation: ' + error.message;
-                    document.querySelector('.card-body').prepend(alertDiv);
-                    setTimeout(() => {
-                        alertDiv.remove();
-                    }, 5000);
-                });
-            });
-
-            // Gestione modifica inline e save nella lista
-            document.querySelectorAll('.edit-btn').forEach(btn => {
-                btn.addEventListener('click', function() {
-                    const row = this.closest('tr');
-                    const id = row.dataset.id;
-                    const description = row.querySelector('textarea[name="description"]').value;
-                    const customer = row.querySelector('input[name="customer"]').value;
-
-                    const formData = new FormData();
-                    formData.append('action', 'update');
-                    formData.append('id', id);
-                    formData.append('description', description);
-                    formData.append('customer', customer);
-
-                    fetch('quotations.php', {
                         method: 'POST',
                         body: formData
-                    }).then(response => {
-                        if (response.ok) {
+                    })
+                    .then(response => response.json())
+                    .then(data => {
+                        if (data.success) {
                             row.classList.add('flash-success');
-                            setTimeout(() => row.classList.remove('flash-success'), 500);
-                            alert('Quotation modificata con successo!');
+                            setTimeout(() => row.classList.remove('flash-success'), 700);
                         } else {
-                            alert('Errore durante la modifica.');
+                            alert(data.message || 'Errore durante la modifica.');
                         }
-                    }).catch(error => {
+                    })
+                    .catch(error => {
                         console.error('Errore durante la modifica della quotation:', error);
                         alert('Errore durante la modifica: ' + error.message);
                     });
-                });
             });
 
-            // Gestione apertura modal di cancellazione
-            document.querySelectorAll('.delete-btn').forEach(btn => {
-                btn.addEventListener('click', function() {
-                    const id = this.dataset.id;
-                    document.getElementById('deleteQuotationId').value = id;
-                });
+            // Imposta ID da cancellare nel modal
+            $(document).on('click', '.delete-btn', function() {
+                const id = this.dataset.id;
+                document.getElementById('deleteQuotationId').value = id;
             });
 
-            // Gestione conferma cancellazione nel modal
-            document.getElementById('confirmDelete').addEventListener('click', function() {
-                document.getElementById('deleteForm').submit();
-            });
-
-            // I bottoni photos e parts usano gli script esistenti (photos.js, parts.js), passando data-idquotations
         });
     </script>
 
-    <!-- Modale per le foto in quotations.php -->
-
-
 </body>
 
 </html>
\ No newline at end of file