Index: kupi-mk/backend/node_modules/.package-lock.json =================================================================== --- kupi-mk/backend/node_modules/.package-lock.json (revision e4c585a51925b48bb8cf59e64bb93cae2a99cd46) +++ kupi-mk/backend/node_modules/.package-lock.json (revision 0057fc78b5a11c7e430149e032d017e76998ea54) @@ -914,4 +914,12 @@ } }, + "node_modules/nodemailer": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.9.tgz", + "integrity": "sha512-9/Qm0qXIByEP8lEV2qOqcAW7bRpL8CR9jcTwk3NBnHJNmP9fIJ86g2fgmIXqHY+nj55ZEMwWqYAT2QTDpRUYiQ==", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/nodemon": { "version": "2.0.22", Index: kupi-mk/backend/package-lock.json =================================================================== --- kupi-mk/backend/package-lock.json (revision e4c585a51925b48bb8cf59e64bb93cae2a99cd46) +++ kupi-mk/backend/package-lock.json (revision 0057fc78b5a11c7e430149e032d017e76998ea54) @@ -19,4 +19,5 @@ "jsonwebtoken": "^9.0.0", "multer": "^1.4.5-lts.1", + "nodemailer": "^7.0.9", "passport": "^0.7.0", "passport-google-oauth20": "^2.0.0", @@ -950,4 +951,12 @@ } }, + "node_modules/nodemailer": { + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.9.tgz", + "integrity": "sha512-9/Qm0qXIByEP8lEV2qOqcAW7bRpL8CR9jcTwk3NBnHJNmP9fIJ86g2fgmIXqHY+nj55ZEMwWqYAT2QTDpRUYiQ==", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/nodemon": { "version": "2.0.22", Index: kupi-mk/backend/package.json =================================================================== --- kupi-mk/backend/package.json (revision e4c585a51925b48bb8cf59e64bb93cae2a99cd46) +++ kupi-mk/backend/package.json (revision 0057fc78b5a11c7e430149e032d017e76998ea54) @@ -27,4 +27,5 @@ "jsonwebtoken": "^9.0.0", "multer": "^1.4.5-lts.1", + "nodemailer": "^7.0.9", "passport": "^0.7.0", "passport-google-oauth20": "^2.0.0", Index: kupi-mk/backend/routes/orders.js =================================================================== --- kupi-mk/backend/routes/orders.js (revision e4c585a51925b48bb8cf59e64bb93cae2a99cd46) +++ kupi-mk/backend/routes/orders.js (revision 0057fc78b5a11c7e430149e032d017e76998ea54) @@ -4,4 +4,5 @@ const { auth } = require('../middleware/auth'); const { createNotification } = require('./notifications'); +const { sendMail } = require('../utils/mailer'); // ============================= @@ -112,11 +113,50 @@ const itemCount = sellerItems.length; + const notificationMessage = `Имате нова нарачка за ${itemCount} ${itemCount === 1 ? 'производ' : 'производи'} во вредност од ${sellerTotal.toFixed(2)} ден.`; + await createNotification( sellerId, 'new_order', 'Нова нарачка!', - `Имате нова нарачка за ${itemCount} ${itemCount === 1 ? 'производ' : 'производи'} во вредност од ${sellerTotal.toFixed(2)} ден.`, + notificationMessage, order.id ); + + // Send email to seller + const sellerResult = await pool.query('SELECT email, first_name FROM users WHERE id = $1', [sellerId]); + if (sellerResult.rows.length > 0) { + const seller = sellerResult.rows[0]; + const productsList = sellerItems.map(item => + `
  • ${item.title} - ${item.quantity} x ${item.price} ден = ${(item.quantity * item.price).toFixed(2)} ден
    • ` + ).join(''); + + sendMail({ + to: seller.email, + subject: `🛍️ Нова нарачка #${order.id} - Kupi.mk`, + html: ` +
    +

    Здраво ${seller.first_name}!

    +

    Имате нова нарачка! 🎉

    +
    +

    Детали за нарачката:

    +

    Број на нарачка: #${order.id}

    +

    Вкупно: ${sellerTotal.toFixed(2)} ден

    +

    Производи:

    + +
    +

    + + Погледни ги сите нарачки + +

    +

    + Ова е автоматска порака од Kupi.mk +

    +
    + `, + text: `Здраво ${seller.first_name}! ${notificationMessage} Погледни на: ${process.env.FRONTEND_URL}/seller-dashboard` + }).catch(err => console.error('Email send error:', err)); + } } @@ -531,11 +571,53 @@ }; + const notificationMessage = statusMessages[status] || `Статусот на вашата нарачка е променет на ${status}.`; + await createNotification( currentOrder.user_id, 'order_status_change', 'Промена на статус на нарачка', - statusMessages[status] || `Статусот на вашата нарачка е променет на ${status}.`, + notificationMessage, orderId ); + + // Send email to buyer + const buyerResult = await pool.query('SELECT email, first_name FROM users WHERE id = $1', [currentOrder.user_id]); + if (buyerResult.rows.length > 0) { + const buyer = buyerResult.rows[0]; + const statusEmojis = { + 'confirmed': '✅', + 'processing': '⚙️', + 'shipped': '🚚', + 'delivered': '📦', + 'cancelled': '❌', + 'pending': '⏳' + }; + + sendMail({ + to: buyer.email, + subject: `${statusEmojis[status] || '📋'} Промена на статус - Нарачка #${orderId}`, + html: ` +
    +

    Здраво ${buyer.first_name}!

    +

    Статусот на вашата нарачка е променет.

    +
    +

    Број на нарачка: #${orderId}

    +

    Нов статус: ${statusEmojis[status] || ''} ${status.toUpperCase()}

    +

    ${notificationMessage}

    +
    +

    + + Погледни ја мојата нарачка + +

    +

    + Ова е автоматска порака од Kupi.mk +

    +
    + `, + text: `Здраво ${buyer.first_name}! ${notificationMessage} Погледни на: ${process.env.FRONTEND_URL}/orders` + }).catch(err => console.error('Email send error:', err)); + } await client.query('COMMIT'); Index: kupi-mk/backend/utils/mailer.js =================================================================== --- kupi-mk/backend/utils/mailer.js (revision 0057fc78b5a11c7e430149e032d017e76998ea54) +++ kupi-mk/backend/utils/mailer.js (revision 0057fc78b5a11c7e430149e032d017e76998ea54) @@ -0,0 +1,46 @@ +const nodemailer = require('nodemailer'); +require('dotenv').config(); + +// Create transporter with Mailtrap SMTP +const transporter = nodemailer.createTransport({ + host: process.env.SMTP_HOST, + port: Number(process.env.SMTP_PORT || 2525), + auth: { + user: process.env.SMTP_USER, + pass: process.env.SMTP_PASS, + }, +}); + +/** + * Send email using Mailtrap + * @param {Object} options - Email options + * @param {string} options.to - Recipient email address + * @param {string} options.subject - Email subject + * @param {string} options.html - HTML content + * @param {string} options.text - Plain text content (optional) + */ +async function sendMail({ to, subject, html, text }) { + try { + if (!to) { + console.error('Email send failed: No recipient specified'); + return null; + } + + const mailOptions = { + from: process.env.EMAIL_FROM || 'Kupi.mk ', + to, + subject, + text: text || subject, + html, + }; + + const info = await transporter.sendMail(mailOptions); + console.log('✅ Email sent:', info.messageId, '→', to); + return info; + } catch (error) { + console.error('❌ Email send error:', error.message); + return null; + } +} + +module.exports = { sendMail };