Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #165

Merged
merged 3 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ services:
- network
command: [ "tail", "-f", "/dev/null" ]

fastapi_server:
fastapi:
profiles: [ "fastapi", "1" ]
container_name: fastapi_server
container_name: fastapi
build:
context: .
dockerfile: Dockerfile-server
Expand All @@ -130,7 +130,7 @@ services:
networks:
- network
depends_on:
- fastapi_server
- fastapi

volumes:
db:
Expand Down
3 changes: 2 additions & 1 deletion src/handlers/reserve_admin_hl.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from db import db_postgres
from db.db_googlesheets import load_show_info, load_list_show
from db.enum import TicketStatus
from handlers import init_conv_hl_dialog
from handlers import init_conv_hl_dialog, check_user_db
from handlers.sub_hl import (
get_chose_ticket_and_price, get_emoji_and_options_for_event)
from settings.settings import DICT_OF_EMOJI_FOR_BUTTON
Expand All @@ -23,6 +23,7 @@ async def event_selection_option(
"""
"""
init_conv_hl_dialog(update, context)
await check_user_db(update, context)

user = context.user_data.setdefault('user', update.effective_user)

Expand Down
6 changes: 4 additions & 2 deletions src/handlers/reserve_hl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1018,8 +1018,10 @@ async def check_and_send_buy_info(
❗️ПЕРЕНОС ВОЗМОЖЕН ТОЛЬКО 1 РАЗ❗️
Более подробно о правилах возврата в группе театра <a href="https://vk.com/baby_theater_domik?w=wall-202744340_3109">ссылка</a>

Если вы согласны с правилами, то переходите к оплате.
Если вам нужно подумать, нажмите кнопку <b>Отменить</b> под сообщением.
Если вы согласны с правилами, то переходите к оплате:
- Если вам нужно подумать, нажмите кнопку <b>Отменить</b> под сообщением.
- Если вы уже сделали оплату, <b>отправьте квитанцию об оплате файлом или картинкой.</b>

__________
После оплаты необходимо:
1. Заполнить анкету (она придет автоматически)
Expand Down