Refactor order flow to In-Store Pickup model (remove address, update statuses)

bot/bot.js

@@ -439,8 +439,8 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
             for (const o of orders) {
                 let productsText = "";
                 o.products.forEach(p => { productsText += `— ${p.name} (${p.quantity} ta) \n`; });
-                let statusEmoji = o.status === 'Kutilmoqda' ? '⏳' : o.status === 'Yetkazildi' ? '✅' : '🚚';
-                const msg = `🧾 *ID:* \`${o._id}\`\n👤 Mijoz: *${o.customerName}*\n📞 Tel: ${o.phone}\n📍 Manz.: ${o.address}\n\n📝 *Tovarlar:*\n${productsText}\n💰 *Jami:* ${formatPrice(o.totalAmount)} so'm\n📌 *Holati:* ${statusEmoji} ${o.status}\n🕒 Vaqt: ${formatDate(o.createdAt)}`;
+                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)}`;
                 
                 await ctx.reply(msg, { parse_mode: 'Markdown', ...orderStatusButtonsForNotify(o._id, o.status) });
             }
@@ -460,9 +460,9 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
         const orderId = ctx.match[2];
         
         let newStatus = 'Kutilmoqda';
-        if (action === 'accept') newStatus = 'Qabul qilindi';
-        if (action === 'ship') newStatus = 'Yo\'lga chiqdi';
-        if (action === 'deliver') newStatus = 'Yetkazildi';
+        if (action === 'accept') newStatus = 'Yig\'ilmoqda';
+        if (action === 'ship') newStatus = 'Olib ketishga tayyor';
+        if (action === 'deliver') newStatus = 'Xaridorga topshirildi';
         if (action === 'cancel') newStatus = 'Bekor qilindi';
 
         try {
@@ -1046,7 +1046,7 @@ if (process.env.BOT_TOKEN && process.env.BOT_TOKEN !== 'YOUR_TELEGRAM_BOT_TOKEN'
                     productsText += `— ${p.name} (${p.quantity} ta) x ${formatPrice(p.price)}\n`; 
                 });
                 
-                const statusEmoji = order.status === 'Kutilmoqda' ? '⏳' : order.status === 'Yetkazildi' ? '✅' : '🚚';
+                const statusEmoji = order.status === 'Kutilmoqda' ? '⏳' : order.status === 'Xaridorga topshirildi' ? '✅' : order.status === 'Olib ketishga tayyor' ? '🛍' : '📥';
                 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` +
@@ -1418,11 +1418,11 @@ const orderStatusButtonsForNotify = (orderId, currentStatus) => {
     const s = (label, status) => currentStatus === status ? `✅ ${label}` : label;
     return Markup.inlineKeyboard([
         [
-            Markup.button.callback(s('📥 Qabul', 'Qabul qilindi'), `order_status_accept_${orderId}`),
-            Markup.button.callback(s('🚚 Yo\'lda', 'Yo\'lga chiqdi'), `order_status_ship_${orderId}`)
+            Markup.button.callback(s('📥 Yig\'ish', 'Yig\'ilmoqda'), `order_status_accept_${orderId}`),
+            Markup.button.callback(s('🛍 Tayyor', 'Olib ketishga tayyor'), `order_status_ship_${orderId}`)
         ],
         [
-            Markup.button.callback(s('🏁 Yetkazildi', 'Yetkazildi'), `order_status_deliver_${orderId}`),
+            Markup.button.callback(s('✅ Topshirildi', 'Xaridorga topshirildi'), `order_status_deliver_${orderId}`),
             Markup.button.callback(s('❌ Bekor', 'Bekor qilindi'), `order_status_cancel_${orderId}`)
         ]
     ]);