Feat: Add Product Condition (New vs Used)

src/controllers/userController.js

@@ -189,21 +189,39 @@ exports.showSubCategories = async (ctx, parentId) => {
     }
 };
 
-// Show Products in Category (Redirect to Carousel)
+// Show Products (Ask for Condition first)
 exports.showProducts = async (ctx, catId) => {
-    // Start browsing at index 0
-    return exports.browseCategory(ctx, catId, 0, 0);
+    const id = catId.replace('cat_', '');
+    const buttons = [
+        [
+            Markup.button.callback("🆕 Yangi", `cond_${id}_new`),
+            Markup.button.callback("♻️ B/U", `cond_${id}_used`)
+        ],
+        [Markup.button.callback("🌐 Barchasi", `cond_${id}_all`)],
+        [Markup.button.callback(ctx.i18n.btn_back_nav || "⬅️ Orqaga", "back_to_cats")]
+    ];
+    // Try edit, fallback to reply
+    await ctx.editMessageText("🔎 Qaysi turdagi mahsulotlarni ko'rmoqchisiz?", Markup.inlineKeyboard(buttons))
+        .catch(() => ctx.reply("🔎 Qaysi turdagi mahsulotlarni ko'rmoqchisiz?", Markup.inlineKeyboard(buttons)));
+};
+
+// Filter Handler
+exports.filterByCondition = async (ctx, catId, condition) => {
+    return exports.browseCategory(ctx, catId, 0, 0, condition);
 };
 
 // Browse Category (Carousel Logic)
-exports.browseCategory = async (ctx, catId, prodIndex, mediaIndex = 0) => {
+exports.browseCategory = async (ctx, catId, prodIndex, mediaIndex = 0, conditionFilter = 'all') => {
     try {
         const id = catId.replace('cat_', '');
         const category = await Category.findOne({ id: id });
         if (!category) return ctx.reply("Kategoriya topilmadi.");
 
-        const products = await Product.find({ category: category.name });
-        if (!products || products.length === 0) return ctx.reply(ctx.i18n.no_cats); // Or specific no_products key
+        let query = { category: category.name };
+        if (conditionFilter !== 'all') query.condition = conditionFilter;
+
+        const products = await Product.find(query);
+        if (!products || products.length === 0) return ctx.reply("❌ Bu kategoriyada mahsulotlar yo'q.");
 
         // Handle Product Index Bounds
         let page = parseInt(prodIndex);
@@ -238,15 +256,16 @@ exports.browseCategory = async (ctx, catId, prodIndex, mediaIndex = 0) => {
 
         // Buttons
         // Navigation: prev/next product. Media index resets to 0.
+        // Format: br_catId_prodIndex_mediaIndex_condition
         let navigationRow = [
-            Markup.button.callback("⬅️", `br_${id}_${page - 1}_0`),
+            Markup.button.callback("⬅️", `br_${id}_${page - 1}_0_${conditionFilter}`),
             Markup.button.callback(`${page + 1} / ${products.length}`, "noop"),
-            Markup.button.callback("➡️", `br_${id}_${page + 1}_0`)
+            Markup.button.callback("➡️", `br_${id}_${page + 1}_0_${conditionFilter}`)
         ];
 
         let mediaRow = [];
         if (product.media && product.media.length > 1) {
-            mediaRow.push(Markup.button.callback(`📸 ${mPage + 1}/${product.media.length}`, `br_${id}_${page}_${mPage + 1}`)); // Logic: Next media
+            mediaRow.push(Markup.button.callback(`📸 ${mPage + 1}/${product.media.length}`, `br_${id}_${page}_${mPage + 1}_${conditionFilter}`));
         }
 
         let actionRow = [];

src/main.js

@@ -450,13 +450,29 @@ bot.action(/cat_(.+)/, async (ctx) => {
 });
 
 // Carousel Navigation
-// Carousel Navigation (New)
-bot.action(/br_(.+)_(.+)_(.+)/, (ctx) => {
-    // pattern: br_catId_prodIndex_mediaIndex
+// Condition Filter Selection
+bot.action(/cond_(.+)_(.+)/, (ctx) => {
     const catId = "cat_" + ctx.match[1];
-    const prodIndex = parseInt(ctx.match[2]);
-    const mediaIndex = parseInt(ctx.match[3]);
-    userController.browseCategory(ctx, catId, prodIndex, mediaIndex);
+    const condition = ctx.match[2];
+    userController.filterByCondition(ctx, catId, condition);
+});
+
+// Carousel Navigation (New)
+bot.action(/br_(.+)/, (ctx) => {
+    // pattern: br_catId_prodIndex_mediaIndex_condition
+    // We split manually because condition is optional and captured groups are tricky
+    const text = ctx.match[1];
+    const parts = text.split('_');
+
+    // Safety check
+    if (parts.length < 3) return ctx.answerCbQuery("Error");
+
+    const catId = "cat_" + parts[0];
+    const prodIndex = parseInt(parts[1]);
+    const mediaIndex = parseInt(parts[2]);
+    const condition = parts[3] || 'all'; // Default to all if missing
+
+    userController.browseCategory(ctx, catId, prodIndex, mediaIndex, condition);
 });
 
 // Backward compatibility or redirect

src/models/Product.js

@@ -7,6 +7,7 @@ const productSchema = new mongoose.Schema({
     originalPrice: { type: Number, default: null }, // For Flash Sales
     discountPercent: { type: Number, default: 0 }, // Discount %
     quantity: { type: Number, default: 0 },
+    condition: { type: String, enum: ['new', 'used'], default: 'new' },
     description: String,
     category: String, // Category ID
     media: [{

src/scenes/admin/addProduct.js

@@ -64,10 +64,41 @@ const addProductScene = new Scenes.WizardScene(
         if (!ctx.message || !ctx.message.text || isNaN(ctx.message.text)) return ctx.reply(i18n.admin.error_num);
         ctx.wizard.state.product.quantity = parseInt(ctx.message.text);
 
+        // ASK CONDITION
+        ctx.reply("Maxsulot xolati qanday?", Markup.keyboard([
+            ["🆕 Yangi", "♻️ B/U"],
+            [i18n.btn_cancel]
+        ]).resize());
+        return ctx.wizard.next();
+    },
+    // Step 5: Handle Condition & Ask Description
+    (ctx) => {
+        const i18n = ctx.i18n;
+        const text = ctx.message.text;
+        if (text === i18n.btn_cancel) {
+            ctx.scene.leave();
+            userController.start(ctx, i18n.cancel_process);
+            return;
+        }
+
+        if (text === "🆕 Yangi") {
+            ctx.wizard.state.product.condition = 'new';
+        } else if (text === "♻️ B/U") {
+            ctx.wizard.state.product.condition = 'used';
+        } else {
+            // Default or Retry? Let's assume buttons are clicked.
+            // If manual type, maybe fallback to 'new' or ask again.
+            // Stricter:
+            if (text !== "🆕 Yangi" && text !== "♻️ B/U") {
+                return ctx.reply("Iltimos tugmani tanlang: Yangi yoki B/U");
+            }
+            ctx.wizard.state.product.condition = text === "🆕 Yangi" ? 'new' : 'used';
+        }
+
         ctx.reply(i18n.admin.enter_desc, Markup.keyboard([[i18n.btn_cancel]]).resize());
         return ctx.wizard.next();
     },
-    // Step 5: Ask Category
+    // Step 6: Ask Category (Shifted)
     async (ctx) => {
         const i18n = ctx.i18n;
         if (ctx.message && ctx.message.text === i18n.btn_cancel) {