Refactor: Change address to comment to reflect in-store pickup model + Code cleanup

bot/bot.js

@@ -440,7 +440,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
                 let productsText = "";
                 o.products.forEach(p => { productsText += `— ${p.name} (${p.quantity} ta) \n`; });
                 let statusEmoji = o.status === 'Kutilmoqda' ? '⏳' : o.status === 'Xaridorga topshirildi' ? '✅' : o.status === 'Olib ketishga tayyor' ? '🛍' : '📥';
-                const msg = `🧾 *ID:* \`${o._id}\`\n👤 Mijoz: *${o.customerName}*\n📞 Tel: ${o.phone}\n📍 Izoh: ${o.address}\n\n📝 *Tovarlar:*\n${productsText}\n💰 *Jami:* ${formatPrice(o.totalAmount)} so'm\n📌 *Holati:* ${statusEmoji} ${o.status}\n🕒 Vaqt: ${formatDate(o.createdAt)}`;
+                const msg = `🧾 *ID:* \`${o._id}\`\n👤 Mijoz: *${o.customerName}*\n📞 Tel: ${o.phone}\n📍 Izoh: ${o.comment}\n\n📝 *Tovarlar:*\n${productsText}\n💰 *Jami:* ${formatPrice(o.totalAmount)} so'm\n📌 *Holati:* ${statusEmoji} ${o.status}\n🕒 Vaqt: ${formatDate(o.createdAt)}`;
                 
                 await ctx.reply(msg, { parse_mode: 'Markdown', ...orderStatusButtonsForNotify(o._id, o.status) });
             }
@@ -540,7 +540,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
                   `Quyidagi bo'limlar orqali do'konni to'liq boshqarasiz:\n\n` +
                   `📦 *Tovarlar* - Tahrirlash, O'chirish va Rasm o'zgartirish.\n` +
                   `📁 *Kategoriyalar* - Guruhlar yaratish, nomini o'zgartirish.\n` +
-                  `📋 *Buyurtmalar* - Holatini (qabul, yo'lda) tekshirish.\n` +
+                  `📋 *Buyurtmalar* - Holatini (yig'ilmoqda, tayyor) tasdiqlash.\n` +
                   `🔍 *Qidirish* - Ismi bilan izlab topib tahrirlash.\n` +
                   `📊 *Statistika* - Tushumlar va statistika.`;
         ctx.reply(msg, { parse_mode: 'Markdown' });
@@ -1212,21 +1212,6 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
             return;
         }
 
-        // AI Banner (eski usul backup)
-        if (state.step === 'ai_banner_prompt') {
-            try {
-                await ctx.reply('🧠 Gemini orqali prompt tayyorlanmoqda...');
-                const finalPrompt = await enhancePromptWithGemini(text);
-                appState[userId] = { step: 'ai_generating', lastPrompt: text, finalPrompt };
-                await generateAIBannerVariants(ctx, finalPrompt, text);
-            } catch (e) {
-                console.error("ai_banner_prompt error:", e);
-                ctx.reply('❌ Kechirasiz, tarmoqda xatolik yuz berdi. Iltimos qayta urining.', getMainMenu());
-                delete appState[userId];
-            }
-            return;
-        }
-        
         // Qidiruv
         if (state.step === 'searching_product') {
             try {

index.js

@@ -159,10 +159,10 @@ app.post('/api/validate-cart', async (req, res) => {
 
 // Yangi buyurtma yaratish
 app.post('/api/orders', async (req, res) => {
-    const { customerName, phone, address, products, totalAmount } = req.body;
+    const { customerName, phone, comment, products, totalAmount } = req.body;
 
     // ── Validatsiya ──
-    if (!customerName || !phone || !address) {
+    if (!customerName || !phone || !comment) {
         return res.status(400).json({ message: 'Barcha maydonlarni to\'ldiring' });
     }
     if (!products || !Array.isArray(products) || products.length === 0) {
@@ -186,7 +186,7 @@ app.post('/api/orders', async (req, res) => {
         const order = new Order({
             customerName,
             phone,
-            address,
+            comment,
             products,
             totalAmount
         });
@@ -200,7 +200,7 @@ app.post('/api/orders', async (req, res) => {
             productsText += `— ${p.name}${sizeStr} (${p.quantity} x ${Number(p.price).toLocaleString()}) \n`;
         });
 
-        const msg = `📦 *YANGI BUYURTMA!*\n\n👤 Mijoz: ${customerName}\n📞 Tel: ${phone}\n📍 Manzil: ${address}\n\n📝 Tovarlar:\n${productsText}\n💰 Umumiy: ${Number(totalAmount).toLocaleString()} so'm`;
+        const msg = `📦 *YANGI BUYURTMA!*\n\n👤 Mijoz: ${customerName}\n📞 Tel: ${phone}\n📍 Izoh: ${comment}\n\n📝 Tovarlar:\n${productsText}\n💰 Umumiy: ${Number(totalAmount).toLocaleString()} so'm`;
 
         await notifyAdmin(msg, createdOrder._id.toString());
 

models/Order.js

@@ -5,7 +5,7 @@ const orderSchema = mongoose.Schema(
         userId: { type: String, required: false },
         customerName: { type: String, required: true },
         phone: { type: String, required: true },
-        address: { type: String, required: true },
+        comment: { type: String, required: true },
         products: [
             {
                 productId: { type: mongoose.Schema.Types.ObjectId, ref: 'Product', required: true },
@@ -16,7 +16,7 @@ const orderSchema = mongoose.Schema(
             }
         ],
         totalAmount: { type: Number, required: true },
-        status: { type: String, default: 'Kutilmoqda' } // Kutilmoqda, Yo'lga chiqdi, Yetkazildi
+        status: { type: String, default: 'Kutilmoqda' } // Kutilmoqda, Yig'ilmoqda, Olib ketishga tayyor, Xaridorga topshirildi, Bekor qilindi
     },
     {
         timestamps: true,