@opengis/pay 2.0.3 → 2.0.4

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "@opengis/pay",
-  "version": "2.0.3",
-  "type": "module",
-  "description": "pay plugins for billing",
-  "main": "plugin.js",
-  "browser": "plugin.js",
-  "files": [
-    "server/*",
-    "module/*",
-    "plugin.js",
-    "config.js",
-    "utils.js"
-  ],
-  "scripts": {
-    "patch": "npm version patch && git push && npm publish",
-    "test": "node --test",
-    "start": "node --watch-path=server server",
-    "admin": "set NODE_ENV=admin&& npm run start",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
-  },
-  "dependencies": {
-    "liqpayjs-sdk": "3.3.1",
-    "request-promise": "4.2.6"
-  },
-  "devDependencies": {
-    "dotenv": "^17.2.2",
-    "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "ioredis": "5.3.2",
-    "nodemailer": "6.5.0",
-    "pg": "8.11.3",
-    "vitest": "^3.2.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
-}
+{
+  "name": "@opengis/pay",
+  "version": "2.0.4",
+  "type": "module",
+  "description": "pay plugins for billing",
+  "main": "plugin.js",
+  "browser": "plugin.js",
+  "files": [
+    "server/*",
+    "module/*",
+    "plugin.js",
+    "config.js",
+    "utils.js"
+  ],
+  "scripts": {
+    "patch": "npm version patch && git push && npm publish",
+    "test": "node --test",
+    "start": "node --watch-path=server server",
+    "admin": "set NODE_ENV=admin&& npm run start",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
+  },
+  "dependencies": {
+    "liqpayjs-sdk": "3.3.1",
+    "request-promise": "4.2.6"
+  },
+  "devDependencies": {
+    "dotenv": "^17.2.2",
+    "eslint": "8.49.0",
+    "eslint-config-airbnb": "19.0.4",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
+    "ioredis": "5.3.2",
+    "nodemailer": "6.5.0",
+    "pg": "8.11.3",
+    "vitest": "^3.2.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
+}

package/server/migrations/7_transactions.sql

@@ -28,6 +28,7 @@ alter table pay.transactions add column if not exists paytypes text;
 alter table pay.transactions add column if not exists paytype text;
 alter table pay.transactions add column if not exists customer text;
 alter table pay.transactions add column if not exists receipt text;
+alter table pay.transactions add column if not exists redirect_url text;
 
 COMMENT ON TABLE pay.transactions IS 'Транзакції';
 
@@ -52,6 +53,7 @@ COMMENT ON COLUMN pay.transactions.paytypes IS 'Дозволені типи оп
 COMMENT ON COLUMN pay.transactions.paytype IS 'Використаний тип оплати';
 COMMENT ON COLUMN pay.transactions.customer IS 'Унікальний ідентифікатор користувача на сайті мерчанта';
 COMMENT ON COLUMN pay.transactions.receipt IS 'Посилання на квітанцію сервісу оплати';
+COMMENT ON COLUMN pay.transactions.redirect_url IS 'Посилання на сторінку сервісу платежів';
 
 CREATE INDEX if not exists pay_transactions_transactions_status_btree_idx ON pay.transactions USING btree (status COLLATE pg_catalog."default");
 

package/server/plugins/payment/createPayment.js

@@ -2,18 +2,16 @@ import config from '../../../config.js';
 import pgClients from '../pg/pgClients.js';
 import dataInsert from '../crud/dataInsert.js';
 
-const { paymentRedirect, table = 'pay.transactions' } = config.integrations?.pay || {};
+const { table = 'pay.transactions' } = config.integrations?.pay || {};
 
 export default async function createPayment({
-    paymentId, orderId, amount, referer, uid, service, expiredDate, description, action = 'pay', currency = 'uah', language = 'uk', paytypes,
+    orderId, amount, referer, uid, service, expiredDate, description, action = 'pay', currency = 'uah', language = 'uk', paytypes,
 }, pg = pgClients.client) {
-    if (!paymentId) { throw new Error('not enough params: paymentId'); }
     if (!uid) { throw new Error('not enough params: uid'); }
     if (!service) { throw new Error('not enough params: service'); }
     if (!amount) { throw new Error('not enough params: amount'); }
 
     const result = await dataInsert({
-        id: paymentId,
         pg,
         table,
         data: {
@@ -32,5 +30,5 @@ export default async function createPayment({
         },
         uid,
     }).then(el => el.rows?.[0]);
-    return { id: paymentId, ...result || {} };
+    return { id: result?.[pg.pk?.[table]], ...result || {} };
 }

package/server/plugins/payment/createTransaction.js

@@ -13,7 +13,7 @@ const controller = {
 };
 
 export default async function createTransaction({
-    orderId, amount, referer, uid, debug, service, expiredDate, description, action, language, paytypes, currency,
+    orderId, amount, referer, uid, debug, service, expiredDate, description, action, language, paytypes, currency, deliveryEmails,
 }, pg = pgClients.client) {
     if (!service) throw new Error('not enough params: service');
     if (!controller[service]) { throw new Error('invalid params: service'); }
@@ -38,6 +38,7 @@ export default async function createTransaction({
         description,
         language,
         paytypes,
+        deliveryEmails,
     }, pg);
     return result;
 }

package/server/plugins/payment/liqpay.createTransaction.js

@@ -3,6 +3,7 @@ import LiqPay from 'liqpayjs-sdk';
 
 import config from '../../../config.js';
 import pgClients from '../pg/pgClients.js';
+import dataUpdate from '../crud/dataUpdate.js';
 
 import createPayment from './createPayment.js';
 
@@ -17,9 +18,9 @@ const {
 const liqpay = new LiqPay(publicKey, privateKey);
 
 export default async function liqpayCreateTransaction({
-    id, orderId, amount, referer, uid, debug, expiredDate, description, paytypes, action = 'pay', currency = 'uah', language = 'uk',
+    id, orderId, amount, referer, uid, debug, expiredDate, description, paytypes, action = 'pay', currency = 'uah', language = 'uk', deliveryEmails,
 }, pg = pgClients.client) {
-    const backUrl = bUrl || referer.slice(0, referer.indexOf('/', 7));
+    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
 
     if (!publicKey || !privateKey) {
         throw new Error('invalid liqpay integration settings');
@@ -41,13 +42,10 @@ export default async function liqpayCreateTransaction({
         throw new Error('not enough params: uid required');
     }
 
-    const paymentId = !id ? await pg.query('select next_id()').then(el => el.rows?.[0]?.next_id) : id;
-
     const paymentData = id && pg.pk?.[table]
         ? await pg.query(`select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]}=$1`, [id]).then(el => el.rows?.[0])
         : await createPayment({
             service: 'liqpay',
-            paymentId,
             orderId,
             amount,
             referer,
@@ -61,20 +59,30 @@ export default async function liqpayCreateTransaction({
         });
 
     if (!paymentData?.id) {
-        throw new Error('payment not found / creation failed');
+        throw new Error('Payment not found / creation failed');
     }
 
     const paymentAmount = id ? paymentData.amount : amount;
 
     if (!paymentAmount) {
-        throw new Error('invalid payment amount');
+        throw new Error('Invalid payment amount');
+    }
+
+    if (id && paymentData?.expired_date
+        && new Date(paymentData.expired_date)
+        && new Date() > new Date(paymentData.expired_date)) {
+        throw new Error('Transaction date already expired');
+    }
+
+    if (id && paymentData?.redirect_url) {
+        return paymentData.redirect_url;
     }
 
     const paymentOptions = {
         action,
         amount: paymentAmount,
         currency: currency.toUpperCase(),
-        description: description || 'regular payment',
+        description: description || `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,
         order_id: paymentData.id,
         version: '3',
         language,
@@ -82,6 +90,9 @@ export default async function liqpayCreateTransaction({
         expired_date: expiredDate && new Date(expiredDate) ? new Date(expiredDate).toISOString().split('.')[0].replace('T', ' ') : undefined,
         // server_url: `${backUrl}${prefix}/liqpay/${paymentData.id}/success`, // update payment info - api url, does not work on sdk package out of the box
         result_url: `${backUrl}${prefix}/liqpay/${paymentData.id}/success`, // redirect user after payment - page url
+        rro_info: Array.isArray(deliveryEmails) && deliveryEmails.length ? {
+            delivery_emails: deliveryEmails,
+        } : undefined,
     };
 
     // html interface for debug via browser only
@@ -110,9 +121,18 @@ export default async function liqpayCreateTransaction({
         throw new Error(response.headers?.location);
     }
 
-    // debug via unt test
+    await dataUpdate({
+        table,
+        id: paymentData.id,
+        data: {
+            redirect_url: response.headers.location,
+        },
+        uid,
+    });
+
+    // debug via unit test
     if (process.env.NODE_ENV === 'test' && debug) {
-        return { url: response.headers.location, id: paymentData.id };
+        return { id: paymentData.id, url: response.headers.location };
     }
 
     return response.headers.location;

package/server/plugins/payment/monopay.createTransaction.js

@@ -5,7 +5,7 @@ import dataUpdate from '../crud/dataUpdate.js';
 import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
-const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
 
 const {
     host = 'https://api.monobank.ua',
@@ -24,6 +24,8 @@ const ccyObj = {
 export default async function monopayCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language,
 }, pg = pgClients.client) {
+    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
+
     if (!host || !token || !backUrl) {
         throw new Error('invalid monopay integration settings');
     }
@@ -36,13 +38,10 @@ export default async function monopayCreateTransaction({
         throw new Error('not enough params: uid required');
     }
 
-    const paymentId = !id ? await pg.query('select next_id()').then(el => el.rows?.[0]?.next_id) : id;
-
     const paymentData = id && pg.pk?.[table]
         ? await pg.query(`select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]}=$1`, [id]).then(el => el.rows?.[0])
         : await createPayment({
             service: 'monopay',
-            paymentId,
             orderId,
             amount,
             referer,
@@ -64,8 +63,18 @@ export default async function monopayCreateTransaction({
         throw new Error('invalid payment amount');
     }
 
+    if (id && paymentData?.expired_date
+        && new Date(paymentData.expired_date)
+        && new Date() > new Date(paymentData.expired_date)) {
+        throw new Error('Transaction date already expired');
+    }
+
+    if (id && paymentData?.redirect_url) {
+        return paymentData.redirect_url;
+    }
+
     // redirect to api to check payment status and redirect user to page afterwards
-    const serverUrl = `${backUrl}${prefix}/monopay/${paymentId}/success`;
+    const serverUrl = `${backUrl}${prefix}/monopay/${paymentData.id}/success`;
 
     const validity = expiredDate && new Date(expiredDate) ? Math.max(((new Date(expiredDate).setHours(0, 0, 0, 0) - new Date().setHours(0, 0, 0, 0)) / 1000 || 0), 86400) : 86400;
 
@@ -74,7 +83,7 @@ export default async function monopayCreateTransaction({
         ccy: ccyObj[currency] || 980, // ISO 4217, 980 = UAH
         merchantPaymInfo,
         redirectUrl: serverUrl,
-        // redirectUrl: (paymentRedirect ? `${rootPageUrl}${paymentRedirect.replace(/{{id}}/g, paymentId)}` : headers?.referer) || rootPageUrl,
+        // redirectUrl: (paymentRedirect ? `${rootPageUrl}${paymentRedirect.replace(/{{id}}/g, paymentData.id)}` : headers?.referer) || rootPageUrl,
         webHookUrl: serverUrl,
         validity, // 1 day by default, then invalid
         paymentType: 'debit',
@@ -97,11 +106,12 @@ export default async function monopayCreateTransaction({
     // !save invoice ID to check status later
     await dataUpdate({
         table,
-        id: paymentId,
+        id: paymentData.id,
         data: {
             invoice_id: response?.invoiceId,
             data: resp.status === 200 ? undefined : { response },
             status: resp.status === 200 ? 'inprogress' : 'error',
+            redirect_url: response?.pageUrl,
         },
         uid,
     });
@@ -116,7 +126,7 @@ export default async function monopayCreateTransaction({
     }
 
     if (process.env.NODE_ENV === 'test' && debug) {
-        return { id: paymentId, url: response.pageUrl };
+        return { id: paymentData.id, url: response.pageUrl };
     }
 
     return response.pageUrl;

package/server/plugins/payment/portmone.createTransaction.js

@@ -2,18 +2,21 @@ import request from 'request-promise';
 
 import config from '../../../config.js';
 import pgClients from '../pg/pgClients.js';
+import dataUpdate from '../crud/dataUpdate.js';
 
 import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
 
-const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
 const { host = 'https://www.portmone.com.ua', payeeId } = config.integrations?.portmone || {};
 
 export default async function portmoneCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency = 'uah', language = 'uk', paytypes,
 }, pg = pgClients.client) {
-    if (!host || !payeeId || !backUrl) {
+    const backUrl = bUrl || referer?.slice?.(0, referer.indexOf('/', 7));
+
+    if (!payeeId || !backUrl) {
         throw new Error('invalid portmone integration settings');
     }
 
@@ -29,13 +32,10 @@ export default async function portmoneCreateTransaction({
         throw new Error('not enough params: uid required');
     }
 
-    const paymentId = !id ? await pg.query('select next_id()').then(el => el.rows?.[0]?.next_id) : id;
-
     const paymentData = id && pg.pk?.[table]
         ? await pg.query(`select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]}=$1`, [id]).then(el => el.rows?.[0])
         : await createPayment({
             service: 'portmone',
-            paymentId,
             orderId,
             amount,
             referer,
@@ -49,13 +49,23 @@ export default async function portmoneCreateTransaction({
         });
 
     if (!paymentData?.id) {
-        throw new Error('payment not found / creation failed');
+        throw new Error('Payment not found / creation failed');
     }
 
     const paymentAmount = id ? paymentData.amount : amount;
 
     if (!paymentAmount) {
-        throw new Error('invalid payment amount');
+        throw new Error('Invalid payment amount');
+    }
+
+    if (id && paymentData?.expired_date
+        && new Date(paymentData.expired_date)
+        && new Date() > new Date(paymentData.expired_date)) {
+        throw new Error('Transaction date already expired');
+    }
+
+    if (id && paymentData?.redirect_url) {
+        return paymentData.redirect_url;
     }
 
     const formData = {
@@ -90,8 +100,17 @@ export default async function portmoneCreateTransaction({
         throw new Error(response);
     }
 
+    await dataUpdate({
+        table,
+        id: paymentData.id,
+        data: {
+            redirect_url: response.headers.location,
+        },
+        uid,
+    });
+
     if (process.env.NODE_ENV === 'test' && debug) {
-        return { id: paymentData?.id, url: response.headers.location };
+        return { id: paymentData.id, url: response.headers.location };
     }
 
     return response.headers.location;