Upload 20 files

package.json

@@ -7,6 +7,7 @@
     "start": "node src/server.js",
     "dev": "nodemon src/server.js",
     "migrate": "node src/db/migrate.js",
+    "migrate2": "node src/db/migrate2.js",
     "seed": "node src/db/seed.js",
     "reset": "node src/db/reset.js"
   },

src/db/config.js

@@ -26,4 +26,4 @@ pool.on('error', (err) => {
     process.exit(-1);
 });
 
-module.exports = pool;
+module.exports = pool;

src/db/migrate.js

@@ -17,12 +17,18 @@ const createTables = async () => {
         city VARCHAR(100),
         party_type VARCHAR(20) NOT NULL CHECK (party_type IN ('awaak', 'jawaak', 'both')),
         current_balance DECIMAL(12, 2) DEFAULT 0,
+        past_due DECIMAL(12, 2) DEFAULT 0,
         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
         console.log('✅ Created table: parties');
 
+        await client.query(`
+      ALTER TABLE parties
+      ADD COLUMN IF NOT EXISTS past_due DECIMAL(12, 2) DEFAULT 0
+    `);
+
         // 2. Create mirchi_types table
         await client.query(`
       CREATE TABLE IF NOT EXISTS mirchi_types (

src/db/migrate2.js

@@ -0,0 +1,40 @@
+const pool = require('./config');
+
+const migrate2 = async () => {
+    const client = await pool.connect();
+
+    try {
+        console.log('🚀 Starting database migration (migrate2)...');
+
+        await client.query('BEGIN');
+
+        // Add past_due (opening balance) to parties
+        await client.query(`
+      ALTER TABLE parties
+      ADD COLUMN IF NOT EXISTS past_due DECIMAL(12, 2) DEFAULT 0
+    `);
+
+        // Ensure no NULL values exist
+        await client.query(`
+      UPDATE parties
+      SET past_due = 0
+      WHERE past_due IS NULL
+    `);
+
+        await client.query('COMMIT');
+        console.log('✅ migrate2 completed successfully!');
+
+    } catch (error) {
+        await client.query('ROLLBACK');
+        console.error('❌ migrate2 failed:', error);
+        throw error;
+    } finally {
+        client.release();
+        await pool.end();
+    }
+};
+
+migrate2().catch(err => {
+    console.error('Fatal error:', err);
+    process.exit(1);
+});

src/routes/parties.js

@@ -41,7 +41,7 @@ router.post('/', async (req, res) => {
     const client = await pool.connect();
 
     try {
-        const { id, name, phone, city, party_type, current_balance } = req.body;
+        const { id, name, phone, city, party_type, current_balance, past_due } = req.body;
 
         if (!name) {
             return res.status(400).json({ success: false, message: 'Party name is required' });
@@ -59,18 +59,18 @@ router.post('/', async (req, res) => {
             // Update existing party
             result = await client.query(
                 `UPDATE parties 
-         SET name = $1, phone = $2, city = $3, party_type = $4, current_balance = $5, updated_at = CURRENT_TIMESTAMP 
-         WHERE id = $6 
+         SET name = $1, phone = $2, city = $3, party_type = $4, current_balance = $5, past_due = $6, updated_at = CURRENT_TIMESTAMP 
+         WHERE id = $7 
          RETURNING *`,
-                [name, phone || '', city || '', party_type || 'both', current_balance || 0, partyId]
+                [name, phone || '', city || '', party_type || 'both', current_balance || 0, past_due || 0, partyId]
             );
         } else {
             // Insert new party
             result = await client.query(
-                `INSERT INTO parties (id, name, phone, city, party_type, current_balance) 
-         VALUES ($1, $2, $3, $4, $5, $6) 
+                `INSERT INTO parties (id, name, phone, city, party_type, current_balance, past_due) 
+         VALUES ($1, $2, $3, $4, $5, $6, $7) 
          RETURNING *`,
-                [partyId, name, phone || '', city || '', party_type || 'both', current_balance || 0]
+                [partyId, name, phone || '', city || '', party_type || 'both', current_balance || 0, past_due || 0]
             );
         }
 

src/routes/transactions.js

@@ -530,4 +530,164 @@ router.patch('/:id/payment', async (req, res) => {
     }
 });
 
+// POST revert transaction (rollback stock + balances, then delete)
+router.post('/:id/revert', async (req, res) => {
+    const client = await pool.connect();
+
+    try {
+        const { id } = req.params;
+
+        await client.query('BEGIN');
+
+        const txResult = await client.query(
+            'SELECT * FROM transactions WHERE id = $1',
+            [id]
+        );
+
+        if (txResult.rows.length === 0) {
+            await client.query('ROLLBACK');
+            return res.status(404).json({ success: false, message: 'Transaction not found' });
+        }
+
+        const tx = txResult.rows[0];
+
+        const itemsResult = await client.query(
+            'SELECT * FROM transaction_items WHERE transaction_id = $1',
+            [id]
+        );
+
+        const items = itemsResult.rows;
+
+        if (!items || items.length === 0) {
+            await client.query('ROLLBACK');
+            return res.status(400).json({ success: false, message: 'No items found for this transaction' });
+        }
+
+        // Rollback lots (inverse of creation logic)
+        for (const item of items) {
+            if (!item.lot_id) continue;
+
+            const lotResult = await client.query(
+                'SELECT * FROM lots WHERE id = $1',
+                [item.lot_id]
+            );
+
+            if (lotResult.rows.length === 0) {
+                await client.query('ROLLBACK');
+                return res.status(400).json({ success: false, message: `Lot not found for item ${item.id}` });
+            }
+
+            const lot = lotResult.rows[0];
+            const netWeight = Number(item.net_weight || 0);
+            const grossWeight = Number(item.gross_weight || 0);
+
+            // AWAAK = Purchase (Stock IN), JAWAAK = Sale (Stock OUT)
+            if (tx.bill_type === 'awaak' && !tx.is_return) {
+                // Reverting a purchase: subtract stock that was added
+                if (Number(lot.remaining_quantity) < netWeight || Number(lot.total_quantity) < netWeight) {
+                    await client.query('ROLLBACK');
+                    return res.status(409).json({
+                        success: false,
+                        message: `Cannot revert: stock already used for lot ${lot.lot_number}. Remaining ${lot.remaining_quantity}, required ${netWeight}`
+                    });
+                }
+
+                await client.query(
+                    `UPDATE lots
+                     SET total_quantity = total_quantity - $1,
+                         remaining_quantity = remaining_quantity - $1,
+                         status = CASE WHEN remaining_quantity - $1 <= 0 THEN 'sold_out' ELSE 'active' END,
+                         updated_at = CURRENT_TIMESTAMP
+                     WHERE id = $2`,
+                    [netWeight, item.lot_id]
+                );
+            } else if (tx.bill_type === 'awaak' && tx.is_return) {
+                // Reverting a purchase return: add stock back
+                await client.query(
+                    `UPDATE lots
+                     SET total_quantity = total_quantity + $1,
+                         remaining_quantity = remaining_quantity + $1,
+                         status = 'active',
+                         updated_at = CURRENT_TIMESTAMP
+                     WHERE id = $2`,
+                    [netWeight, item.lot_id]
+                );
+            } else if (tx.bill_type === 'jawaak' && !tx.is_return) {
+                // Reverting a sale: add stock back to remaining (gross)
+                await client.query(
+                    `UPDATE lots
+                     SET remaining_quantity = remaining_quantity + $1,
+                         status = CASE WHEN remaining_quantity + $1 > 0 THEN 'active' ELSE status END,
+                         updated_at = CURRENT_TIMESTAMP
+                     WHERE id = $2`,
+                    [grossWeight, item.lot_id]
+                );
+            } else if (tx.bill_type === 'jawaak' && tx.is_return) {
+                // Reverting a sales return: subtract stock that was added back (gross)
+                if (Number(lot.remaining_quantity) < grossWeight) {
+                    await client.query('ROLLBACK');
+                    return res.status(409).json({
+                        success: false,
+                        message: `Cannot revert: not enough remaining stock in lot ${lot.lot_number}. Remaining ${lot.remaining_quantity}, required ${grossWeight}`
+                    });
+                }
+
+                await client.query(
+                    `UPDATE lots
+                     SET remaining_quantity = remaining_quantity - $1,
+                         status = CASE WHEN remaining_quantity - $1 <= 0 THEN 'sold_out' ELSE 'active' END,
+                         updated_at = CURRENT_TIMESTAMP
+                     WHERE id = $2`,
+                    [grossWeight, item.lot_id]
+                );
+            }
+        }
+
+        // Rollback party balance (inverse of creation logic in this file)
+        const balanceAmount = Number(tx.balance_amount || 0);
+
+        if (tx.bill_type === 'jawaak') {
+            if (tx.is_return) {
+                await client.query(
+                    'UPDATE parties SET current_balance = current_balance - $1 WHERE id = $2',
+                    [balanceAmount, tx.party_id]
+                );
+            } else {
+                await client.query(
+                    'UPDATE parties SET current_balance = current_balance + $1 WHERE id = $2',
+                    [balanceAmount, tx.party_id]
+                );
+            }
+        } else {
+            if (tx.is_return) {
+                await client.query(
+                    'UPDATE parties SET current_balance = current_balance + $1 WHERE id = $2',
+                    [balanceAmount, tx.party_id]
+                );
+            } else {
+                await client.query(
+                    'UPDATE parties SET current_balance = current_balance - $1 WHERE id = $2',
+                    [balanceAmount, tx.party_id]
+                );
+            }
+        }
+
+        // Delete transaction (items/expenses/payments will cascade delete)
+        await client.query('DELETE FROM transactions WHERE id = $1', [id]);
+
+        await client.query('COMMIT');
+
+        res.json({
+            success: true,
+            message: 'Transaction reverted successfully'
+        });
+    } catch (error) {
+        await client.query('ROLLBACK');
+        console.error('Error reverting transaction:', error);
+        res.status(500).json({ success: false, message: error.message });
+    } finally {
+        client.release();
+    }
+});
+
 module.exports = router;