@opengis/pay 2.0.6 → 2.0.8

package/package.json

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

package/server/plugins/payment/createPayment.js

@@ -5,7 +5,7 @@ import dataInsert from '../crud/dataInsert.js';
 const { table = 'pay.transactions' } = config.integrations?.pay || {};
 
 export default async function createPayment({
-    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, optionalParams,
 }, pg = pgClients.client) {
     if (!uid) { throw new Error('not enough params: uid'); }
     if (!service) { throw new Error('not enough params: service'); }
@@ -27,6 +27,7 @@ export default async function createPayment({
             language,
             currency,
             paytypes,
+            ...(optionalParams || {}), // allow custom params to be passed
         },
         uid,
     }).then(el => el.rows?.[0]);

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, deliveryEmails,
+    orderId, amount, referer, uid, debug, service, expiredDate, description, action, language, paytypes, currency, deliveryEmails, optionalParams,
 }, pg = pgClients.client) {
     if (!service) throw new Error('not enough params: service');
     if (!controller[service]) { throw new Error('invalid params: service'); }
@@ -39,6 +39,7 @@ export default async function createTransaction({
         language,
         paytypes,
         deliveryEmails,
+        optionalParams,
     }, 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

@@ -18,7 +18,7 @@ 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', deliveryEmails,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, paytypes, action = 'pay', currency = 'uah', language = 'uk', deliveryEmails, optionalParams,
 }, pg = pgClients.client) {
     if (!referer) {
         throw new Error('not enough params: referer required');
@@ -60,6 +60,7 @@ export default async function liqpayCreateTransaction({
             currency,
             language,
             paytypes,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

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/monopay.createTransaction.js

@@ -22,7 +22,7 @@ const ccyObj = {
 };
 
 export default async function monopayCreateTransaction({
-    id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language, optionalParams,
 }, pg = pgClients.client) {
     if (!referer) {
         throw new Error('not enough params: referer required');
@@ -55,6 +55,7 @@ export default async function monopayCreateTransaction({
             action,
             currency,
             language,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

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

@@ -12,7 +12,7 @@ const { table = 'pay.transactions', backUrl } = 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,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency = 'uah', language = 'uk', paytypes, optionalParams,
 }, pg = pgClients.client) {
     if (!referer) {
         throw new Error('not enough params: referer required');
@@ -50,6 +50,7 @@ export default async function portmoneCreateTransaction({
             currency,
             language,
             paytypes,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

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/liqpay/controllers/liqpay.redirect.js

@@ -16,7 +16,7 @@ export default async function liqpayRedirect(req, reply) {
     const paymentData = query.id ? await paymentInfo(query.id) : {
         orderId: query.order_id,
         amount: query.amount, // amount for new transtaction as is, else - preCreated
-        service: 'portmone',
+        service: 'liqpay',
         referer: headers?.referer, // redirect user after finish of transaction
         uid: user.uid, // user id
     };

package/server/routes/monopay/controllers/monopay.redirect.js

@@ -18,7 +18,7 @@ export default async function monopayRedirect(req, reply) {
     const paymentData = query.id ? await paymentInfo(query.id) : {
         orderId: query.order_id, // order ID, optional
         amount: query.amount, // amount for new transtaction as is, else - preCreated
-        service: 'portmone',
+        service: 'monopay',
         referer: headers?.referer, // redirect user after finish of transaction
         uid: user.uid, // user id
     };

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,
 };