Deploy bot fixes: menus and search order

bot/bot.js

@@ -104,9 +104,9 @@ const getMainMenu = () => {
     return Markup.inlineKeyboard([
         [Markup.button.callback('➕ Yangi tovar', 'action_addproduct'), Markup.button.callback('📦 Tovarlar', 'action_products_0')],
         [Markup.button.callback('📁 Kategoriyalar', 'action_categories'), Markup.button.callback('🔍 Qidirish', 'action_search')],
-        [Markup.button.callback('📋 Buyurtmalar', 'action_orders_0'), Markup.button.callback('📊 Statistika', 'action_stats')],
-        [Markup.button.callback('🏞 Reklamalar', 'action_banners'), Markup.button.callback('📥 Excel yuklash', 'action_export_excel')],
-        [Markup.button.callback('📢 Push Xabar Tarqatish', 'action_send_push')],
+        [Markup.button.callback('📋 Barcha Buyurtmalar', 'action_orders_0'), Markup.button.callback('🔎 Turniket (Chek O\'qish)', 'action_search_order')],
+        [Markup.button.callback('📊 Statistika', 'action_stats'), Markup.button.callback('🏞 Reklamalar', 'action_banners')],
+        [Markup.button.callback('📥 Excel yuklash', 'action_export_excel'), Markup.button.callback('📢 Push Xabar', 'action_send_push')],
         [Markup.button.callback('❓ Yordam', 'action_help')]
     ]);
 };
@@ -214,6 +214,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
         if (!isAdmin(ctx)) return;
         const cId = ctx.match[1];
         await ctx.answerCbQuery();
+        try { await ctx.deleteMessage(); } catch(e){}
         ctx.reply('⚠️ *Kategoriyani o\'chirmoqchimisiz?*\nUnga tegishli tovarlar o\'chmaydi, lekin kategoriyasi bo\'sh bo\'lib qoladi.', {
             parse_mode: 'Markdown',
             ...Markup.inlineKeyboard([[Markup.button.callback('✅ Ha, o\'chirish', `delcat_${cId}`), Markup.button.callback('❌ Yo\'q', 'action_categories')]])
@@ -357,6 +358,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
 
     bot.action(/del_confirm_(.*)/, async (ctx) => {
         if (!isAdmin(ctx)) return;
+        try { await ctx.deleteMessage(); } catch(e){}
         ctx.reply('⚠️ *O\'chirmoqchimisiz?*', { parse_mode: 'Markdown', ...Markup.inlineKeyboard([[Markup.button.callback('✅ Ha', `del_product_${ctx.match[1]}`), Markup.button.callback('❌ Yo\'q', 'action_home')]]) });
     });
     bot.action(/del_product_(.*)/, async (ctx) => {
@@ -453,6 +455,13 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
         ctx.reply('🔍 *Qidirish*\n\nTovar nomini yozib yuboring (Masalan: "Kastiyum"):', { parse_mode: 'Markdown' });
     });
 
+    bot.action('action_search_order', (ctx) => {
+        if (!isAdmin(ctx)) return;
+        appState[ctx.from.id] = { step: 'searching_order' };
+        ctx.answerCbQuery();
+        ctx.reply('🔎 *Turniket (Chek O\'qish)*\n\nMijoz ko\'rsatgan QR Koddagi 24 xonali ID raqamini yuboring:', { parse_mode: 'Markdown' });
+    });
+
     bot.action('action_export_excel', async (ctx) => {
         if (!isAdmin(ctx)) return;
         try {
@@ -546,13 +555,15 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
         } catch(e) { ctx.answerCbQuery('Xato: ' + e.message); }
     });
 
-    // 📸 Banner ko'rish (rasmli preview)
-    bot.action(/banner_view_(.+)/, async (ctx) => {
+    // 📸 Banner ko'rish yoki tahrirlash (rasmli preview)
+    bot.action(/banner_(view|edit)_(.+)/, async (ctx) => {
         if (!isAdmin(ctx)) return;
         try {
-            const banner = await Banner.findById(ctx.match[1]);
+            const bannerId = ctx.match[2];
+            const banner = await Banner.findById(bannerId);
             if (!banner) return ctx.answerCbQuery('Banner topilmadi');
             await ctx.answerCbQuery();
+            try { await ctx.deleteMessage(); } catch(e){}
             
             const titleStr = banner.title || '(Nomi yo\'q)';
             const subtitleStr = banner.subtitle || '—';
@@ -741,6 +752,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
     bot.action(/banner_del_confirm_(.+)/, async (ctx) => {
         if (!isAdmin(ctx)) return;
         ctx.answerCbQuery();
+        try { await ctx.deleteMessage(); } catch(e){}
         ctx.reply('⚠️ *Bannerni o\'chirmoqchimisiz?*\n\nBu amalni ortga qaytarib bo\'lmaydi.', {
             parse_mode: 'Markdown',
             ...Markup.inlineKeyboard([
@@ -943,6 +955,53 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
             delete appState[userId]; return;
         }
 
+        // ══════ B2C Kassir Qidiruv (Variant 2) ══════
+        if (state.step === 'searching_order') {
+            try {
+                const searchTxt = text.trim();
+                let order = null;
+                
+                // Mongoose ObjectId orqali qidirish (24 hex characters)
+                if (/^[0-9a-fA-F]{24}$/.test(searchTxt)) {
+                    order = await Order.findById(searchTxt);
+                } 
+                // Agar qisqa qidiruv bo'lsa
+                if (!order) {
+                    const match = await Order.find({ _id: { $regex: searchTxt, $options: 'i' } }).limit(1);
+                    if (match && match.length > 0) order = match[0];
+                }
+
+                if (!order) {
+                    ctx.reply('❌ Buyurtma topilmadi. Raqamni tekshirib qayta yuboring:', { reply_markup: { force_reply: true } });
+                    return; // Return so they can try again without dropping state
+                }
+
+                let productsText = "";
+                order.products.forEach(p => { 
+                    productsText += `— ${p.name} (${p.quantity} ta) x ${formatPrice(p.price)}\n`; 
+                });
+                
+                const statusEmoji = order.status === 'Kutilmoqda' ? '⏳' : order.status === 'Yetkazildi' ? '✅' : '🚚';
+                const msg = `🧾 *TOPILDI — ID:* \`${order._id}\`\n${thinLine}\n` +
+                            `👤 Mijoz: *${order.customerName}*\n📞 Tel: ${order.phone}\n\n📝 *Tovarlar:*\n${productsText}\n` +
+                            `💰 *Jami summa:* ${formatPrice(order.totalAmount)} so'm\n\n` +
+                            `Hozirgi holati: ${statusEmoji} ${order.status}\n\n` +
+                            `💳 *XARIDOR TO'LOV QILDIMI?*`;
+
+                const buttons = [
+                    [Markup.button.callback('✅ Pul Olindi (Yopish)', `order_status_deliver_${order._id}`)],
+                    [Markup.button.callback('❌ Bekor Qilish', `order_status_cancel_${order._id}`)],
+                    [Markup.button.callback('🏠 Menyu', 'action_home')]
+                ];
+
+                ctx.reply(msg, { parse_mode: 'Markdown', ...Markup.inlineKeyboard(buttons) });
+            } catch (e) {
+                ctx.reply('Xatolik yuz berdi: ' + e.message, getMainMenu());
+            }
+            delete appState[userId]; return;
+        }
+
+
         // Mahsulot edit
         if (state.step === 'editing_price') {
             const num = Number(text);