@@ -1155,7 +1247,9 @@
document.getElementById('line-save').addEventListener('click', () => {
const newQty = parseFloat(document.getElementById('line-qty-input').value) || 1;
- updateOrderLineInModal(orderId, line.id, 'update', newQty);
+ const descInput = document.getElementById('line-desc-input');
+ const newDesc = descInput ? descInput.value.trim() : null;
+ updateOrderLineInModal(orderId, line.id, 'update', newQty, newDesc);
closeDialog();
});
@@ -1173,12 +1267,15 @@
});
}
- function updateOrderLineInModal(orderId, lineId, action, qty = 0) {
+ function updateOrderLineInModal(orderId, lineId, action, qty = 0, description = null) {
showLoading();
let body = `token=${CONFIG.token}&order_id=${orderId}&line_id=${lineId}&action=${action}`;
if (action === 'update') {
body += `&qty=${qty}`;
+ if (description !== null) {
+ body += `&description=${encodeURIComponent(description)}`;
+ }
}
fetch(CONFIG.ajaxUrl + 'updateorderline.php', {
@@ -1410,15 +1507,24 @@
function showLineEditDialog(line, orderId) {
pauseScanner();
+ const isFreetext = line.is_freetext || !line.product_id;
+
const dialog = document.createElement('div');
dialog.className = 'line-edit-dialog';
dialog.id = 'line-edit-dialog';
dialog.innerHTML = `
-
${escapeHtml(line.product_label)}
-
-
Lagerbestand: ${line.stock}
-
+
${isFreetext ? 'Freitext-Position' : escapeHtml(line.product_label)}
+ ${isFreetext ? `
+
+
+
+
+ ` : `
+
+
Lagerbestand: ${line.stock}
+
+ `}
@@ -1441,7 +1547,9 @@
document.getElementById('line-save').addEventListener('click', () => {
const newQty = parseFloat(document.getElementById('line-qty-input').value) || 1;
- updateOrderLine(orderId, line.id, 'update', newQty);
+ const descInput = document.getElementById('line-desc-input');
+ const newDesc = descInput ? descInput.value.trim() : null;
+ updateOrderLine(orderId, line.id, 'update', newQty, newDesc);
closeDialog();
});
@@ -1459,12 +1567,15 @@
});
}
- function updateOrderLine(orderId, lineId, action, qty = 0) {
+ function updateOrderLine(orderId, lineId, action, qty = 0, description = null) {
showLoading();
let body = `token=${CONFIG.token}&order_id=${orderId}&line_id=${lineId}&action=${action}`;
if (action === 'update') {
body += `&qty=${qty}`;
+ if (description !== null) {
+ body += `&description=${encodeURIComponent(description)}`;
+ }
}
fetch(CONFIG.ajaxUrl + 'updateorderline.php', {
diff --git a/pwa.php b/pwa.php
index 88195b7..51a79fb 100755
--- a/pwa.php
+++ b/pwa.php
@@ -784,10 +784,6 @@ $colormain = getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#0077b3');
-
-
-
- ← Bestellungen
-
diff --git a/pwa_login.php b/pwa_login.php
new file mode 100755
index 0000000..65e9046
--- /dev/null
+++ b/pwa_login.php
@@ -0,0 +1,152 @@
+
+ *
+ * AJAX: PWA Login - Authentifiziert Benutzer und gibt Token zurueck
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+ define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+ define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+ define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+ define('NOREQUIREAJAX', '1');
+}
+// Wichtig: Kein Login erforderlich fuer diese Seite
+if (!defined('NOLOGIN')) {
+ define('NOLOGIN', '1');
+}
+
+// Load Dolibarr environment
+$res = 0;
+if (!$res && file_exists("../../main.inc.php")) {
+ $res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+ $res = @include "../../../main.inc.php";
+}
+if (!$res && file_exists("../../../../main.inc.php")) {
+ $res = @include "../../../../main.inc.php";
+}
+if (!$res) {
+ die(json_encode(['success' => false, 'error' => 'Failed to load Dolibarr']));
+}
+
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+// Nur POST erlaubt
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+ echo json_encode(['success' => false, 'error' => 'Method not allowed']);
+ exit;
+}
+
+$login = GETPOST('login', 'alphanohtml');
+$password = GETPOST('password', 'none'); // 'none' = kein Filter fuer Passwort
+
+if (empty($login) || empty($password)) {
+ echo json_encode(['success' => false, 'error' => 'Login und Passwort erforderlich']);
+ exit;
+}
+
+// Benutzer authentifizieren
+$userobj = new User($db);
+$result = $userobj->fetch('', $login);
+
+if ($result <= 0) {
+ // Benutzer nicht gefunden - generische Fehlermeldung aus Sicherheitsgruenden
+ sleep(1); // Brute-Force-Schutz
+ echo json_encode(['success' => false, 'error' => 'Login fehlgeschlagen']);
+ exit;
+}
+
+// Passwort pruefen
+$passOk = false;
+
+// Methode 1: password_verify (moderne Dolibarr-Versionen)
+if (function_exists('password_verify') && !empty($userobj->pass_indatabase_crypted)) {
+ $passOk = password_verify($password, $userobj->pass_indatabase_crypted);
+}
+
+// Methode 2: dol_hash (aeltere Versionen)
+if (!$passOk && !empty($userobj->pass_indatabase_crypted)) {
+ $passOk = (dol_hash($password) === $userobj->pass_indatabase_crypted);
+}
+
+// Methode 3: MD5 (sehr alte Installationen)
+if (!$passOk && !empty($userobj->pass_indatabase_crypted)) {
+ $passOk = (md5($password) === $userobj->pass_indatabase_crypted);
+}
+
+if (!$passOk) {
+ sleep(1); // Brute-Force-Schutz
+ echo json_encode(['success' => false, 'error' => 'Login fehlgeschlagen']);
+ exit;
+}
+
+// Benutzer ist aktiv?
+if ($userobj->statut != 1) {
+ echo json_encode(['success' => false, 'error' => 'Benutzer deaktiviert']);
+ exit;
+}
+
+// Rechte pruefen
+$userobj->getrights();
+$hasAccess = false;
+
+if ($userobj->hasRight('handybarcodescanner', 'use')) {
+ $hasAccess = true;
+} elseif ($userobj->hasRight('fournisseur', 'commande', 'creer') || $userobj->hasRight('supplier_order', 'creer')) {
+ $hasAccess = true;
+}
+
+if (!$hasAccess) {
+ echo json_encode(['success' => false, 'error' => 'Keine Berechtigung fuer Scanner']);
+ exit;
+}
+
+// Session starten und Benutzer einloggen
+if (session_status() === PHP_SESSION_NONE) {
+ session_start();
+}
+
+// Dolibarr Session-Variablen setzen
+$_SESSION['dol_login'] = $userobj->login;
+$_SESSION['dol_authmode'] = 'dolibarr';
+$_SESSION['dol_tz'] = GETPOST('tz', 'alpha');
+$_SESSION['dol_entity'] = $conf->entity;
+
+// Token generieren fuer 15 Tage
+$tokenData = [
+ 'user_id' => $userobj->id,
+ 'login' => $userobj->login,
+ 'entity' => $conf->entity,
+ 'created' => time(),
+ 'expires' => time() + (15 * 24 * 60 * 60), // 15 Tage
+ 'hash' => bin2hex(random_bytes(16))
+];
+
+// Token als Base64-encoded JSON (nicht sicher fuer echte Auth, aber reicht fuer PWA-Cache)
+$pwaToken = base64_encode(json_encode($tokenData));
+
+// Dolibarr CSRF-Token
+$csrfToken = newToken();
+
+echo json_encode([
+ 'success' => true,
+ 'pwa_token' => $pwaToken,
+ 'csrf_token' => $csrfToken,
+ 'user' => [
+ 'id' => $userobj->id,
+ 'login' => $userobj->login,
+ 'firstname' => $userobj->firstname,
+ 'lastname' => $userobj->lastname
+ ],
+ 'expires' => $tokenData['expires'],
+ 'expires_human' => date('Y-m-d H:i:s', $tokenData['expires'])
+]);
diff --git a/pwa_verify.php b/pwa_verify.php
new file mode 100755
index 0000000..4cc6f83
--- /dev/null
+++ b/pwa_verify.php
@@ -0,0 +1,136 @@
+
+ *
+ * AJAX: PWA Token Verify - Prueft gespeicherten Token und startet Session
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+ define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+ define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+ define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+ define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOLOGIN')) {
+ define('NOLOGIN', '1');
+}
+
+// Load Dolibarr environment
+$res = 0;
+if (!$res && file_exists("../../main.inc.php")) {
+ $res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+ $res = @include "../../../main.inc.php";
+}
+if (!$res && file_exists("../../../../main.inc.php")) {
+ $res = @include "../../../../main.inc.php";
+}
+if (!$res) {
+ die(json_encode(['success' => false, 'error' => 'Failed to load Dolibarr']));
+}
+
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+// Token aus Header oder POST
+$pwaToken = '';
+if (!empty($_SERVER['HTTP_X_PWA_TOKEN'])) {
+ $pwaToken = $_SERVER['HTTP_X_PWA_TOKEN'];
+} else {
+ $pwaToken = GETPOST('pwa_token', 'alphanohtml');
+}
+
+if (empty($pwaToken)) {
+ echo json_encode(['success' => false, 'error' => 'Token fehlt', 'need_login' => true]);
+ exit;
+}
+
+// Token dekodieren
+$tokenJson = base64_decode($pwaToken);
+if ($tokenJson === false) {
+ echo json_encode(['success' => false, 'error' => 'Ungueltiger Token', 'need_login' => true]);
+ exit;
+}
+
+$tokenData = json_decode($tokenJson, true);
+if (!$tokenData || !isset($tokenData['user_id']) || !isset($tokenData['expires'])) {
+ echo json_encode(['success' => false, 'error' => 'Token-Format ungueltig', 'need_login' => true]);
+ exit;
+}
+
+// Ablauf pruefen
+if ($tokenData['expires'] < time()) {
+ echo json_encode(['success' => false, 'error' => 'Token abgelaufen', 'need_login' => true]);
+ exit;
+}
+
+// Benutzer laden
+$userobj = new User($db);
+$result = $userobj->fetch($tokenData['user_id']);
+
+if ($result <= 0) {
+ echo json_encode(['success' => false, 'error' => 'Benutzer nicht gefunden', 'need_login' => true]);
+ exit;
+}
+
+// Benutzer noch aktiv?
+if ($userobj->statut != 1) {
+ echo json_encode(['success' => false, 'error' => 'Benutzer deaktiviert', 'need_login' => true]);
+ exit;
+}
+
+// Login stimmt ueberein?
+if ($userobj->login !== $tokenData['login']) {
+ echo json_encode(['success' => false, 'error' => 'Token ungueltig', 'need_login' => true]);
+ exit;
+}
+
+// Rechte pruefen
+$userobj->getrights();
+$hasAccess = false;
+
+if ($userobj->hasRight('handybarcodescanner', 'use')) {
+ $hasAccess = true;
+} elseif ($userobj->hasRight('fournisseur', 'commande', 'creer') || $userobj->hasRight('supplier_order', 'creer')) {
+ $hasAccess = true;
+}
+
+if (!$hasAccess) {
+ echo json_encode(['success' => false, 'error' => 'Keine Berechtigung', 'need_login' => true]);
+ exit;
+}
+
+// Session starten/aktualisieren
+if (session_status() === PHP_SESSION_NONE) {
+ session_start();
+}
+
+$_SESSION['dol_login'] = $userobj->login;
+$_SESSION['dol_authmode'] = 'dolibarr';
+$_SESSION['dol_entity'] = $tokenData['entity'] ?? $conf->entity;
+
+// Neuen CSRF-Token generieren
+$csrfToken = newToken();
+
+// Verbleibende Zeit berechnen
+$remainingDays = ceil(($tokenData['expires'] - time()) / (24 * 60 * 60));
+
+echo json_encode([
+ 'success' => true,
+ 'csrf_token' => $csrfToken,
+ 'user' => [
+ 'id' => $userobj->id,
+ 'login' => $userobj->login,
+ 'firstname' => $userobj->firstname,
+ 'lastname' => $userobj->lastname
+ ],
+ 'expires' => $tokenData['expires'],
+ 'remaining_days' => $remainingDays
+]);
diff --git a/sw.js b/sw.js
index caa2054..c509abe 100755
--- a/sw.js
+++ b/sw.js
@@ -1,5 +1,5 @@
// Service Worker for HandyBarcodeScanner PWA
-const CACHE_NAME = 'scanner-v5.3';
+const CACHE_NAME = 'scanner-v5.4';
const ASSETS = [
'pwa.php',
'css/scanner.css',