Add print checkbox for comments, global item frequency, rate change notifications, UI improvements

Author: hiteshkrmsft

www/js/firebase/firestore-service.js

@@ -935,6 +935,57 @@ const FirebaseService = {
             console.error('Users listener error:', error);
         });
         unsubscribeFunctions.push(unsubUsers);
+        
+        // Listen to notifications for current user (rate changes, etc.)
+        if (AppState.currentUser?.uid) {
+            // Listen to global item frequency changes to update dropdown order in real-time
+            const unsubItemFrequency = getDb().collection(col('itemFrequency')).doc('global').onSnapshot(doc => {
+                if (doc.exists && window.app?.billing) {
+                    // Update the billing manager's item frequency data
+                    window.app.billing.billingManager?.itemFrequency && 
+                        Object.assign(window.app.billing.billingManager.itemFrequency, doc.data());
+                    
+                    // Reload dropdowns to reflect new order
+                    if (window.app.billing.loadItemsDropdown) {
+                        window.app.billing.loadItemsDropdown();
+                    }
+                    if (window.app.billing.loadSaleItemsDropdown) {
+                        window.app.billing.loadSaleItemsDropdown();
+                    }
+                    if (window.app.sales?.loadItemsDropdown) {
+                        window.app.sales.loadItemsDropdown();
+                    }
+                }
+            }, error => {
+                console.error('Item frequency listener error:', error);
+            });
+            unsubscribeFunctions.push(unsubItemFrequency);
+            
+            const unsubNotifications = getDb().collection(col('notifications'))
+                .where('userId', '==', AppState.currentUser.uid)
+                .where('read', '==', false)
+                .orderBy('timestamp', 'desc')
+                .limit(10)
+                .onSnapshot(snapshot => {
+                    snapshot.docChanges().forEach(change => {
+                        if (change.type === 'added') {
+                            const notification = change.doc.data();
+                            // Show toast for rate change notifications
+                            if (notification.type === 'rate_change') {
+                                const itemName = notification.itemHindiName || notification.itemName;
+                                const message = `${itemName} ${notification.rateTypeLabel} rate: ₹${notification.oldRate} → ₹${notification.newRate} (by ${notification.changedBy})`;
+                                UIManager.showToast(message, 5000);
+                                
+                                // Mark as read after showing
+                                getDb().collection(col('notifications')).doc(change.doc.id).update({ read: true });
+                            }
+                        }
+                    });
+                }, error => {
+                    console.error('Notifications listener error:', error);
+                });
+            unsubscribeFunctions.push(unsubNotifications);
+        }
     },
 
     /**
@@ -975,6 +1026,75 @@ const FirebaseService = {
         }
     },
 
+    /**
+     * Notifies all users when an item rate is changed.
+     * Creates notification documents for all users in the notifications collection.
+     * Note: Wholesale rate changes only notify owners/managers (staff can't see wholesale rates)
+     * @async
+     * @param {Object} item - The item with changed rate
+     * @param {string} rateType - Type of rate ('purchase', 'sale', 'wholesale')
+     * @param {number} oldRate - Previous rate value
+     * @param {number} newRate - New rate value
+     * @returns {Promise<void>}
+     */
+    async notifyRateChange(item, rateType, oldRate, newRate) {
+        try {
+            // Get users based on rate type
+            // Wholesale rates are only visible to owners/managers, so don't notify staff
+            let usersQuery;
+            if (rateType === 'wholesale') {
+                // Only notify owners and managers for wholesale rate changes
+                const ownersSnapshot = await getDb().collection(col('users')).where('role', '==', 'owner').get();
+                const managersSnapshot = await getDb().collection(col('users')).where('role', '==', 'manager').get();
+                const userIds = [
+                    ...ownersSnapshot.docs.map(doc => doc.id),
+                    ...managersSnapshot.docs.map(doc => doc.id)
+                ];
+                usersQuery = { docs: userIds.map(id => ({ id })) };
+            } else {
+                // Notify all users for purchase and sale rate changes
+                usersQuery = await getDb().collection(col('users')).get();
+            }
+            
+            const userIds = usersQuery.docs ? usersQuery.docs.map(doc => doc.id) : [];
+            
+            const rateTypeLabels = {
+                'purchase': 'Purchase',
+                'sale': 'Sale', 
+                'wholesale': 'Wholesale'
+            };
+            
+            const notification = {
+                type: 'rate_change',
+                itemId: item.id,
+                itemName: item.name,
+                itemHindiName: item.hindiName || '',
+                rateType: rateType,
+                rateTypeLabel: rateTypeLabels[rateType] || rateType,
+                oldRate: oldRate,
+                newRate: newRate,
+                changedBy: AppState.userName || 'Unknown',
+                changedByUserId: AppState.currentUser?.uid,
+                timestamp: firebase.firestore.FieldValue.serverTimestamp(),
+                read: false
+            };
+            
+            // Notify all relevant users except the one who made the change
+            for (const userId of userIds) {
+                if (userId !== AppState.currentUser?.uid) {
+                    await getDb().collection(col('notifications')).add({
+                        ...notification,
+                        userId: userId
+                    });
+                }
+            }
+            
+            console.log(`Rate change notification sent: ${item.name} ${rateType} rate: ₹${oldRate} → ₹${newRate}`);
+        } catch (error) {
+            console.error('Error notifying rate change:', error);
+        }
+    },
+
     /**
      * Loads withdrawals from Firestore ordered by timestamp (secondary method).
      * @async

www/js/modules/billing.js

@@ -155,15 +155,13 @@ const BillingManager = {
     // -------------------- ITEM FREQUENCY --------------------
 
     /**
-     * Load item frequency data from Firebase
+     * Load item frequency data from Firebase (global, shared across all users)
      * @async
      */
     async loadItemFrequency() {
         try {
-            const userId = AppState.currentUser?.uid;
-            if (!userId) return;
-            
-            const doc = await db.collection(window.getCollection ? window.getCollection('itemFrequency') : 'itemFrequency').doc(userId).get();
+            // Use a global document instead of per-user to ensure all users see same order
+            const doc = await db.collection(window.getCollection ? window.getCollection('itemFrequency') : 'itemFrequency').doc('global').get();
             if (doc.exists) {
                 this.itemFrequency = doc.data();
             } else {
@@ -176,16 +174,13 @@ const BillingManager = {
     },
 
     /**
-     * Update item frequency after a transaction
+     * Update item frequency after a transaction (global, shared across all users)
      * @async
      * @param {Array<Object>} items - Items used in the transaction
      * @param {'purchase'|'sale'} [mode='purchase'] - The transaction mode
      */
     async updateItemFrequency(items, mode = 'purchase') {
         try {
-            const userId = AppState.currentUser?.uid;
-            if (!userId) return;
-            
             const now = Date.now();
 
             items.forEach(item => {
@@ -215,7 +210,8 @@ const BillingManager = {
                 itemData.effectiveScore = itemData.score * decayFactor;
             });
 
-            await db.collection(window.getCollection ? window.getCollection('itemFrequency') : 'itemFrequency').doc(userId).set(this.itemFrequency);
+            // Save to global document instead of per-user
+            await db.collection(window.getCollection ? window.getCollection('itemFrequency') : 'itemFrequency').doc('global').set(this.itemFrequency);
         } catch (error) {
             console.error('Failed to update item frequency:', error);
         }

www/js/modules/items.js

@@ -194,11 +194,17 @@ const ItemsManager = {
     // Update purchase rate (AUTO-SAVE with debounce)
     updateRate(itemIndex, rateIndex, value) {
         clearTimeout(this.updateTimers[`rate_${itemIndex}_${rateIndex}`]);
-        AppState.items[itemIndex].rates[rateIndex] = Number(value);
+        const oldRate = AppState.items[itemIndex].rates[rateIndex] || 0;
+        const newRate = Number(value);
+        AppState.items[itemIndex].rates[rateIndex] = newRate;
 
         this.updateTimers[`rate_${itemIndex}_${rateIndex}`] = setTimeout(async () => {
             try {
                 await FirebaseService.saveItem(AppState.items[itemIndex]);
+                // Notify all users about rate change
+                if (oldRate !== newRate && newRate > 0) {
+                    await FirebaseService.notifyRateChange(AppState.items[itemIndex], 'purchase', oldRate, newRate);
+                }
             } catch (error) {
                 console.error('Error updating rate:', error);
             }
@@ -228,11 +234,17 @@ const ItemsManager = {
         if (!AppState.items[itemIndex].saleRates) {
             AppState.items[itemIndex].saleRates = [];
         }
-        AppState.items[itemIndex].saleRates[rateIndex] = Number(value);
+        const oldRate = AppState.items[itemIndex].saleRates[rateIndex] || 0;
+        const newRate = Number(value);
+        AppState.items[itemIndex].saleRates[rateIndex] = newRate;
 
         this.updateTimers[`salerate_${itemIndex}_${rateIndex}`] = setTimeout(async () => {
             try {
                 await FirebaseService.saveItem(AppState.items[itemIndex]);
+                // Notify all users about rate change
+                if (oldRate !== newRate && newRate > 0) {
+                    await FirebaseService.notifyRateChange(AppState.items[itemIndex], 'sale', oldRate, newRate);
+                }
             } catch (error) {
                 console.error('Error updating sale rate:', error);
             }
@@ -264,11 +276,17 @@ const ItemsManager = {
         if (!AppState.items[itemIndex].wholesaleRates) {
             AppState.items[itemIndex].wholesaleRates = [];
         }
-        AppState.items[itemIndex].wholesaleRates[rateIndex] = Number(value);
+        const oldRate = AppState.items[itemIndex].wholesaleRates[rateIndex] || 0;
+        const newRate = Number(value);
+        AppState.items[itemIndex].wholesaleRates[rateIndex] = newRate;
 
         this.updateTimers[`wholesalerate_${itemIndex}_${rateIndex}`] = setTimeout(async () => {
             try {
                 await FirebaseService.saveItem(AppState.items[itemIndex]);
+                // Notify all users about rate change
+                if (oldRate !== newRate && newRate > 0) {
+                    await FirebaseService.notifyRateChange(AppState.items[itemIndex], 'wholesale', oldRate, newRate);
+                }
             } catch (error) {
                 console.error('Error updating wholesale rate:', error);
             }

www/js/modules/purchase.js

@@ -574,7 +574,7 @@ const PurchaseManager = {
             if (el) el.value = id === 'manualLaborCharges' ? '0' : '';
         });
 
-        ['onlineCheckbox', 'cashCheckbox', 'dueCheckbox'].forEach(id => {
+        ['onlineCheckbox', 'cashCheckbox', 'dueCheckbox', 'billPrintComments'].forEach(id => {
             const el = document.getElementById(id);
             if (el) el.checked = false;
         });

www/js/modules/retail-sale.js

@@ -542,7 +542,7 @@ const RetailSaleManager = {
             if (el) el.value = '';
         });
 
-        ['saleOnlineCheckbox', 'saleCashCheckbox', 'saleDueCheckbox'].forEach(id => {
+        ['saleOnlineCheckbox', 'saleCashCheckbox', 'saleDueCheckbox', 'salePrintComments'].forEach(id => {
             const el = document.getElementById(id);
             if (el) el.checked = false;
         });

www/js/services/printer.js

@@ -367,32 +367,57 @@ class BluetoothPrinterManager {
             y += config.spacing.line;
         }
 
-        // Comments (टिप्पणी) - Only print if printComments flag is true and comments exist
+        // Comments - Only print if printComments flag is true and comments exist
         if (billData.printComments && billData.comments && billData.comments.trim()) {
             y += 8; // Gap before comments
             ctx.font = `${config.fonts.body.size}px Arial`;
-            ctx.fillText('नोट:', config.padding.left, y);
-            y += config.spacing.line;
 
-            // Word wrap comments to fit width
-            const maxWidth = config.width - (config.padding.left * 2) - 10;
-            const words = billData.comments.trim().split(' ');
-            let line = '';
+            // Print "Note: <comment>" on the same line, with word wrap if needed
+            const noteLabel = 'Note: ';
+            const labelWidth = ctx.measureText(noteLabel).width;
+            const maxWidth = config.width - config.padding.left - 10;
+            const commentText = billData.comments.trim();
 
-            for (const word of words) {
-                const testLine = line + (line ? ' ' : '') + word;
-                const testWidth = ctx.measureText(testLine).width;
-                if (testWidth > maxWidth && line) {
-                    ctx.fillText(line, config.padding.left + 5, y);
-                    y += config.spacing.line - 4;
-                    line = word;
-                } else {
-                    line = testLine;
-                }
-            }
-            if (line) {
-                ctx.fillText(line, config.padding.left + 5, y);
+            // Check if it fits on one line
+            const fullText = noteLabel + commentText;
+            if (ctx.measureText(fullText).width <= maxWidth) {
+                // Fits on one line
+                ctx.fillText(fullText, config.padding.left, y);
                 y += config.spacing.line;
+            } else {
+                // Need word wrap - print label first, then wrap remaining text
+                ctx.fillText(noteLabel, config.padding.left, y);
+                const remainingWidth = maxWidth - labelWidth;
+                const words = commentText.split(' ');
+                let line = '';
+                let firstLine = true;
+                
+                for (const word of words) {
+                    const testLine = line + (line ? ' ' : '') + word;
+                    const currentMaxWidth = firstLine ? remainingWidth : maxWidth;
+                    const testWidth = ctx.measureText(testLine).width;
+                    
+                    if (testWidth > currentMaxWidth && line) {
+                        if (firstLine) {
+                            ctx.fillText(line, config.padding.left + labelWidth, y);
+                            firstLine = false;
+                        } else {
+                            ctx.fillText(line, config.padding.left, y);
+                        }
+                        y += config.spacing.line - 4;
+                        line = word;
+                    } else {
+                        line = testLine;
+                    }
+                }
+                if (line) {
+                    if (firstLine) {
+                        ctx.fillText(line, config.padding.left + labelWidth, y);
+                    } else {
+                        ctx.fillText(line, config.padding.left, y);
+                    }
+                    y += config.spacing.line;
+                }
             }
         }