Админ-панель: команда /admin, user_name при создании записи, отмена брони админом
This commit is contained in:
+2
-1
@@ -53,13 +53,14 @@ def save_bookings(bookings):
|
|||||||
_save_json(BOOKINGS_FILE, bookings)
|
_save_json(BOOKINGS_FILE, bookings)
|
||||||
|
|
||||||
|
|
||||||
def create_booking(user_id, service, master, date, time):
|
def create_booking(user_id, service, master, date, time, user_name=""):
|
||||||
from app.logger import logger
|
from app.logger import logger
|
||||||
logger.debug("create_booking called: uid={uid}, svc={svc}, master={mst}, date={dt}, time={tm}", uid=user_id, svc=service, mst=master, dt=date, tm=time)
|
logger.debug("create_booking called: uid={uid}, svc={svc}, master={mst}, date={dt}, time={tm}", uid=user_id, svc=service, mst=master, dt=date, tm=time)
|
||||||
bookings = load_bookings()
|
bookings = load_bookings()
|
||||||
booking = {
|
booking = {
|
||||||
"id": len(bookings) + 1,
|
"id": len(bookings) + 1,
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
|
"user_name": user_name,
|
||||||
"service": service,
|
"service": service,
|
||||||
"master": master,
|
"master": master,
|
||||||
"date": date,
|
"date": date,
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ from app.handlers.mybookings import router as mybookings_router
|
|||||||
from app.handlers.services import router as services_router
|
from app.handlers.services import router as services_router
|
||||||
from app.handlers.about import router as about_router
|
from app.handlers.about import router as about_router
|
||||||
from app.handlers.contacts import router as contacts_router
|
from app.handlers.contacts import router as contacts_router
|
||||||
|
from app.handlers.admin import router as admin_router
|
||||||
|
|
||||||
bot = Bot(token=BOT_TOKEN)
|
bot = Bot(token=BOT_TOKEN)
|
||||||
dp = Dispatcher()
|
dp = Dispatcher()
|
||||||
@@ -29,6 +30,7 @@ dp.include_routers(
|
|||||||
services_router,
|
services_router,
|
||||||
about_router,
|
about_router,
|
||||||
contacts_router,
|
contacts_router,
|
||||||
|
admin_router,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ from app.db.memory import (
|
|||||||
from app.logger import logger
|
from app.logger import logger
|
||||||
|
|
||||||
|
|
||||||
async def create_booking(user_id, service, master, date, time):
|
async def create_booking(user_id, service, master, date, time, user_name=""):
|
||||||
return db_create_booking(user_id, service, master, date, time)
|
return db_create_booking(user_id, service, master, date, time, user_name)
|
||||||
|
|
||||||
|
|
||||||
async def get_busy_times(master, date):
|
async def get_busy_times(master, date):
|
||||||
|
|||||||
Reference in New Issue
Block a user