Retry_Implement_Full_Order_Lifecycle

src/controllers/adminController.js

@@ -95,7 +95,8 @@ exports.viewOrder = async (ctx, orderId) => {
         let text = `📦 **Buyurtma #${order.id}**\n` +
             `👤 Mijoz: ${order.user}\n` +
             `📞 Tel: ${order.phone}\n` +
-            `📅 Vaqt: ${new Date(order.createdAt).toLocaleString()}\n\n` +
+            `📅 Vaqt: ${new Date(order.createdAt).toLocaleString()}\n` +
+            `📊 Status: ${order.status.toUpperCase()}\n\n` +
             `🛒 **Mahsulotlar:**\n`;
 
         order.items.forEach(i => {
@@ -108,10 +109,32 @@ exports.viewOrder = async (ctx, orderId) => {
             ctx.replyWithLocation(order.location.latitude, order.location.longitude);
         }
 
-        const contextKeyboard = Markup.inlineKeyboard([
-            [Markup.button.callback("✅ Qabul qilish", `order_accept_${order.id}`), Markup.button.callback("❌ Bekor qilish", `order_reject_${order.id}`)],
-            [Markup.button.callback("🔙 Orqaga", "admin_orders_new")]
-        ]);
+        // Dynamic Buttons based on Status
+        let actionButtons = [];
+        if (order.status === 'new') {
+            actionButtons = [
+                [Markup.button.callback("✅ Qabul qilish", `order_accept_${order.id}`), Markup.button.callback("❌ Bekor qilish", `order_reject_${order.id}`)]
+            ];
+        } else if (order.status === 'accepted') {
+            actionButtons = [
+                [Markup.button.callback("🧾 Chek chiqarish", `gen_invoice_${order.id}`)],
+                [Markup.button.callback("🚚 Yuborish (Dostavka)", `order_ship_${order.id}`)],
+                [Markup.button.callback("❌ Bekor qilish", `order_reject_${order.id}`)]
+            ];
+        } else if (order.status === 'shipping') {
+            actionButtons = [
+                [Markup.button.callback("🏁 Yetkazib berildi", `order_deliver_${order.id}`)],
+                [Markup.button.callback("❌ Bekor qilish", `order_reject_${order.id}`)]
+            ];
+        } else if (order.status === 'delivered') {
+            actionButtons = [
+                [Markup.button.callback("✅ Bajarildi (Arxiv)", "admin_orders_new")] // Just close
+            ];
+        }
+
+        actionButtons.push([Markup.button.callback("🔙 Orqaga", "admin_orders_new")]);
+
+        const contextKeyboard = Markup.inlineKeyboard(actionButtons);
 
         ctx.editMessageText(text, { parse_mode: 'HTML', ...contextKeyboard })
             .catch(e => ctx.replyWithHTML(text, contextKeyboard));
@@ -145,27 +168,80 @@ exports.acceptOrder = async (ctx, orderId) => {
     try {
         const id = parseInt(orderId);
         await Order.updateOne({ id: id }, { status: 'accepted' });
-
         const order = await Order.findOne({ id: id });
 
         ctx.answerCbQuery("Buyurtma qabul qilindi ✅");
 
-        // Show Invoice Button after accept
-        ctx.editMessageText(`✅ **Buyurtma #${id} QABUL QILINDI**\nMijozga xabar yuborildi.`,
-            Markup.inlineKeyboard([
-                [Markup.button.callback("🧾 Chek chiqarish", `gen_invoice_${id}`)],
-                [Markup.button.callback("🔙 Orqaga", "admin_orders_new")]
-            ])
-        );
-
+        // Notify User
         if (order) {
-            ctx.telegram.sendMessage(order.userId, `✅ Sizning #${id} raqamli buyurtmangiz qabul qilindi! Tez orada yetkazib beriladi.`);
+            const User = require('../models/User');
+            const locales = require('../locales');
+            const user = await User.findOne({ id: order.userId });
+            const lang = (user && user.language) ? user.language : 'uz';
+            const i18n = locales[lang] || locales.uz;
+
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_accepted}\nBuyurtma #${id} qabul qilindi. Tez orada aloqaga chiqamiz.`);
         }
+
+        // Refresh View
+        exports.viewOrder(ctx, id);
     } catch (err) {
         console.error(err);
     }
 };
 
+// Ship Order
+exports.shipOrder = async (ctx, orderId) => {
+    try {
+        const id = parseInt(orderId);
+        await Order.updateOne({ id: id }, { status: 'shipping' });
+        const order = await Order.findOne({ id: id });
+
+        ctx.answerCbQuery("Buyurtma yo'lga chiqdi 🚚");
+
+        // Notify User
+        if (order) {
+            const User = require('../models/User');
+            const locales = require('../locales');
+            const user = await User.findOne({ id: order.userId });
+            const lang = (user && user.language) ? user.language : 'uz';
+            const i18n = locales[lang] || locales.uz;
+
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_shipping}\nBuyurtma #${id} yo'lga chiqdi (Dostavka).`);
+        }
+
+        exports.viewOrder(ctx, id);
+    } catch (e) {
+        console.error(e);
+    }
+};
+
+// Deliver Order
+exports.deliverOrder = async (ctx, orderId) => {
+    try {
+        const id = parseInt(orderId);
+        await Order.updateOne({ id: id }, { status: 'delivered' });
+        const order = await Order.findOne({ id: id });
+
+        ctx.answerCbQuery("Buyurtma yetkazildi 🏁");
+
+        // Notify User
+        if (order) {
+            const User = require('../models/User');
+            const locales = require('../locales');
+            const user = await User.findOne({ id: order.userId });
+            const lang = (user && user.language) ? user.language : 'uz';
+            const i18n = locales[lang] || locales.uz;
+
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_delivered}\nBuyurtma #${id} yetkazib berildi. Xaridingiz uchun rahmat!`);
+        }
+
+        exports.viewOrder(ctx, id);
+    } catch (e) {
+        console.error(e);
+    }
+};
+
 // Generate Invoice Action Handler
 exports.showInvoice = async (ctx, orderId) => {
     try {
@@ -191,6 +267,7 @@ exports.rejectOrder = async (ctx, orderId) => {
 
         // Restore Stock Logic (Automatic Refund)
         if (order.status !== 'canceled') {
+            const Product = require('../models/Product');
             for (const item of order.items) {
                 await Product.updateOne({ id: item.id }, { $inc: { quantity: item.count } });
             }
@@ -199,11 +276,19 @@ exports.rejectOrder = async (ctx, orderId) => {
         await Order.updateOne({ id: id }, { status: 'canceled' });
 
         ctx.answerCbQuery("Buyurtma bekor qilindi ❌");
-        ctx.editMessageText(`❌ **Buyurtma #${id} BEKOR QILINDI**\nOmborga qaytarildi (Refund).`, Markup.inlineKeyboard([[Markup.button.callback("🔙 Orqaga", "admin_orders_new")]]));
 
+        // Notify User
         if (order) {
-            ctx.telegram.sendMessage(order.userId, `❌ Sizning #${id} raqamli buyurtmangiz bekor qilindi.\n(Agar to'lov qilgan bo'lsangiz, admin bilan bog'laning)`);
+            const User = require('../models/User');
+            const locales = require('../locales');
+            const user = await User.findOne({ id: order.userId });
+            const lang = (user && user.language) ? user.language : 'uz';
+            const i18n = locales[lang] || locales.uz;
+
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_canceled}\nBuyurtma #${id} bekor qilindi.\n(Sabab bo'lsa admin bilan bog'laning)`);
         }
+
+        exports.showNewOrders(ctx);
     } catch (err) {
         console.error(err);
     }

src/main.js

@@ -97,6 +97,9 @@ bot.action(/edit_prod_(.+)/, (ctx) => {
 bot.action(/admin_order_(.+)/, (ctx) => adminController.viewOrder(ctx, ctx.match[1]));
 bot.action(/order_accept_(.+)/, (ctx) => adminController.acceptOrder(ctx, ctx.match[1]));
 bot.action(/order_reject_(.+)/, (ctx) => adminController.rejectOrder(ctx, ctx.match[1]));
+bot.action(/order_ship_(.+)/, (ctx) => adminController.shipOrder(ctx, ctx.match[1])); // NEW
+bot.action(/order_deliver_(.+)/, (ctx) => adminController.deliverOrder(ctx, ctx.match[1])); // NEW
+bot.action(/gen_invoice_(.+)/, (ctx) => adminController.showInvoice(ctx, ctx.match[1]));
 bot.action(/delete_prod_(.+)/, (ctx) => adminController.deleteProduct(ctx, ctx.match[1]));
 
 // User Commands