@opengis/pay 2.0.7 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",

package/server/plugins/payment/createTransaction.js

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

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

@@ -3,6 +3,7 @@ import request from 'request-promise';
 
 import config from '../../../config.js';
 import pgClients from '../pg/pgClients.js';
+import sendReceipt from './liqpay.sendReceipt.js';
 
 const { table = 'pay.transactions' } = config.integrations?.pay || {};
 const { host = 'https://www.liqpay.ua', publicKey, privateKey } = config.integrations?.liqpay || {};
@@ -11,7 +12,7 @@ const liqpay = new LiqPay(publicKey, privateKey);
 
 const pg = pgClients.client;
 
-export default async function liqpayCheckStatus(id, { origin } = {}) {
+export default async function liqpayCheckStatus(id, { email, origin } = {}) {
     if (!id) throw new Error('not enough params: id');
     if (!publicKey || !privateKey) throw new Error('empty integration params: liqpay');
 
@@ -29,6 +30,10 @@ export default async function liqpayCheckStatus(id, { origin } = {}) {
     const isValidOrigin = origin && origin === host;
 
     if (process.env.NODE_ENV === 'test' && isValidOrigin) {
+        if (email) {
+            const res = await sendReceipt(id, email);
+            console.log('receipt delivery', res, email);
+        }
         const amount = pg?.pk?.[table] ? await pg.query(`select amount from ${table} where ${pg?.pk?.[table]}=$1`, [id]).then(el => el.rows?.[0]?.amount) : 0;
         return { unittest: true, amount, status: 'success' };
     }
@@ -43,23 +48,10 @@ export default async function liqpayCheckStatus(id, { origin } = {}) {
 
     const result = response?.startsWith?.('{') ? JSON.parse(response) : response;
 
-    // ! receipt can only be sent to email, no link provided by liqpay
-    /* const data1 = Buffer.from(JSON.stringify({
-        action: 'ticket',
-        version: '3',
-        order_id: id,
-        email: 'email@gmail.com',
-        language: result?.language || 'uk',
-    })).toString('base64');
-    const signature1 = liqpay.str_to_sign(privateKey + data1 + privateKey);
-
-    const response1 = await request(`${host}/api/request`, {
-        method: 'POST',
-        form: { data: data1, signature: signature1 },
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-    }); */
+    if (email) {
+        const res = await sendReceipt(id, email, result?.language);
+        console.log('receipt delivery', res, email);
+    }
 
     return result;
 }

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

@@ -19,6 +19,7 @@ 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', deliveryEmails, optionalParams,
+    splitRules, splitTicketsDynamicRequisites, splitTicketsOnly,
 }, pg = pgClients.client) {
     if (!referer) {
         throw new Error('not enough params: referer required');
@@ -102,6 +103,18 @@ export default async function liqpayCreateTransaction({
         } : undefined,
     };
 
+    if (splitTicketsDynamicRequisites) {
+        paymentOptions.split_tickets_dynamic_requisites = true;
+    }
+    if (splitTicketsOnly) {
+        paymentOptions.split_tickets_only = true;
+    }
+
+    // regular split rules are optional[], refer to LiqPay documentation
+    if (Array.isArray(splitRules) && splitRules.length) {
+        paymentOptions.split_rules = splitRules;
+    }
+
     // html interface for debug via browser only
     if (process.env.NODE_ENV !== 'test' && debug) {
         return liqpay.cnb_form(paymentOptions);

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

@@ -0,0 +1,27 @@
+import LiqPay from 'liqpayjs-sdk';
+import request from 'request-promise';
+
+import config from '../../../config.js';
+
+const { host = 'https://www.liqpay.ua', publicKey, privateKey } = config.integrations?.liqpay || {};
+
+const liqpay = new LiqPay(publicKey, privateKey);
+
+export default async function sendReceipt(id, email, language = 'uk') {
+    const data1 = Buffer.from(JSON.stringify({
+        action: 'ticket',
+        version: '3',
+        order_id: id,
+        email,
+        language,
+    })).toString('base64');
+    const signature1 = liqpay.str_to_sign(privateKey + data1 + privateKey);
+    const response1 = await request(`${host}/api/request`, {
+        method: 'POST',
+        form: { data: data1, signature: signature1 },
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+    });
+    return response1;
+}

package/server/plugins/payment/processTransaction.js

@@ -23,7 +23,7 @@ const { table = 'pay.transactions' } = config.integrations?.pay || {};
 
 const pg = pgClients.client;
 
-export default async function processTransaction(id, { body, origin } = {}) {
+export default async function processTransaction(id, { email, body, origin } = {}) {
     if (!id) throw new Error('not enough params: id');
 
     const {
@@ -41,7 +41,7 @@ export default async function processTransaction(id, { body, origin } = {}) {
         throw new Error('Transaction was already processed');
     }
 
-    const result = await controller[service](id, { origin, body });
+    const result = await controller[service](id, { email, origin, body });
 
     const { status = 'error', err_description: err } = result || {};
 

package/server/plugins/payment/sendReceipt.js

@@ -0,0 +1,36 @@
+import config from '../../../config.js';
+import pgClients from '../pg/pgClients.js';
+
+import liqpaySendReceipt from './liqpay.sendReceipt.js';
+
+const controller = {
+    liqpay: liqpaySendReceipt,
+    // monopay: monopaySendReceipt,
+    // portmone: portmoneSendReceipt,
+};
+
+const { table = 'pay.transactions' } = config.integrations?.pay || {};
+
+const pg = pgClients.client;
+
+export default async function sendReceipt(id, email, language = 'uk') {
+    if (!id) throw new Error('not enough params: id');
+
+    const { id: paymentId, service } = 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] || {})
+        : {};
+
+    if (!paymentId) {
+        return { message: 'payment not found', status: 404 };
+    }
+
+    if (!service) {
+        return { message: 'payment service not defined', status: 400 };
+    }
+    if (!controller[service]) {
+        return { message: `unsupported service: ${service}`, status: 400 };
+    }
+
+    const result = await controller[service](id, email, language);
+    return result;
+}

package/server/routes/core/index.mjs

@@ -1,12 +1,14 @@
 import paymentInfo from './controllers/payment.info.js';
 
-export default async function plugin(app, opts) {
-    app.route({
-        method: 'GET',
-        url: '/payment-info/:id',
-        config: {
-            policy: ['site'],
-        },
-        handler: paymentInfo,
-    });
+export default function plugin(app, { prefix = '/api' } = {}) {
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/payment-info/:id` })) {
+        app.route({
+            method: 'GET',
+            url: '/payment-info/:id',
+            config: {
+                policy: 'L1',
+            },
+            handler: paymentInfo,
+        });
+    }
 }

package/server/routes/liqpay/index.mjs

@@ -1,30 +1,37 @@
 import liqpayRedirect from './controllers/liqpay.redirect.js';
 import liqpayStatus from './controllers/liqpay.status.js';
 
-export default async function plugin(app, opts) {
-    app.route({
-        method: 'GET',
-        url: '/liqpay-redirect',
-        config: {
-            policy: ['site'],
-        },
-        handler: liqpayRedirect,
-    });
-    // /payment-info/:id
-    app.route({
-        method: 'POST',
-        url: '/liqpay/:id/:status',
-        config: {
-            policy: ['public'],
-        },
-        handler: liqpayStatus,
-    });
-    app.route({
-        method: 'GET',
-        url: '/liqpay/:id/:status',
-        config: {
-            policy: ['public'],
-        },
-        handler: liqpayStatus,
-    });
+export default function plugin(app, { prefix = '/api' } = {}) {
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/liqpay-redirect` })) {
+        app.route({
+            method: 'GET',
+            url: '/liqpay-redirect',
+            config: {
+                policy: 'L1',
+            },
+            handler: liqpayRedirect,
+        });
+    }
+
+    if (!app.hasRoute({ method: 'POST', url: `${prefix}/liqpay/:id/:status` })) {
+        app.route({
+            method: 'POST',
+            url: '/liqpay/:id/:status',
+            config: {
+                policy: 'L0',
+            },
+            handler: liqpayStatus,
+        });
+    }
+
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/liqpay/:id/:status` })) {
+        app.route({
+            method: 'GET',
+            url: '/liqpay/:id/:status',
+            config: {
+                policy: 'L0',
+            },
+            handler: liqpayStatus,
+        });
+    }
 }

package/server/routes/monopay/index.mjs

@@ -14,19 +14,24 @@ const schema = {
     },
 };
 
-export default async function plugin(app, opts) {
-    app.route({
-        method: 'GET',
-        url: '/monopay-redirect',
-        config: { policy: ['site'] },
-        schema,
-        handler: monopayRedirect,
-    });
-    app.route({
-        method: 'GET',
-        url: '/monopay/:id/:status',
-        config: { policy: ['public'] },
-        schema,
-        handler: monopayStatus,
-    });
+export default function plugin(app, { prefix = '/api' } = {}) {
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/monopay-redirect` })) {
+        app.route({
+            method: 'GET',
+            url: '/monopay-redirect',
+            config: { policy: 'L1' },
+            schema,
+            handler: monopayRedirect,
+        });
+    }
+
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/monopay/:id/:status` })) {
+        app.route({
+            method: 'GET',
+            url: '/monopay/:id/:status',
+            config: { policy: 'L0' },
+            schema,
+            handler: monopayStatus,
+        });
+    }
 }

package/server/routes/portmone/index.mjs

@@ -1,29 +1,37 @@
 import portmoneRedirect from './controllers/portmone.redirect.js';
 import portmoneStatus from './controllers/portmone.status.js';
 
-export default async function plugin(app, opts) {
-    app.route({
-        method: 'GET',
-        url: '/portmone-redirect',
-        config: {
-            policy: ['site'],
-        },
-        handler: portmoneRedirect,
-    });
-    app.route({
-        method: 'POST',
-        url: '/portmone/:id/:status',
-        config: {
-            policy: ['public'],
-        },
-        handler: portmoneStatus,
-    });
-    app.route({
-        method: 'GET',
-        url: '/portmone/:id/:status',
-        config: {
-            policy: ['public'],
-        },
-        handler: portmoneStatus,
-    });
+export default function plugin(app, { prefix = '/api' } = {}) {
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/portmone-redirect` })) {
+        app.route({
+            method: 'GET',
+            url: '/portmone-redirect',
+            config: {
+                policy: 'L1',
+            },
+            handler: portmoneRedirect,
+        });
+    }
+
+    if (!app.hasRoute({ method: 'POST', url: `${prefix}/portmone/:id/:status` })) {
+        app.route({
+            method: 'POST',
+            url: '/portmone/:id/:status',
+            config: {
+                policy: 'L0',
+            },
+            handler: portmoneStatus,
+        });
+    }
+
+    if (!app.hasRoute({ method: 'GET', url: `${prefix}/portmone/:id/:status` })) {
+        app.route({
+            method: 'GET',
+            url: '/portmone/:id/:status',
+            config: {
+                policy: 'L0',
+            },
+            handler: portmoneStatus,
+        });
+    }
 }

package/utils.js

@@ -1,11 +1,12 @@
 import paymentInfo from './server/plugins/payment/paymentInfo.js';
 import processTransaction from './server/plugins/payment/processTransaction.js';
 import createTransaction from './server/plugins/payment/createTransaction.js';
+import sendReceipt from './server/plugins/payment/sendReceipt.js';
 
 export {
-    paymentInfo, processTransaction, createTransaction,
+    paymentInfo, processTransaction, createTransaction, sendReceipt,
 };
 
 export default {
-    paymentInfo, processTransaction, createTransaction,
+    paymentInfo, processTransaction, createTransaction, sendReceipt,
 };