Merge branch 'main' into refactoring

public/invoice-view.js

@@ -252,7 +252,7 @@ function renderInvoiceRow(invoice) {
 
     // Mark Sent button (right side) — only when open, not paid/partial
     let sendBtn = '';
-    if (hasQbo && !paid && !partial && !overdue && invoice.email_status !== 'sent') {
+    if (hasQbo && !paid && !overdue && invoice.email_status !== 'sent') {
         sendBtn = `<button onclick="window.invoiceView.setEmailStatus(${invoice.id}, 'sent')" class="text-indigo-600 hover:text-indigo-800 text-xs font-medium" title="Mark as sent to customer">📤 Mark Sent</button>`;
     }
 

src/config/qbo.js

@@ -1,5 +1,11 @@
+// src/config/qbo.js
 const OAuthClient = require('intuit-oauth');
-const { getOAuthClient: getClient, saveTokens, resetOAuthClient } = require('../../qbo_helper');
+const { 
+    getOAuthClient: getClient, 
+    saveTokens, 
+    resetOAuthClient,
+    makeQboApiCall // <-- NEU: Direkt hier mit importieren
+} = require('../../qbo_helper');
 
 function getOAuthClient() {
     return getClient();
@@ -16,5 +22,6 @@ module.exports = {
     getOAuthClient,
     getQboBaseUrl,
     saveTokens,
-    resetOAuthClient
+    resetOAuthClient,
+    makeQboApiCall // <-- NEU: Und sauber weiterreichen
 };

src/index.js

@@ -3,8 +3,13 @@
  * Modularized Backend
  */
 const express = require('express');
+const path = require('path');
 const puppeteer = require('puppeteer');
 
+// Import config
+const { pool } = require('./config/database');
+const { OAuthClient, getOAuthClient, saveTokens } = require('./config/qbo');
+
 // Import routes
 const customerRoutes = require('./routes/customers');
 const quoteRoutes = require('./routes/quotes');
@@ -49,6 +54,7 @@ async function initBrowser() {
         browser.on('disconnected', () => {
             console.log('[BROWSER] Browser disconnected, restarting...');
             browser = null;
+            setBrowser(null);
             initBrowser();
         });
     }
@@ -57,9 +63,42 @@ async function initBrowser() {
 
 // Middleware
 app.use(express.json());
-app.use(express.static('public'));
+app.use(express.static(path.join(__dirname, '..', 'public')));
 
-// Mount routes
+// =====================================================
+// QBO OAuth Routes — mounted at root level (not under /api/qbo)
+// These must match the Intuit callback URL configuration
+// =====================================================
+app.get('/auth/qbo', (req, res) => {
+    const client = getOAuthClient();
+    const authUri = client.authorizeUri({
+        scope: [OAuthClient.scopes.Accounting],
+        state: 'intuit-qbo-auth'
+    });
+    console.log('🔗 Redirecting to QBO Authorization:', authUri);
+    res.redirect(authUri);
+});
+
+app.get('/auth/qbo/callback', async (req, res) => {
+    const client = getOAuthClient();
+    try {
+        const authResponse = await client.createToken(req.url);
+        console.log('✅ QBO Authorization erfolgreich!');
+        saveTokens();
+        res.redirect('/#settings');
+    } catch (e) {
+        console.error('❌ QBO Authorization fehlgeschlagen:', e);
+        res.status(500).send(`
+            <h2>QBO Authorization Failed</h2>
+            <p>${e.message || e}</p>
+            <a href="/">Zurück zur App</a>
+        `);
+    }
+});
+
+// =====================================================
+// API Routes
+// =====================================================
 app.use('/api/customers', customerRoutes);
 app.use('/api/quotes', quoteRoutes);
 app.use('/api/invoices', invoiceRoutes);
@@ -81,7 +120,6 @@ process.on('SIGTERM', async () => {
     if (browser) {
         await browser.close();
     }
-    const { pool } = require('./config/database');
     await pool.end();
     process.exit(0);
 });

src/routes/customers.js

@@ -5,8 +5,7 @@
 const express = require('express');
 const router = express.Router();
 const { pool } = require('../config/database');
-const { getOAuthClient, getQboBaseUrl } = require('../config/qbo');
-const { makeQboApiCall } = require('../../qbo_helper');
+const { getOAuthClient, getQboBaseUrl, makeQboApiCall } = require('../config/qbo');
 
 // GET all customers
 router.get('/', async (req, res) => {

src/routes/invoices.js

@@ -11,8 +11,7 @@ const { getNextInvoiceNumber } = require('../utils/numberGenerators');
 const { formatDate, formatMoney } = require('../utils/helpers');
 const { getBrowser, generatePdfFromHtml, getLogoHtml, renderInvoiceItems, formatAddressLines } = require('../services/pdf-service');
 const { exportInvoiceToQbo, syncInvoiceToQbo } = require('../services/qbo-service');
-const { getOAuthClient, getQboBaseUrl } = require('../config/qbo');
-const { makeQboApiCall } = require('../../qbo_helper');
+const { getOAuthClient, getQboBaseUrl, makeQboApiCall } = require('../config/qbo');
 
 // GET all invoices
 router.get('/', async (req, res) => {
@@ -133,7 +132,7 @@ router.post('/', async (req, res) => {
         // Auto QBO Export
         let qboResult = null;
         try {
-            qboResult = await exportInvoiceToQbo(invoiceId, pool);
+            qboResult = await exportInvoiceToQbo(invoiceId, client);
             if (qboResult.skipped) {
                 console.log(`ℹ️ Invoice ${invoiceId} not exported to QBO: ${qboResult.reason}`);
             }
@@ -224,9 +223,9 @@ router.put('/:id', async (req, res) => {
             const hasQboId = !!checkRes.rows[0]?.qbo_id;
 
             if (hasQboId) {
-                qboResult = await syncInvoiceToQbo(id, pool);
+                qboResult = await syncInvoiceToQbo(id, client);
             } else {
-                qboResult = await exportInvoiceToQbo(id, pool);
+                qboResult = await exportInvoiceToQbo(id, client);
             }
 
             if (qboResult.skipped) {

src/routes/qbo.js

@@ -1,12 +1,12 @@
 /**
  * QBO Routes
- * Handles QBO OAuth, sync, and data operations
+ * Handles QBO sync and data operations
+ * NOTE: OAuth auth/callback routes are in index.js (root-level paths)
  */
 const express = require('express');
 const router = express.Router();
 const { pool } = require('../config/database');
-const { getOAuthClient, getQboBaseUrl, saveTokens } = require('../config/qbo');
-const { makeQboApiCall } = require('../../qbo_helper');
+const { getOAuthClient, getQboBaseUrl, makeQboApiCall } = require('../config/qbo');
 
 // GET QBO status
 router.get('/status', (req, res) => {
@@ -23,35 +23,6 @@ router.get('/status', (req, res) => {
     }
 });
 
-// GET auth URL - redirects to Intuit
-router.get('/auth', (req, res) => {
-    const client = getOAuthClient();
-    const authUri = client.authorizeUri({
-        scope: [require('../config/qbo').OAuthClient.scopes.Accounting],
-        state: 'intuit-qbo-auth'
-    });
-    console.log('🔗 Redirecting to QBO Authorization:', authUri);
-    res.redirect(authUri);
-});
-
-// OAuth callback
-router.get('/auth/callback', async (req, res) => {
-    const client = getOAuthClient();
-    try {
-        const authResponse = await client.createToken(req.url);
-        console.log('✅ QBO Authorization erfolgreich!');
-        saveTokens();
-        res.redirect('/#settings');
-    } catch (e) {
-        console.error('❌ QBO Authorization fehlgeschlagen:', e);
-        res.status(500).send(`
-            <h2>QBO Authorization Failed</h2>
-            <p>${e.message || e}</p>
-            <a href="/">Zurück zur App</a>
-        `);
-    }
-});
-
 // GET bank accounts from QBO
 router.get('/accounts', async (req, res) => {
     try {

src/services/qbo-service.js

@@ -1,17 +1,14 @@
+// src/services/qbo-service.js
 /**
  * QuickBooks Online Service
  * Handles QBO API interactions
  */
-const { getOAuthClient, getQboBaseUrl } = require('../config/qbo');
-const { makeQboApiCall } = require('../../qbo_helper');
+const { getOAuthClient, getQboBaseUrl, makeQboApiCall } = require('../config/qbo'); // Sauberer Import
 
 // QBO Item IDs
 const QBO_LABOR_ID = '5';
 const QBO_PARTS_ID = '9';
 
-/**
- * Get OAuth client and company ID
- */
 function getClientInfo() {
     const oauthClient = getOAuthClient();
     const companyId = oauthClient.getToken().realmId;
@@ -22,10 +19,8 @@ function getClientInfo() {
 /**
  * Export invoice to QBO
  */
-async function exportInvoiceToQbo(invoiceId, pool) {
-    const client = await pool.connect();
-    try {
-        const invoiceRes = await client.query(`
+async function exportInvoiceToQbo(invoiceId, dbClient) { // <-- Nutzt jetzt dbClient statt pool
+    const invoiceRes = await dbClient.query(`
         SELECT i.*, c.qbo_id as customer_qbo_id, c.name as customer_name, c.email
         FROM invoices i
         LEFT JOIN customers c ON i.customer_id = c.id
@@ -35,13 +30,13 @@ async function exportInvoiceToQbo(invoiceId, pool) {
     const invoice = invoiceRes.rows[0];
     if (!invoice.customer_qbo_id) return { skipped: true, reason: 'Customer not in QBO' };
 
-        const itemsRes = await client.query('SELECT * FROM invoice_items WHERE invoice_id = $1 ORDER BY item_order', [invoiceId]);
+    const itemsRes = await dbClient.query('SELECT * FROM invoice_items WHERE invoice_id = $1 ORDER BY item_order', [invoiceId]);
     const items = itemsRes.rows;
 
     const { companyId, baseUrl } = getClientInfo();
 
     // Get next DocNumber
-        const maxNumResult = await client.query(`
+    const maxNumResult = await dbClient.query(`
         SELECT GREATEST(
             COALESCE((SELECT MAX(CAST(qbo_doc_number AS INTEGER)) FROM invoices WHERE qbo_doc_number ~ '^[0-9]+$'), 0),
             COALESCE((SELECT MAX(CAST(invoice_number AS INTEGER)) FROM invoices WHERE invoice_number ~ '^[0-9]+$'), 0)
@@ -49,7 +44,6 @@ async function exportInvoiceToQbo(invoiceId, pool) {
     `);
     let nextDocNumber = (parseInt(maxNumResult.rows[0].max_num) + 1).toString();
 
-        // Build line items
     const lineItems = items.map(item => {
         const parseNum = (val) => {
             if (val === null || val === undefined) return 0;
@@ -61,6 +55,7 @@ async function exportInvoiceToQbo(invoiceId, pool) {
         const amount = rate * qty;
         const itemRefId = item.qbo_item_id || QBO_PARTS_ID;
         const itemRefName = itemRefId == QBO_LABOR_ID ? "Labor:Labor" : "Parts:Parts";
+
         return {
             "DetailType": "SalesItemLineDetail",
             "Amount": amount,
@@ -83,16 +78,18 @@ async function exportInvoiceToQbo(invoiceId, pool) {
         "BillEmail": { "Address": invoice.email || "" }
     };
 
-        // Retry on duplicate
     let qboInvoice = null;
+
     for (let attempt = 0; attempt < 5; attempt++) {
         console.log(`📤 QBO Export Invoice (DocNumber: ${qboPayload.DocNumber})...`);
+
         const response = await makeQboApiCall({
             url: `${baseUrl}/v3/company/${companyId}/invoice`,
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(qboPayload)
         });
+
         const data = response.getJson ? response.getJson() : response.json;
 
         if (data.Fault?.Error?.[0]?.code === '6140') {
@@ -107,30 +104,26 @@ async function exportInvoiceToQbo(invoiceId, pool) {
         }
         qboInvoice = data.Invoice || data;
         if (qboInvoice.Id) break;
+
         throw new Error("QBO returned no ID: " + JSON.stringify(data).substring(0, 500));
     }
 
     if (!qboInvoice?.Id) throw new Error('Could not find free DocNumber after 5 attempts.');
 
-        await client.query(
+    await dbClient.query(
         'UPDATE invoices SET qbo_id = $1, qbo_sync_token = $2, qbo_doc_number = $3, invoice_number = $4 WHERE id = $5',
         [qboInvoice.Id, qboInvoice.SyncToken, qboInvoice.DocNumber, qboInvoice.DocNumber, invoiceId]
     );
 
     console.log(`✅ QBO Invoice created: ID ${qboInvoice.Id}, DocNumber ${qboInvoice.DocNumber}`);
     return { success: true, qbo_id: qboInvoice.Id, qbo_doc_number: qboInvoice.DocNumber };
-    } finally {
-        client.release();
-    }
 }
 
 /**
  * Sync invoice to QBO (update)
  */
-async function syncInvoiceToQbo(invoiceId, pool) {
-    const client = await pool.connect();
-    try {
-        const invoiceRes = await client.query(`
+async function syncInvoiceToQbo(invoiceId, dbClient) { // <-- Nutzt jetzt dbClient statt pool
+    const invoiceRes = await dbClient.query(`
         SELECT i.*, c.qbo_id as customer_qbo_id
         FROM invoices i
         LEFT JOIN customers c ON i.customer_id = c.id
@@ -140,16 +133,18 @@ async function syncInvoiceToQbo(invoiceId, pool) {
     const invoice = invoiceRes.rows[0];
     if (!invoice.qbo_id) return { skipped: true, reason: 'Not in QBO' };
 
-        const itemsRes = await client.query('SELECT * FROM invoice_items WHERE invoice_id = $1 ORDER BY item_order', [invoiceId]);
+    const itemsRes = await dbClient.query('SELECT * FROM invoice_items WHERE invoice_id = $1 ORDER BY item_order', [invoiceId]);
+
     const { companyId, baseUrl } = getClientInfo();
 
-        // Get current sync token
     const qboRes = await makeQboApiCall({
         url: `${baseUrl}/v3/company/${companyId}/invoice/${invoice.qbo_id}`,
         method: 'GET'
     });
+
     const qboData = qboRes.getJson ? qboRes.getJson() : qboRes.json;
     const currentSyncToken = qboData.Invoice?.SyncToken;
+
     if (currentSyncToken === undefined) throw new Error('Could not get SyncToken from QBO');
 
     const lineItems = itemsRes.rows.map(item => {
@@ -171,7 +166,7 @@ async function syncInvoiceToQbo(invoiceId, pool) {
             "SalesItemLineDetail": {
                 "ItemRef": { "value": itemRefId, "name": itemRefName },
                 "UnitPrice": rate,
-                    "Qty": parseFloat(item.quantity) || 1
+                "Qty": qty
             }
         };
     });
@@ -187,6 +182,7 @@ async function syncInvoiceToQbo(invoiceId, pool) {
     };
 
     console.log(`📤 QBO Sync Invoice ${invoice.qbo_id}...`);
+
     const updateRes = await makeQboApiCall({
         url: `${baseUrl}/v3/company/${companyId}/invoice`,
         method: 'POST',
@@ -203,21 +199,18 @@ async function syncInvoiceToQbo(invoiceId, pool) {
     }
 
     const updated = updateData.Invoice || updateData;
+
     if (!updated.Id) {
-            console.error(`❌ QBO unexpected response:`, JSON.stringify(updateData).substring(0, 500));
         throw new Error('QBO update returned no ID');
     }
 
-        await client.query(
+    await dbClient.query(
         'UPDATE invoices SET qbo_sync_token = $1, updated_at = CURRENT_TIMESTAMP WHERE id = $2',
         [updated.SyncToken, invoiceId]
     );
 
     console.log(`✅ QBO Invoice ${invoice.qbo_id} synced (SyncToken: ${updated.SyncToken})`);
     return { success: true, sync_token: updated.SyncToken };
-    } finally {
-        client.release();
-    }
 }
 
 module.exports = {