PEP

handlers/callback/__init__.py

@@ -1,4 +1,5 @@
 from . import null
 from . import catalog
 from . import cart
-from . import admin
+from . import admin
+from . import operator

handlers/callback/admin/catalog.py

@@ -1,4 +1,4 @@
-import io 
+import io
 
 from aiogram import types
 
@@ -25,9 +25,10 @@ async def next_item_adm(callback: types.CallbackQuery):
             ),
             parse_mode="Markdown",
         ),
-        reply_markup=item_list(count, len(items)-1, int(data[2]))
+        reply_markup=item_list(count, len(items) - 1, int(data[2]))
     )
 
+
 @dp.callback_query_handler(lambda c: c.data.split("|")[0] == 'delete_post', is_admin=True)
 async def delete_post_adm(callback: types.CallbackQuery):
     data = callback.data.split("|")
@@ -47,7 +48,7 @@ async def delete_post_adm(callback: types.CallbackQuery):
                 ),
                 parse_mode="Markdown",
             ),
-            reply_markup=item_list(items=len(items)-1)
+            reply_markup=item_list(items=len(items) - 1)
         )
     else:
         await callback.message.delete()
@@ -57,4 +58,4 @@ async def delete_post_adm(callback: types.CallbackQuery):
             reply_markup=back_to_main_menu
         )
     await callback.answer("Товар удалён!")
-    await callback.answer()
+    await callback.answer()

handlers/callback/admin/user.py

@@ -1,4 +1,3 @@
-from subprocess import call
 from aiogram import types
 
 from load import dp, messages
@@ -20,6 +19,7 @@ async def next_item_adm(callback: types.CallbackQuery):
     )
     await callback.answer()
 
+
 @dp.callback_query_handler(lambda x: x.data.split("|")[0] == "delete_admin")
 async def delete_admin(callback: types.CallbackQuery):
     data = callback.data.split("|")

handlers/callback/cart.py

@@ -1,6 +1,6 @@
 import io
 
-from aiogram import types 
+from aiogram import types
 
 from load import dp, messages
 from utils.database.cart import add_to_cart, get_user_cart, del_from_cart
@@ -9,14 +9,15 @@ from keyboard.inline.cart import cart_list
 from keyboard.default.main_menu import back_to_main_menu
 
 
-@dp.callback_query_handler(lambda c: c.data.split("|")[0]=="add_to_cart")
+@dp.callback_query_handler(lambda c: c.data.split("|")[0] == "add_to_cart")
 async def add_cart(callback: types.CallbackQuery):
-    item_id = callback.data.split("|")[1]
+    item = int(callback.data.split("|")[1])
+    item_id = Catalog.get_catalog()[item]["id"]
     add_to_cart(callback.from_user.id, item_id)
     await callback.answer("Товар добавлен!")
 
 
-@dp.callback_query_handler(lambda c: c.data.split("|")[0]=="del_from_cart")
+@dp.callback_query_handler(lambda c: c.data.split("|")[0] == "del_from_cart")
 async def del_cart(callback: types.CallbackQuery):
     c = callback.data.split("|")[1]
     item_id = get_user_cart(callback.from_user.id)[int(c)][0]
@@ -26,7 +27,7 @@ async def del_cart(callback: types.CallbackQuery):
     items = get_user_cart(callback.from_user.id)
 
     if items:
-        index, count =items[0]
+        index, count = items[0]
         item = Catalog.get_catalog(index)
         await callback.message.edit_media(
             media=types.InputMediaPhoto(
@@ -35,11 +36,11 @@ async def del_cart(callback: types.CallbackQuery):
                     name=item["name"],
                     description=item["description"],
                     count=count,
-                    price=item['price']*count
+                    price=item['price'] * count
                 ),
                 parse_mode="Markdown",
             ),
-            reply_markup=cart_list(items=len(items)-1)
+            reply_markup=cart_list(items=len(items) - 1)
         )
     else:
         await callback.message.delete()
@@ -66,9 +67,9 @@ async def next_item(callback: types.CallbackQuery):
                 name=item["name"],
                 description=item["description"],
                 count=count,
-                price=item['price']*count
+                price=item['price'] * count
             ),
             parse_mode="Markdown",
         ),
-        reply_markup=cart_list(c, len(items)-1)
+        reply_markup=cart_list(c, len(items) - 1)
     )

handlers/callback/catalog.py

@@ -26,4 +26,3 @@ async def next_item(callback: types.CallbackQuery):
         ),
         reply_markup=item_list(count, len(items)-1, int(data[2]))
     )
-

handlers/callback/null.py

@@ -2,6 +2,7 @@ from aiogram.types import CallbackQuery
 
 from load import dp
 
+
 @dp.callback_query_handler(lambda c: c.data == "null")
 async def null(callback: CallbackQuery):
     await callback.answer()