Standardize_Cancel_To_MainMenu_Logic

src/scenes/admin/addProduct.js

@@ -1,66 +1,98 @@
 const { Scenes, Markup } = require('telegraf');
 const Product = require('../../models/Product');
 const Category = require('../../models/Category');
+const userController = require('../../controllers/userController');
 
 const addProductScene = new Scenes.WizardScene(
     'ADD_PRODUCT_SCENE',
     // Step 1: Ask Name
     (ctx) => {
+        if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         ctx.wizard.state.product = { media: [] };
-        ctx.reply("🆕 Yangi mahsulot qo'shish.\n\nIltimos, mahsulot nomini kiriting:", Markup.removeKeyboard());
+        ctx.reply("🆕 Yangi mahsulot qo'shish.\n\nIltimos, mahsulot nomini kiriting:", Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
     // Step 2: Ask Price
     (ctx) => {
+        if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!ctx.message || !ctx.message.text) return ctx.reply("Iltimos, tekst ko'rinishida yozing");
         ctx.wizard.state.product.name = ctx.message.text;
 
-        ctx.reply("💰 Mahsulot narxini kiriting (faqat raqam, masalan: 120000):");
+        ctx.reply("💰 Mahsulot narxini kiriting (faqat raqam, masalan: 120000):", Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
     // Step 3: Ask Quantity
     (ctx) => {
+        if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!ctx.message || !ctx.message.text || isNaN(ctx.message.text)) return ctx.reply("Iltimos, narxni raqamda kiriting");
         ctx.wizard.state.product.price = parseInt(ctx.message.text);
 
-        ctx.reply("🔢 Mahsulot sonini kiriting (Omborda nechta bor?):");
+        ctx.reply("🔢 Mahsulot sonini kiriting (Omborda nechta bor?):", Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
     // Step 4: Ask Description
     (ctx) => {
+        if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!ctx.message || !ctx.message.text || isNaN(ctx.message.text)) return ctx.reply("Iltimos, sonini raqamda kiriting");
         ctx.wizard.state.product.quantity = parseInt(ctx.message.text);
 
-        ctx.reply("📝 Mahsulot haqida ma'lumot (tavsif) yozing:");
+        ctx.reply("📝 Mahsulot haqida ma'lumot (tavsif) yozing:", Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
-    // Step 4: Ask Category
+    // Step 4: Ask Category (Actually Step 5)
     async (ctx) => {
+        if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!ctx.message || !ctx.message.text) return ctx.reply("Iltimos, tavsifni yozing");
         ctx.wizard.state.product.description = ctx.message.text;
 
         const categories = await Category.find();
         const buttons = categories.map(c => c.name);
         buttons.push("➕ Yangi kategoriya");
+        buttons.push("❌ Bekor qilish");
 
         ctx.reply("📂 Kategoriyani tanlang yoki yangisini yarating:", Markup.keyboard(buttons).oneTime().resize());
         return ctx.wizard.next();
     },
-    // Step 5: Handle Category Selection
+    // Step 5: Handle Category Selection (Step 6)
     (ctx) => {
         const text = ctx.message?.text;
+        if (text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!text) return ctx.reply("Kategoriyani tanlang");
 
         if (text === "➕ Yangi kategoriya") {
             ctx.wizard.state.isNewCategory = true;
-            ctx.reply("Yangi kategoriya nomini yozing:");
+            ctx.reply("Yangi kategoriya nomini yozing:", Markup.keyboard([['❌ Bekor qilish']]).resize());
             return ctx.wizard.next();
         } else {
             ctx.wizard.state.isNewCategory = false;
             ctx.wizard.state.product.category = text;
 
             ctx.reply("📸 Endi mahsulot rasmlari yoki videolarini yuklang.\n\nBir nechta rasm/video tashlashingiz mumkin. Barchasini yuklab bo'lgach, '✅ Tayyor' tugmasini bosing.",
-                Markup.keyboard(['✅ Tayyor']).resize()
+                Markup.keyboard(['✅ Tayyor', '❌ Bekor qilish']).resize()
             );
             return ctx.wizard.selectStep(7);
         }
@@ -68,6 +100,11 @@ const addProductScene = new Scenes.WizardScene(
     // Step 7: Handle New Category Name
     async (ctx) => {
         const text = ctx.message?.text;
+        if (text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
         if (!text) return ctx.reply("Kategoriya nomini matn sifatida yozing");
 
         const newCat = text;
@@ -79,7 +116,7 @@ const addProductScene = new Scenes.WizardScene(
             ctx.reply(`Yangi kategoriya yaratildi: ${newCat}`);
 
             ctx.reply("📸 Endi mahsulot rasmlari yoki videolarini yuklang.\n\nBir nechta rasm/video tashlashingiz mumkin. Barchasini yuklab bo'lgach, '✅ Tayyor' tugmasini bosing.",
-                Markup.keyboard(['✅ Tayyor']).resize()
+                Markup.keyboard(['✅ Tayyor', '❌ Bekor qilish']).resize()
             );
             return ctx.wizard.next();
         } catch (err) {
@@ -91,6 +128,12 @@ const addProductScene = new Scenes.WizardScene(
     async (ctx) => {
         const msg = ctx.message;
 
+        if (msg.text === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
+
         if (msg.text === '✅ Tayyor') {
             if (ctx.wizard.state.product.media.length === 0) {
                 return ctx.reply("Kamida bitta rasm yoki video yuklashingiz kerak!");
@@ -107,7 +150,6 @@ const addProductScene = new Scenes.WizardScene(
                 ctx.reply(`✅ Mahsulot qo'shildi!\n\nNom: ${productData.name}\nNarx: ${productData.price}\nSoni: ${productData.quantity} ta\nKategoriya: ${productData.category}\nMedia: ${productData.media.length} ta fayl.`);
 
                 // Redirect to Main Menu
-                const userController = require('../../controllers/userController');
                 userController.start(ctx);
                 return ctx.scene.leave();
             } catch (err) {
@@ -129,9 +171,9 @@ const addProductScene = new Scenes.WizardScene(
 
         const count = ctx.wizard.state.product.media.length;
         if (count >= 4) {
-            ctx.reply("📸 Maksimal 4 ta rasm/video yuklandi. Iltimos, '✅ Tayyor' tugmasini bosing.", Markup.keyboard(['✅ Tayyor']).resize());
+            ctx.reply("📸 Maksimal 4 ta rasm/video yuklandi. Iltimos, '✅ Tayyor' tugmasini bosing.", Markup.keyboard(['✅ Tayyor', '❌ Bekor qilish']).resize());
         } else {
-            ctx.reply(`Media qo'shildi (${count}/4)! Yana bormi?`, Markup.keyboard(['✅ Tayyor']).resize());
+            ctx.reply(`Media qo'shildi (${count}/4)! Yana bormi?`, Markup.keyboard(['✅ Tayyor', '❌ Bekor qilish']).resize());
         }
     }
 );

src/scenes/admin/broadcast.js

@@ -1,18 +1,20 @@
 const { Scenes, Markup } = require('telegraf');
 const User = require('../../models/User');
+const userController = require('../../controllers/userController');
 
 const broadcastScene = new Scenes.WizardScene(
     'BROADCAST_SCENE',
     // Step 1: Ask for content
     (ctx) => {
-        ctx.reply("📢 Reklama xabarini yuboring (Matn, Rasm yoki Video):\n\nBekor qilish uchun: /cancel", Markup.removeKeyboard());
+        ctx.reply("📢 Reklama xabarini yuboring (Matn, Rasm yoki Video):", Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
     // Step 2: Confirm
     (ctx) => {
-        if (ctx.message.text === '/cancel') {
-            ctx.reply("Bekor qilindi.");
-            return ctx.scene.leave();
+        if (ctx.message && (ctx.message.text === '/cancel' || ctx.message.text === '❌ Bekor qilish')) {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
         }
 
         ctx.wizard.state.message = ctx.message; // Save the message object
@@ -33,8 +35,9 @@ const broadcastScene = new Scenes.WizardScene(
             const action = ctx.callbackQuery.data;
             if (action === 'cancel_send') {
                 ctx.deleteMessage();
-                ctx.reply("Reklama bekor qilindi.");
-                return ctx.scene.leave();
+                ctx.scene.leave();
+                userController.start(ctx, "Reklama bekor qilindi.");
+                return;
             } else if (action === 'confirm_send') {
                 await ctx.deleteMessage();
                 ctx.reply("🚀 Xabar yuborilmoqda...");
@@ -63,10 +66,16 @@ const broadcastScene = new Scenes.WizardScene(
                 }
 
                 ctx.reply(`🏁 Tugadi!\n\n✅ Yetib bordi: ${success}\n🚫 Bloklagan/Xato: ${blocked}`);
+                userController.start(ctx); // Return to menu
                 return ctx.scene.leave();
             }
         } else {
-            ctx.reply("Iltimos tugmani bosing.");
+            // Handle text input during buttonwait?
+            if (ctx.message && ctx.message.text === '❌ Bekor qilish') {
+                ctx.scene.leave();
+                userController.start(ctx, "Bekor qilindi.");
+                return;
+            }
         }
     }
 );

src/scenes/admin/editProduct.js

@@ -1,6 +1,7 @@
 const { Scenes, Markup } = require('telegraf');
 const Product = require('../../models/Product');
 const Category = require('../../models/Category');
+const userController = require('../../controllers/userController');
 
 // Helper to show confirmation
 const askConfirmation = (ctx, field, value, product) => {
@@ -9,7 +10,7 @@ const askConfirmation = (ctx, field, value, product) => {
 
     ctx.reply(`⚠️ <b>Tasdiqlaysizmi?</b>\n\nMaydon: ${field}\nEski: ${field === 'media' ? 'Media fayllar' : (product[field] || 'Yo\'q')}\nYangi: ${displayValue}`, {
         parse_mode: 'HTML',
-        ...Markup.keyboard([['✅ Ha', '❌ Yo\'q']]).resize().oneTime()
+        ...Markup.keyboard([['✅ Ha', '❌ Bekor qilish']]).resize().oneTime()
     });
 };
 
@@ -42,8 +43,9 @@ const editProductScene = new Scenes.WizardScene(
     async (ctx) => {
         const text = ctx.message.text;
         if (text === '❌ Bekor qilish' || text === '/start') {
-            ctx.reply("Tahrirlash bekor qilindi.", Markup.removeKeyboard());
-            return ctx.scene.leave();
+            ctx.scene.leave();
+            userController.start(ctx, "Tahrirlash bekor qilindi.");
+            return;
         }
 
         let field = '';
@@ -72,14 +74,23 @@ const editProductScene = new Scenes.WizardScene(
             return ctx.wizard.selectStep(4); // Go to Media Handler
         }
 
-        ctx.reply(`Yangi ${text.toLowerCase()} kiriting:`, Markup.removeKeyboard());
+        ctx.reply(`Yangi ${text.toLowerCase()} kiriting:`, Markup.keyboard([['❌ Bekor qilish']]).resize());
         return ctx.wizard.next();
     },
     // Step 2: Handle Text/Number Input (Index 2)
     async (ctx) => {
         const newValue = ctx.message.text;
-        if (!newValue || newValue === '❌ Bekor qilish') return ctx.scene.leave();
-        if (newValue.startsWith('/')) return ctx.scene.leave();
+        if (!newValue || newValue === '❌ Bekor qilish') {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
+
+        if (newValue.startsWith('/')) {
+            ctx.scene.leave();
+            userController.start(ctx);
+            return;
+        }
 
         if (ctx.wizard.state.field === 'price' || ctx.wizard.state.field === 'quantity') {
             if (isNaN(newValue)) return ctx.reply("Iltimos, raqam kiriting.");
@@ -94,7 +105,11 @@ const editProductScene = new Scenes.WizardScene(
     // Step 3: Handle Category Input (Index 3)
     async (ctx) => {
         const tex = ctx.message.text;
-        if (!tex || tex === '❌ Bekor qilish' || tex.startsWith('/')) return ctx.scene.leave();
+        if (!tex || tex === '❌ Bekor qilish' || tex.startsWith('/')) {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
 
         ctx.wizard.state.newValue = tex;
 
@@ -104,7 +119,11 @@ const editProductScene = new Scenes.WizardScene(
     // Step 4: Handle Media Input (Index 4)
     async (ctx) => {
         const msg = ctx.message;
-        if (msg.text === '❌ Bekor qilish' || (msg.text && msg.text.startsWith('/'))) return ctx.scene.leave();
+        if (msg.text === '❌ Bekor qilish' || (msg.text && msg.text.startsWith('/'))) {
+            ctx.scene.leave();
+            userController.start(ctx, "Bekor qilindi.");
+            return;
+        }
 
         if (msg.text === '✅ Tayyor') {
             if (ctx.wizard.state.newMedia.length === 0) return ctx.reply("Kamida bitta rasm yuboring.");
@@ -136,17 +155,16 @@ const editProductScene = new Scenes.WizardScene(
                 const update = {};
                 update[ctx.wizard.state.field] = ctx.wizard.state.newValue;
                 await Product.updateOne({ id: ctx.wizard.state.product.id }, update);
-                ctx.reply("✅ Muvaffaqiyatli saqlandi!");
+                ctx.reply("✅ Muvaffaqiyatli saqlandi!", Markup.removeKeyboard());
 
                 // Redirect to Main Menu
-                const userController = require('../../controllers/userController');
                 userController.start(ctx);
             } catch (e) {
                 console.error(e);
                 ctx.reply("Xatolik bo'ldi.");
             }
         } else {
-            ctx.reply("Bekor qilindi.", Markup.removeKeyboard());
+            userController.start(ctx, "Bekor qilindi.");
         }
         return ctx.scene.leave();
     }