Maximal_Localization_System_Refactor

src/controllers/adminController.js

@@ -18,8 +18,21 @@ const getDashboardButtons = () => {
 
 // Admin Dashboard Menu
 exports.showDashboard = (ctx) => {
-    const text = "👨‍💼 **Admin Panel**\n\nBo'limni tanlang:";
-    const keyboard = Markup.inlineKeyboard(getDashboardButtons());
+    // Middleware ensures ctx.i18n is present
+    const i18n = ctx.i18n;
+    const text = i18n.admin.dash_title;
+
+    // Dynamic Buttons
+    const buttons = [
+        [Markup.button.callback(i18n.admin.btn_stats, "admin_stats"), Markup.button.callback(i18n.admin.btn_new_orders, "admin_orders_new")],
+        [Markup.button.callback(i18n.admin.btn_add_prod, "admin_add_product"), Markup.button.callback(i18n.admin.btn_del_prod, "admin_delete_product")],
+        [Markup.button.callback(i18n.admin.btn_edit_prod, "admin_edit_product_list"), Markup.button.callback(i18n.admin.btn_users, "admin_users")],
+        [Markup.button.callback(i18n.admin.btn_excel, "admin_excel_export"), Markup.button.callback(i18n.admin.btn_broadcast, "admin_broadcast")],
+        [Markup.button.callback(i18n.admin.btn_flash, "admin_flash_sale"), Markup.button.callback(i18n.admin.btn_inv, "admin_inventory")],
+        [Markup.button.callback(i18n.admin.btn_settings, "admin_settings"), Markup.button.callback(i18n.admin.btn_api, "admin_api")]
+    ];
+
+    const keyboard = Markup.inlineKeyboard(buttons);
 
     try {
         if (ctx.callbackQuery) {
@@ -35,75 +48,78 @@ exports.showDashboard = (ctx) => {
 // Statistics
 exports.showStats = async (ctx) => {
     try {
+        const i18n = ctx.i18n;
         const userCount = await User.countDocuments();
         const productCount = await Product.countDocuments();
         const orders = await Order.find();
 
         const revenue = orders
-            .filter(o => o.status === 'completed')
+            .filter(o => o.status === 'completed' || o.status === 'delivered')
             .reduce((sum, o) => sum + o.total, 0);
 
-        const text = `📊 **Statistika**\n\n` +
-            `👥 Foydalanuvchilar: ${userCount} ta\n` +
-            `🛍 Mahsulotlar: ${productCount} ta\n` +
-            `📦 Jami buyurtmalar: ${orders.length} ta\n` +
-            `💰 Tushum (Bajarilgan): ${revenue} so'm`;
+        const text = `${i18n.admin.stats_title}\n\n` +
+            `${i18n.admin.stats_users}: ${userCount}\n` +
+            `${i18n.admin.stats_prods}: ${productCount}\n` +
+            `${i18n.admin.stats_orders}: ${orders.length}\n` +
+            `${i18n.admin.stats_rev}: ${revenue.toLocaleString()} ${i18n.currency}`;
 
-        const keyboard = Markup.inlineKeyboard([[Markup.button.callback("🔙 Orqaga", "admin_dashboard")]]);
+        const keyboard = Markup.inlineKeyboard([[Markup.button.callback(i18n.admin.back, "admin_dashboard")]]);
 
         ctx.editMessageText(text, { parse_mode: 'HTML', ...keyboard })
             .catch(e => ctx.replyWithHTML(text, keyboard));
     } catch (err) {
         console.error(err);
-        ctx.answerCbQuery("Xatolik yuz berdi");
+        ctx.answerCbQuery(ctx.i18n.admin.error);
     }
 };
 
 // Show New Orders
 exports.showNewOrders = async (ctx) => {
     try {
+        const i18n = ctx.i18n;
         const orders = await Order.find({ status: 'new' });
-        const backBtn = [Markup.button.callback("🔙 Orqaga", "admin_dashboard")];
+        const backBtn = [Markup.button.callback(i18n.admin.back, "admin_dashboard")];
 
         if (!orders || orders.length === 0) {
-            return ctx.editMessageText("Hozircha yangi buyurtmalar yo'q.", Markup.inlineKeyboard([backBtn]))
-                .catch(e => ctx.reply("Hozircha yangi buyurtmalar yo'q.", Markup.inlineKeyboard([backBtn])));
+            return ctx.editMessageText(i18n.admin.no_new_orders, Markup.inlineKeyboard([backBtn]))
+                .catch(e => ctx.reply(i18n.admin.no_new_orders, Markup.inlineKeyboard([backBtn])));
         }
 
-        const orderButtons = orders.map(o => [Markup.button.callback(`#${o.id} - ${o.total} so'm`, `admin_order_${o.id}`)]);
+        const orderButtons = orders.map(o => [Markup.button.callback(`#${o.id} - ${o.total.toLocaleString()} ${i18n.currency}`, `admin_order_${o.id}`)]);
         orderButtons.push(backBtn);
 
-        const text = `📦 **Yangi buyurtmalar: ${orders.length} ta**\nKo'rish uchun tanlang:`;
+        const text = `${i18n.admin.btn_new_orders}: ${orders.length}`;
         const keyboard = Markup.inlineKeyboard(orderButtons);
 
         ctx.editMessageText(text, { parse_mode: 'Markdown', ...keyboard })
             .catch(e => ctx.replyWithMarkdown(text, keyboard));
     } catch (err) {
         console.error(err);
-        ctx.answerCbQuery("Xato bo'ldi");
+        ctx.answerCbQuery(ctx.i18n.admin.error);
     }
 };
 
 // View Single Order Details
 exports.viewOrder = async (ctx, orderId) => {
     try {
+        const i18n = ctx.i18n;
         const id = parseInt(orderId);
         const order = await Order.findOne({ id: id });
 
-        if (!order) return ctx.answerCbQuery("Buyurtma topilmadi.");
+        if (!order) return ctx.answerCbQuery("Buyurtma topilmadi."); // Low Priority to localize this tiny string fallback
 
-        let text = `📦 **Buyurtma #${order.id}**\n` +
-            `👤 Mijoz: ${order.user}\n` +
-            `📞 Tel: ${order.phone}\n` +
-            `📅 Vaqt: ${new Date(order.createdAt).toLocaleString()}\n` +
-            `📊 Status: ${order.status.toUpperCase()}\n\n` +
-            `🛒 **Mahsulotlar:**\n`;
+        let text = `${i18n.admin.order_title}${order.id}**\n` +
+            `${i18n.admin.client}: ${order.user}\n` +
+            `${i18n.admin.tel}: ${order.phone}\n` +
+            `${i18n.admin.date}: ${new Date(order.createdAt).toLocaleString()}\n` +
+            `${i18n.admin.status_label}: ${order.status.toUpperCase()}\n\n` +
+            `${i18n.admin.items}\n`;
 
         order.items.forEach(i => {
-            text += `- ${i.name} (${i.count}x) - ${i.price} so'm\n`;
+            text += `- ${i.name} (${i.count}x) - ${i.price.toLocaleString()} ${i18n.currency}\n`;
         });
 
-        text += `\n💰 **Jami: ${order.total} so'm**`;
+        text += `\n${i18n.admin.total_label} ${order.total.toLocaleString()} ${i18n.currency}`;
 
         if (order.location) {
             ctx.replyWithLocation(order.location.latitude, order.location.longitude);
@@ -113,26 +129,26 @@ exports.viewOrder = async (ctx, orderId) => {
         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}`)]
+                [Markup.button.callback(i18n.admin.btn_accept, `order_accept_${order.id}`), Markup.button.callback(i18n.admin.btn_reject, `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}`)]
+                [Markup.button.callback(i18n.admin.btn_invoice, `gen_invoice_${order.id}`)],
+                [Markup.button.callback(i18n.admin.btn_ship, `order_ship_${order.id}`)],
+                [Markup.button.callback(i18n.admin.btn_reject, `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}`)]
+                [Markup.button.callback(i18n.admin.btn_deliver, `order_deliver_${order.id}`)],
+                [Markup.button.callback(i18n.admin.btn_reject, `order_reject_${order.id}`)]
             ];
         } else if (order.status === 'delivered') {
             actionButtons = [
-                [Markup.button.callback("✅ Bajarildi (Arxiv)", "admin_orders_new")] // Just close
+                [Markup.button.callback(i18n.admin.btn_archive, "admin_orders_new")]
             ];
         }
 
-        actionButtons.push([Markup.button.callback("🔙 Orqaga", "admin_orders_new")]);
+        actionButtons.push([Markup.button.callback(i18n.admin.back, "admin_orders_new")]);
 
         const contextKeyboard = Markup.inlineKeyboard(actionButtons);
 
@@ -170,7 +186,7 @@ exports.acceptOrder = async (ctx, orderId) => {
         await Order.updateOne({ id: id }, { status: 'accepted' });
         const order = await Order.findOne({ id: id });
 
-        ctx.answerCbQuery("Buyurtma qabul qilindi ✅");
+        ctx.answerCbQuery(ctx.i18n.admin.alert_accepted);
 
         // Notify User
         if (order) {
@@ -180,7 +196,7 @@ exports.acceptOrder = async (ctx, orderId) => {
             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.`);
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_accepted}\n#${id} ${i18n.status_proccess || "Accepted"}.`);
         }
 
         // Refresh View
@@ -197,7 +213,7 @@ exports.shipOrder = async (ctx, orderId) => {
         await Order.updateOne({ id: id }, { status: 'shipping' });
         const order = await Order.findOne({ id: id });
 
-        ctx.answerCbQuery("Buyurtma yo'lga chiqdi 🚚");
+        ctx.answerCbQuery(ctx.i18n.admin.alert_shipping);
 
         // Notify User
         if (order) {
@@ -207,7 +223,7 @@ exports.shipOrder = async (ctx, orderId) => {
             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).`);
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_shipping}\n#${id}`);
         }
 
         exports.viewOrder(ctx, id);
@@ -223,7 +239,7 @@ exports.deliverOrder = async (ctx, orderId) => {
         await Order.updateOne({ id: id }, { status: 'delivered' });
         const order = await Order.findOne({ id: id });
 
-        ctx.answerCbQuery("Buyurtma yetkazildi 🏁");
+        ctx.answerCbQuery(ctx.i18n.admin.alert_delivered);
 
         // Notify User
         if (order) {
@@ -233,7 +249,7 @@ exports.deliverOrder = async (ctx, orderId) => {
             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!`);
+            ctx.telegram.sendMessage(order.userId, `${i18n.status_delivered}\n#${id}`);
         }
 
         exports.viewOrder(ctx, id);
@@ -398,19 +414,20 @@ exports.rejectOrder = async (ctx, orderId) => {
 // Edit Product List
 exports.showEditProductList = async (ctx) => {
     try {
+        const i18n = ctx.i18n;
         const products = await Product.find();
-        const backBtn = [Markup.button.callback("🔙 Orqaga", "admin_dashboard")];
+        const backBtn = [Markup.button.callback(i18n.admin.back, "admin_dashboard")];
 
         if (!products || products.length === 0) {
-            return ctx.editMessageText("Tahrirlash uchun mahsulot yo'q.", Markup.inlineKeyboard([backBtn]))
-                .catch(e => ctx.reply("Tahrirlash uchun mahsulot yo'q.", Markup.inlineKeyboard([backBtn])));
+            return ctx.editMessageText(i18n.admin.no_edit_prod, Markup.inlineKeyboard([backBtn]))
+                .catch(e => ctx.reply(i18n.admin.no_edit_prod, Markup.inlineKeyboard([backBtn])));
         }
 
         const buttons = products.map(p => [Markup.button.callback(`✏️ ${p.name || 'Nomsiz'}`, `edit_prod_${p.id}`)]);
         buttons.push(backBtn);
 
-        ctx.editMessageText("Tahrirlash uchun mahsulotni tanlang:", Markup.inlineKeyboard(buttons))
-            .catch(e => ctx.reply("Tahrirlash uchun mahsulotni tanlang:", Markup.inlineKeyboard(buttons)));
+        ctx.editMessageText(i18n.admin.select_edit, Markup.inlineKeyboard(buttons))
+            .catch(e => ctx.reply(i18n.admin.select_edit, Markup.inlineKeyboard(buttons)));
     } catch (err) {
         console.error(err);
     }
@@ -419,19 +436,20 @@ exports.showEditProductList = async (ctx) => {
 // Delete Product List
 exports.showDeleteProductList = async (ctx) => {
     try {
+        const i18n = ctx.i18n;
         const products = await Product.find();
-        const backBtn = [Markup.button.callback("🔙 Orqaga", "admin_dashboard")];
+        const backBtn = [Markup.button.callback(i18n.admin.back, "admin_dashboard")];
 
         if (!products || products.length === 0) {
-            return ctx.editMessageText("O'chirish uchun mahsulot yo'q.", Markup.inlineKeyboard([backBtn]))
-                .catch(e => ctx.reply("O'chirish uchun mahsulot yo'q.", Markup.inlineKeyboard([backBtn])));
+            return ctx.editMessageText(i18n.admin.no_del_prod, Markup.inlineKeyboard([backBtn]))
+                .catch(e => ctx.reply(i18n.admin.no_del_prod, Markup.inlineKeyboard([backBtn])));
         }
 
         const buttons = products.map(p => [Markup.button.callback(`🗑 ${p.name}`, `delete_prod_${p.id}`)]);
         buttons.push(backBtn);
 
-        ctx.editMessageText("O'chirmoqchi bo'lgan mahsulotni tanlang:", Markup.inlineKeyboard(buttons))
-            .catch(e => ctx.reply("O'chirmoqchi bo'lgan mahsulotni tanlang:", Markup.inlineKeyboard(buttons)));
+        ctx.editMessageText(i18n.admin.select_del, Markup.inlineKeyboard(buttons))
+            .catch(e => ctx.reply(i18n.admin.select_del, Markup.inlineKeyboard(buttons)));
     } catch (err) {
         console.error(err);
     }
@@ -439,20 +457,21 @@ exports.showDeleteProductList = async (ctx) => {
 
 exports.deleteProduct = async (ctx, prodId) => {
     try {
+        const i18n = ctx.i18n;
         const id = parseInt(prodId);
         const result = await Product.findOneAndDelete({ id: id });
 
         if (result) {
-            ctx.answerCbQuery("✅ Mahsulot o'chirildi", { show_alert: true });
+            ctx.answerCbQuery(i18n.admin.del_success, { show_alert: true });
         } else {
-            ctx.answerCbQuery("⚠️ Mahsulot topilmadi", { show_alert: true });
+            ctx.answerCbQuery(i18n.admin.del_fail, { show_alert: true });
         }
 
         // Refresh list
         exports.showDeleteProductList(ctx);
     } catch (err) {
         console.error("Delete Error:", err);
-        ctx.answerCbQuery("❌ Xatolik yuz berdi");
+        ctx.answerCbQuery(ctx.i18n.admin.error);
     }
 };
 

src/locales.js

@@ -112,7 +112,63 @@ module.exports = {
             broadcast_finish: "🏁 Tugadi!",
             settings_addr: "📝 Yangi manzil matnini kiriting (Masalan: Toshkent sh., Chilonzor...):",
             settings_loc: "📍 Endi lokatsiyasini yuboring (Pastdagi tugma yoki attachment orqali):",
-            settings_saved: "✅ Do'kon manzili muvaffaqiyatli yangilandi!"
+            settings_saved: "✅ Do'kon manzili muvaffaqiyatli yangilandi!",
+            // Dashboard
+            dash_title: "👨‍💼 **Admin Panel**\n\nBo'limni tanlang:",
+            btn_stats: "📊 Statistika",
+            btn_new_orders: "📦 Yangi buyurtmalar",
+            btn_add_prod: "➕ Mahsulot qo'shish",
+            btn_del_prod: "🗑 Mahsulot o'chirish",
+            btn_edit_prod: "✏️ Mahsulotni tahrirlash",
+            btn_users: "👥 Foydalanuvchilar",
+            btn_excel: "📉 Excel Export",
+            btn_broadcast: "📢 Reklama yuborish",
+            btn_flash: "🔥 Aksiya (Flash Sale)",
+            btn_inv: "📦 Ombor Boshqaruvi",
+            btn_settings: "⚙️ Do'kon Sozlamalari",
+            btn_api: "🔑 API Integratsiya",
+            // Stats
+            stats_title: "📊 **Statistika**",
+            stats_users: "👥 Foydalanuvchilar",
+            stats_prods: "🛍 Mahsulotlar",
+            stats_orders: "📦 Jami buyurtmalar",
+            stats_rev: "💰 Tushum (Bajarilgan)",
+            // Orders
+            no_new_orders: "Hozircha yangi buyurtmalar yo'q.",
+            order_title: "📦 **Buyurtma #**",
+            client: "👤 Mijoz",
+            tel: "📞 Tel",
+            date: "📅 Vaqt",
+            status_label: "📊 Status",
+            items: "🛒 **Mahsulotlar:**",
+            total_label: "💰 **Jami:**",
+            btn_accept: "✅ Qabul qilish",
+            btn_reject: "❌ Bekor qilish",
+            btn_invoice: "🧾 Chek chiqarish",
+            btn_ship: "🚚 Yuborish (Dostavka)",
+            btn_deliver: "🏁 Yetkazib berildi",
+            btn_archive: "✅ Bajarildi (Arxiv)",
+            alert_accepted: "Buyurtma qabul qilindi ✅",
+            alert_shipping: "Buyurtma yo'lga chiqdi 🚚",
+            alert_delivered: "Buyurtma yetkazildi 🏁",
+            alert_canceled: "Buyurtma bekor qilindi ❌",
+            invoice_ready: "Chek tayyor!",
+            // Products
+            no_edit_prod: "Tahrirlash uchun mahsulot yo'q.",
+            select_edit: "Tahrirlash uchun mahsulotni tanlang:",
+            no_del_prod: "O'chirish uchun mahsulot yo'q.",
+            select_del: "O'chirmoqchi bo'lgan mahsulotni tanlang:",
+            del_success: "✅ Mahsulot o'chirildi",
+            del_fail: "⚠️ Mahsulot topilmadi",
+            // General
+            error: "Xatolik yuz berdi",
+            back: "🔙 Orqaga",
+            // API
+            api_title: "🔑 **API Integratsiya Sozlamalari**",
+            api_desc: "Sizning API Kalitingiz (Secret Key):",
+            api_warn: "⚠️ **Eslatma:** Bu kalit maxfiy.",
+            btn_gen_key: "🔄 Yangi Kalit Yaratish",
+            key_gen: "Yangi kalit yaratildi ✅"
         }
     },
     ru: {

src/main.js

@@ -72,6 +72,28 @@ const checkUserStatus = async (ctx, next) => {
 bot.use(checkUserStatus);
 bot.use(session());
 
+// Global i18n & User Middleware
+bot.use(async (ctx, next) => {
+    try {
+        if (ctx.from) {
+            const User = require('./models/User');
+            const locales = require('./locales');
+            // Optimistic check: maybe session has language? (For speed)
+            // But for correctness, let's fetch DB or rely on cached user if possible.
+            // For now, fast fetch.
+            const user = await User.findOne({ id: ctx.from.id });
+            const lang = (user && user.language) ? user.language : 'uz';
+            ctx.i18n = locales[lang] || locales.uz;
+            ctx.dbUser = user;
+        }
+    } catch (e) {
+        console.error("Middleware Error:", e);
+        const locales = require('./locales');
+        ctx.i18n = locales.uz; // Fallback
+    }
+    return next();
+});
+
 // Scenes
 const stage = require('./scenes/index');
 bot.use(stage.middleware());