|
@@ -122,7 +122,7 @@ async def admin_get_users(page: int = 1, size: int = 50, search: Optional[str] =
|
|
|
raise HTTPException(status_code=403, detail="Admin role required")
|
|
raise HTTPException(status_code=403, detail="Admin role required")
|
|
|
|
|
|
|
|
offset = (page - 1) * size
|
|
offset = (page - 1) * size
|
|
|
- base_query = "SELECT id, email, first_name, last_name, phone, role, can_chat, is_active, is_company, company_name, company_pib, company_address, ip_address, created_at FROM users"
|
|
|
|
|
|
|
+ base_query = "SELECT id, email, first_name, last_name, phone, shipping_address, preferred_language, role, can_chat, is_active, is_company, company_name, company_pib, company_address, ip_address, created_at FROM users"
|
|
|
count_query = "SELECT COUNT(*) as total FROM users"
|
|
count_query = "SELECT COUNT(*) as total FROM users"
|
|
|
params = []
|
|
params = []
|
|
|
if search and search.strip():
|
|
if search and search.strip():
|
|
@@ -155,7 +155,7 @@ async def admin_create_user(data: schemas.UserCreate, token: str = Depends(auth_
|
|
|
(data.email, hashed_password, data.first_name, data.last_name, data.phone, 'user', True)
|
|
(data.email, hashed_password, data.first_name, data.last_name, data.phone, 'user', True)
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
- user = db.execute_query("SELECT id, email, first_name, last_name, phone, role, can_chat, is_active, is_company, company_name, company_pib, company_address, created_at FROM users WHERE id = %s", (user_id,))
|
|
|
|
|
|
|
+ user = db.execute_query("SELECT id, email, first_name, last_name, phone, shipping_address, preferred_language, role, can_chat, is_active, is_company, company_name, company_pib, company_address, ip_address, created_at FROM users WHERE id = %s", (user_id,))
|
|
|
return user[0]
|
|
return user[0]
|
|
|
|
|
|
|
|
@router.patch("/users/{target_id}/admin", response_model=schemas.UserResponse)
|
|
@router.patch("/users/{target_id}/admin", response_model=schemas.UserResponse)
|
|
@@ -175,7 +175,7 @@ async def admin_update_user(target_id: int, data: schemas.UserUpdate, token: str
|
|
|
params.append(target_id)
|
|
params.append(target_id)
|
|
|
db.execute_commit(query, tuple(params))
|
|
db.execute_commit(query, tuple(params))
|
|
|
|
|
|
|
|
- user = db.execute_query("SELECT id, email, first_name, last_name, phone, shipping_address, preferred_language, role, can_chat, is_active, ip_address, created_at FROM users WHERE id = %s", (target_id,))
|
|
|
|
|
|
|
+ user = db.execute_query("SELECT id, email, first_name, last_name, phone, shipping_address, preferred_language, role, can_chat, is_active, is_company, company_name, company_pib, company_address, ip_address, created_at FROM users WHERE id = %s", (target_id,))
|
|
|
if not user: raise HTTPException(status_code=404, detail="User not found")
|
|
if not user: raise HTTPException(status_code=404, detail="User not found")
|
|
|
return user[0]
|
|
return user[0]
|
|
|
|
|
|