IntelSight/Hetzner-Backup
3
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Test zu Fake geändert, weil Namensproblem

Quellcode durchsuchen
Dieser Commit ist enthalten in:
UserIsMH
2025-06-21 17:22:12 +02:00
Ursprung fec588ba06
Commit 3d899b1c45
22 geänderte Dateien mit 614 neuen und 347 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

66
v2_adminpanel/routes/customer_routes.py
Datei anzeigen

@@ -22,14 +22,14 @@ def test_customers():
@customer_bp.route("/customers")
@login_required
def customers():
show_test = request.args.get('show_test', 'false').lower() == 'true'
show_fake = request.args.get('show_fake', 'false').lower() == 'true'
search = request.args.get('search', '').strip()
page = request.args.get('page', 1, type=int)
per_page = 20
sort = request.args.get('sort', 'name')
order = request.args.get('order', 'asc')
customers_list = get_customers(show_test=show_test, search=search)
customers_list = get_customers(show_fake=show_fake, search=search)
# Sortierung
if sort == 'name':
@@ -48,7 +48,7 @@ def customers():
return render_template("customers.html",
customers=paginated_customers,
show_test=show_test,
show_fake=show_fake,
search=search,
page=page,
per_page=per_page,
@@ -77,17 +77,17 @@ def edit_customer(customer_id):
new_values = {
'name': request.form['name'],
'email': request.form['email'],
'is_test': 'is_test' in request.form
'is_fake': 'is_fake' in request.form
}
cur.execute("""
UPDATE customers
SET name = %s, email = %s, is_test = %s
SET name = %s, email = %s, is_fake = %s
WHERE id = %s
""", (
new_values['name'],
new_values['email'],
new_values['is_test'],
new_values['is_fake'],
customer_id
))
@@ -98,16 +98,16 @@ def edit_customer(customer_id):
old_values={
'name': current_customer['name'],
'email': current_customer['email'],
'is_test': current_customer.get('is_test', False)
'is_fake': current_customer.get('is_fake', False)
},
new_values=new_values)
flash('Kunde erfolgreich aktualisiert!', 'success')
# Redirect mit show_test Parameter wenn nötig
# Redirect mit show_fake Parameter wenn nötig
redirect_url = url_for('customers.customers_licenses')
if request.form.get('show_test') == 'true':
redirect_url += '?show_test=true'
if request.form.get('show_fake') == 'true':
redirect_url += '?show_fake=true'
return redirect(redirect_url)
finally:
cur.close()
@@ -137,13 +137,13 @@ def create_customer():
# Insert new customer
name = request.form['name']
email = request.form['email']
is_test = 'is_test' in request.form # Checkbox ist nur vorhanden wenn angekreuzt
is_fake = 'is_fake' in request.form # Checkbox ist nur vorhanden wenn angekreuzt
cur.execute("""
INSERT INTO customers (name, email, is_test, created_at)
INSERT INTO customers (name, email, is_fake, created_at)
VALUES (%s, %s, %s, %s)
RETURNING id
""", (name, email, is_test, datetime.now()))
""", (name, email, is_fake, datetime.now()))
customer_id = cur.fetchone()[0]
conn.commit()
@@ -153,17 +153,17 @@ def create_customer():
new_values={
'name': name,
'email': email,
'is_test': is_test
'is_fake': is_fake
})
if is_test:
flash(f'Testkunde {name} erfolgreich erstellt!', 'success')
if is_fake:
flash(f'Fake-Kunde {name} erfolgreich erstellt!', 'success')
else:
flash(f'Kunde {name} erfolgreich erstellt!', 'success')
# Redirect mit show_test=true wenn Testkunde erstellt wurde
if is_test:
return redirect(url_for('customers.customers_licenses', show_test='true'))
# Redirect mit show_fake=true wenn Fake-Kunde erstellt wurde
if is_fake:
return redirect(url_for('customers.customers_licenses', show_fake='true'))
else:
return redirect(url_for('customers.customers_licenses'))
@@ -232,9 +232,9 @@ def customers_licenses():
import psycopg2
logging.info("=== CUSTOMERS-LICENSES ROUTE CALLED ===")
# Get show_test parameter from URL
show_test = request.args.get('show_test', 'false').lower() == 'true'
logging.info(f"show_test parameter: {show_test}")
# Get show_fake parameter from URL
show_fake = request.args.get('show_fake', 'false').lower() == 'true'
logging.info(f"show_fake parameter: {show_fake}")
try:
# Direkte Verbindung ohne Helper-Funktionen
@@ -250,7 +250,7 @@ def customers_licenses():
try:
# Hole alle Kunden mit ihren Lizenzen
# Wenn show_test=false, zeige nur Nicht-Test-Kunden
# Wenn show_fake=false, zeige nur Nicht-Test-Kunden
query = """
SELECT
c.id,
@@ -259,17 +259,17 @@ def customers_licenses():
c.created_at,
COUNT(l.id),
COUNT(CASE WHEN l.is_active = true THEN 1 END),
COUNT(CASE WHEN l.is_test = true THEN 1 END),
COUNT(CASE WHEN l.is_fake = true THEN 1 END),
MAX(l.created_at),
c.is_test
c.is_fake
FROM customers c
LEFT JOIN licenses l ON c.id = l.customer_id
WHERE (%s OR c.is_test = false)
GROUP BY c.id, c.name, c.email, c.created_at, c.is_test
WHERE (%s OR c.is_fake = false)
GROUP BY c.id, c.name, c.email, c.created_at, c.is_fake
ORDER BY c.name
"""
cur.execute(query, (show_test,))
cur.execute(query, (show_fake,))
customers = []
results = cur.fetchall()
@@ -286,12 +286,12 @@ def customers_licenses():
'active_licenses': row[5],
'test_licenses': row[6],
'last_license_created': row[7],
'is_test': row[8]
'is_fake': row[8]
})
return render_template("customers_licenses.html",
customers=customers,
show_test=show_test)
show_fake=show_fake)
finally:
cur.close()
@@ -325,7 +325,7 @@ def api_customer_licenses(customer_id):
l.license_key,
l.license_type,
l.is_active,
l.is_test,
l.is_fake,
l.valid_from,
l.valid_until,
l.device_limit,
@@ -387,7 +387,7 @@ def api_customer_licenses(customer_id):
'license_key': row[1],
'license_type': row[2],
'is_active': row[3],
'is_test': row[4],
'is_fake': row[4],
'valid_from': row[5].strftime('%Y-%m-%d') if row[5] else None,
'valid_until': row[6].strftime('%Y-%m-%d') if row[6] else None,
'device_limit': row[7],
@@ -442,7 +442,7 @@ def api_customer_quick_stats(customer_id):
SELECT
COUNT(l.id) as total_licenses,
COUNT(CASE WHEN l.is_active = true THEN 1 END) as active_licenses,
COUNT(CASE WHEN l.is_test = true THEN 1 END) as test_licenses,
COUNT(CASE WHEN l.is_fake = true THEN 1 END) as test_licenses,
SUM(l.device_limit) as total_device_limit
FROM licenses l
WHERE l.customer_id = %s