From f75415d9d9fa3651446a9c429eb6099b7d7b4836 Mon Sep 17 00:00:00 2001 From: pi3c Date: Tue, 13 Feb 2024 12:38:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B1=D0=BB=D1=8E=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/.~lock.Menu.xlsx# | 1 + admin/Menu.xlsx | Bin 10099 -> 10003 bytes bg_tasks/updater.py | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 admin/.~lock.Menu.xlsx# diff --git a/admin/.~lock.Menu.xlsx# b/admin/.~lock.Menu.xlsx# new file mode 100644 index 0000000..9e281c7 --- /dev/null +++ b/admin/.~lock.Menu.xlsx# @@ -0,0 +1 @@ +,pi3c,pi3code,13.02.2024 12:37,file:///home/pi3c/.config/libreoffice/4; diff --git a/admin/Menu.xlsx b/admin/Menu.xlsx index 216bc3d21bb3bfc5776d63b55e18cbb62ce240e1..b0969a4565cbf402c56741dee7a240c6a3de6bb3 100644 GIT binary patch delta 6701 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 delta 6794 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 None: for key in {k: cached_dishes[k] for k in set(cached_dishes) - set(dishes)}: # Проверяем на удаленные меню - await on_submenu_change({}, cached_dishes.pop(key), session) + await on_dish_change({}, cached_dishes.pop(key), session) for key in dishes.keys(): parent = cached_submenus[dishes[key]['parent_num']]['id'] @@ -271,7 +271,7 @@ async def dishes_updater(dishes: dict, session: AsyncSession) -> None: f"DISCONT:{dishes[key]['id']}", pickle.dumps(dishes[key]['discont']) ) - await redis.set('ALL_DISHES', pickle.dumps(dishes)) + await redis.set('ALL_DISHES', pickle.dumps(dishes)) async def updater(rows):