diff --git a/bot/handlers/admin/promo/manage.py b/bot/handlers/admin/promo/manage.py
index 1b00406..97a5620 100644
--- a/bot/handlers/admin/promo/manage.py
+++ b/bot/handlers/admin/promo/manage.py
@@ -34,16 +34,12 @@ async def view_promo_codes_handler(callback: types.CallbackQuery,
offset=0)
if not promo_models:
- text = _(
- "admin_no_promo_codes",
- default="π ΠΠΊΡΠΈΠ²Π½ΡΠ΅ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Ρ\n\nβ ΠΠ΅Ρ Π°ΠΊΡΠΈΠ²Π½ΡΡ
ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄ΠΎΠ²"
- )
+ text = f"{_('admin_active_promos_list_header')}\n\n{_('admin_no_active_promos')}"
else:
- lines = [_("admin_active_promo_codes_title",
- default="π ΠΠΊΡΠΈΠ²Π½ΡΠ΅ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Ρ\n")]
+ lines = [_("admin_active_promos_list_header"), ""]
for promo in promo_models:
- validity_str = _("admin_promo_unlimited", default="ΠΠ΅Π· ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠΉ")
+ validity_str = _("admin_promo_valid_indefinitely")
if promo.valid_until:
validity_str = promo.valid_until.strftime("%d.%m.%Y")
@@ -90,10 +86,7 @@ async def promo_management_handler(callback: types.CallbackQuery,
promo_models = await promo_code_dal.get_all_promo_codes_with_details(session, limit=50, offset=0)
if not promo_models:
- text = _(
- "admin_no_promo_codes_to_manage",
- default="π Π£ΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°ΠΌΠΈ\n\nβ ΠΠ΅Ρ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄ΠΎΠ² Π΄Π»Ρ ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ"
- )
+ text = _("admin_promo_management_empty")
await callback.message.edit_text(
text,
reply_markup=get_back_to_admin_panel_keyboard(current_lang, i18n),
@@ -103,21 +96,9 @@ async def promo_management_handler(callback: types.CallbackQuery,
return
builder = InlineKeyboardBuilder()
- text_lines = [_("admin_promo_management_title", default="π Π£ΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°ΠΌΠΈ\n")]
+ text = _("admin_promo_management_title")
for promo in promo_models:
- status_emoji = "β
" if promo.is_active else "β"
- validity_str = _("admin_promo_unlimited", default="β")
- if promo.valid_until:
- validity_str = promo.valid_until.strftime("%d.%m")
-
- text_lines.append(
- f"{status_emoji} {promo.code} | "
- f"π{promo.bonus_days}Π΄ | "
- f"π{promo.current_activations}/{promo.max_activations} | "
- f"β°{validity_str}"
- )
-
builder.row(
InlineKeyboardButton(
text=f"π {promo.code}",
@@ -127,13 +108,11 @@ async def promo_management_handler(callback: types.CallbackQuery,
builder.row(
InlineKeyboardButton(
- text=_("admin_back_to_panel", default="π Π Π°Π΄ΠΌΠΈΠ½ ΠΏΠ°Π½Π΅Π»Ρ"),
+ text=_("back_to_admin_panel_button"),
callback_data="admin_action:main"
)
)
- text = "\n".join(text_lines)
-
try:
await callback.message.edit_text(
text,
@@ -170,80 +149,65 @@ async def promo_detail_handler(callback: types.CallbackQuery,
promo = await promo_code_dal.get_promo_code_by_id(session, promo_id)
if not promo:
- await callback.answer(_("admin_promo_not_found", default="β ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
return
- # Format promo details
- status_text = _("admin_promo_active", default="β
ΠΠΊΡΠΈΠ²Π΅Π½") if promo.is_active else _("admin_promo_inactive", default="β ΠΠ΅Π°ΠΊΡΠΈΠ²Π΅Π½")
- validity_text = _("admin_promo_unlimited", default="ΠΠ΅Π· ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠΉ")
+ status = _("admin_promo_status_active") if promo.is_active else _("admin_promo_status_inactive")
+ if promo.valid_until and promo.valid_until < datetime.now(timezone.utc):
+ status = _("admin_promo_status_expired")
+ elif promo.current_activations >= promo.max_activations:
+ status = _("admin_promo_status_used_up")
+
+ validity = _("admin_promo_valid_indefinitely")
if promo.valid_until:
- if promo.valid_until > datetime.now(timezone.utc):
- validity_text = promo.valid_until.strftime("%d.%m.%Y %H:%M")
- else:
- validity_text = f"{promo.valid_until.strftime('%d.%m.%Y %H:%M')} (ΠΈΡΡΠ΅ΠΊ)"
+ validity = promo.valid_until.strftime("%d.%m.%Y %H:%M")
- created_at = promo.created_at.strftime("%d.%m.%Y %H:%M") if promo.created_at else "N/A"
+ created = promo.created_at.strftime("%d.%m.%Y %H:%M") if promo.created_at else "N/A"
- text = _(
- "admin_promo_detail_info",
- default="π ΠΠ΅ΡΠ°Π»ΠΈ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°\n\n"
- "π ΠΠΎΠ΄: {code}\n"
- "π ΠΠΎΠ½ΡΡΠ½ΡΠ΅ Π΄Π½ΠΈ: {bonus_days}\n"
- "π ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠΉ: {current}/{max}\n"
- "π Π‘ΡΠ°ΡΡΡ: {status}\n"
- "β° ΠΠ΅ΠΉΡΡΠ²ΡΠ΅Ρ Π΄ΠΎ: {validity}\n"
- "π€ Π‘ΠΎΠ·Π΄Π°Π»: {admin_id}\n"
- "π Π‘ΠΎΠ·Π΄Π°Π½: {created}",
- code=promo.code,
- bonus_days=promo.bonus_days,
- current=promo.current_activations,
- max=promo.max_activations,
- status=status_text,
- validity=validity_text,
- admin_id=promo.created_by_admin_id,
- created=created_at
- )
+ text = "\n".join([
+ _("admin_promo_card_title", code=promo.code),
+ _("admin_promo_card_bonus_days", days=promo.bonus_days),
+ _("admin_promo_card_activations", current=promo.current_activations, max=promo.max_activations),
+ _("admin_promo_card_validity", validity=validity),
+ _("admin_promo_card_status", status=status),
+ _("admin_promo_card_created", created=created),
+ _("admin_promo_card_created_by", creator=promo.created_by_admin_id)
+ ])
# Create management buttons
builder = InlineKeyboardBuilder()
- # Edit button
builder.row(
InlineKeyboardButton(
- text=_("admin_promo_edit", default="βοΈ Π Π΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ"),
+ text=_("admin_promo_edit_button"),
callback_data=f"promo_edit:{promo_id}"
)
)
- # Toggle active/inactive
- toggle_text = _("admin_promo_deactivate", default="β ΠΠ΅Π°ΠΊΡΠΈΠ²ΠΈΡΠΎΠ²Π°ΡΡ") if promo.is_active else _("admin_promo_activate", default="β
ΠΠΊΡΠΈΠ²ΠΈΡΠΎΠ²Π°ΡΡ")
builder.row(
InlineKeyboardButton(
- text=toggle_text,
+ text=_("admin_promo_toggle_status_button"),
callback_data=f"promo_toggle:{promo_id}"
)
)
- # View activations
builder.row(
InlineKeyboardButton(
- text=_("admin_promo_view_activations", default="π ΠΠΊΡΠΈΠ²Π°ΡΠΈΠΈ"),
+ text=_("admin_promo_view_activations_button"),
callback_data=f"promo_activations:{promo_id}"
)
)
- # Delete button
builder.row(
InlineKeyboardButton(
- text=_("admin_promo_delete", default="π Π£Π΄Π°Π»ΠΈΡΡ"),
+ text=_("admin_promo_delete_button"),
callback_data=f"promo_delete:{promo_id}"
)
)
- # Back button
builder.row(
InlineKeyboardButton(
- text=_("admin_back_to_management", default="π Π ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ"),
+ text=_("admin_promo_back_to_list_button"),
callback_data="admin_action:promo_management"
)
)
@@ -263,7 +227,7 @@ async def promo_detail_handler(callback: types.CallbackQuery,
await callback.answer()
except ValueError:
- await callback.answer(_("admin_invalid_promo_id", default="β ΠΠ΅Π²Π΅ΡΠ½ΡΠΉ ID ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
except Exception as e:
logging.error(f"Error in promo detail: {e}")
await callback.answer(_("error_occurred_try_again"), show_alert=True)
@@ -285,7 +249,7 @@ async def promo_toggle_handler(callback: types.CallbackQuery, i18n_data: dict,
promo = await promo_code_dal.get_promo_code_by_id(session, promo_id)
if not promo:
- await callback.answer(_("admin_promo_not_found", default="β ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
return
new_status = not promo.is_active
@@ -294,9 +258,9 @@ async def promo_toggle_handler(callback: types.CallbackQuery, i18n_data: dict,
updated = await promo_code_dal.update_promo_code(session, promo_id, update_data)
if updated:
await session.commit()
- status_text = _("admin_promo_activated", default="Π°ΠΊΡΠΈΠ²ΠΈΡΠΎΠ²Π°Π½") if new_status else _("admin_promo_deactivated", default="Π΄Π΅Π°ΠΊΡΠΈΠ²ΠΈΡΠΎΠ²Π°Π½")
+ status_text = _("admin_promo_status_activated") if new_status else _("admin_promo_status_deactivated")
await callback.answer(
- _("admin_promo_status_changed", default="β
ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ {status}", status=status_text)
+ _("admin_promo_toggle_success", code=promo.code, status=status_text)
)
# Refresh the detail view
callback.data = f"promo_detail:{promo_id}"
@@ -305,7 +269,7 @@ async def promo_toggle_handler(callback: types.CallbackQuery, i18n_data: dict,
await callback.answer(_("error_occurred_try_again"), show_alert=True)
except ValueError:
- await callback.answer(_("admin_invalid_promo_id", default="β ΠΠ΅Π²Π΅ΡΠ½ΡΠΉ ID ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
except Exception as e:
logging.error(f"Error toggling promo: {e}")
await callback.answer(_("error_occurred_try_again"), show_alert=True)
@@ -327,35 +291,31 @@ async def promo_activations_handler(callback: types.CallbackQuery, i18n_data: di
promo = await promo_code_dal.get_promo_code_by_id(session, promo_id)
if not promo:
- await callback.answer(_("admin_promo_not_found", default="β ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
return
activations = await promo_code_dal.get_promo_activations_by_code_id(session, promo_id)
- text_lines = [
- _("admin_promo_activations_title",
- default="π ΠΠΊΡΠΈΠ²Π°ΡΠΈΠΈ ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π° {code}\n",
- code=promo.code)
- ]
-
if not activations:
- text_lines.append(_("admin_no_activations", default="β ΠΠ΅Ρ Π°ΠΊΡΠΈΠ²Π°ΡΠΈΠΉ"))
+ text = _("admin_promo_no_activations", code=promo.code)
else:
- for activation in activations[:10]: # Show last 10
- activated_at = activation.activated_at.strftime("%d.%m.%Y %H:%M") if activation.activated_at else "N/A"
+ text_lines = [
+ _("admin_promo_activations_header", code=promo.code)
+ ]
+ for activation in activations[:20]:
text_lines.append(
- f"π€ {activation.user_id} | π {activated_at}"
+ _("admin_promo_activation_item",
+ user_id=activation.user_id,
+ date=activation.activated_at.strftime("%d.%m.%Y %H:%M"))
)
-
- if len(activations) > 10:
- text_lines.append(f"\n... ΠΈ Π΅ΡΠ΅ {len(activations) - 10}")
-
- text = "\n".join(text_lines)
+ if len(activations) > 20:
+ text_lines.append(f"\n... (Π΅ΡΠ΅ {len(activations) - 20})")
+ text = "\n".join(text_lines)
builder = InlineKeyboardBuilder()
builder.row(
InlineKeyboardButton(
- text=_("admin_back_to_promo", default="π Π ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Ρ"),
+ text=_("admin_promo_back_to_detail_button"),
callback_data=f"promo_detail:{promo_id}"
)
)
@@ -375,7 +335,7 @@ async def promo_activations_handler(callback: types.CallbackQuery, i18n_data: di
await callback.answer()
except ValueError:
- await callback.answer(_("admin_invalid_promo_id", default="β ΠΠ΅Π²Π΅ΡΠ½ΡΠΉ ID ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
except Exception as e:
logging.error(f"Error viewing activations: {e}")
await callback.answer(_("error_occurred_try_again"), show_alert=True)
@@ -399,16 +359,16 @@ async def promo_delete_handler(callback: types.CallbackQuery, i18n_data: dict,
if promo:
await session.commit()
await callback.answer(
- _("admin_promo_deleted", default="β
ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ ΡΠ΄Π°Π»Π΅Π½", code=promo.code)
+ _("admin_promo_deleted_success", code=promo.code)
)
# Go back to management
callback.data = "admin_action:promo_management"
await promo_management_handler(callback, i18n_data, settings, session)
else:
- await callback.answer(_("admin_promo_not_found", default="β ΠΡΠΎΠΌΠΎΠΊΠΎΠ΄ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
except ValueError:
- await callback.answer(_("admin_invalid_promo_id", default="β ΠΠ΅Π²Π΅ΡΠ½ΡΠΉ ID ΠΏΡΠΎΠΌΠΎΠΊΠΎΠ΄Π°"), show_alert=True)
+ await callback.answer(_("admin_promo_not_found"), show_alert=True)
except Exception as e:
logging.error(f"Error deleting promo: {e}")
await callback.answer(_("error_occurred_try_again"), show_alert=True)
@@ -419,4 +379,4 @@ async def manage_promo_codes_handler(callback: types.CallbackQuery,
i18n_data: dict, settings: Settings,
session: AsyncSession):
"""Redirect to new unified handler"""
- await promo_management_handler(callback, i18n_data, settings, session)
\ No newline at end of file
+ await promo_management_handler(callback, i18n_data, settings, session)