@opengis/pay 2.0.5 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "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.createTransaction.js

@@ -18,8 +18,12 @@ 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');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!publicKey || !privateKey) {
@@ -56,6 +60,7 @@ export default async function liqpayCreateTransaction({
             currency,
             language,
             paytypes,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

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

@@ -22,8 +22,12 @@ 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');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!host || !token) {
@@ -51,6 +55,7 @@ export default async function monopayCreateTransaction({
             action,
             currency,
             language,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

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

@@ -12,8 +12,12 @@ 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');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!payeeId) {
@@ -46,6 +50,7 @@ export default async function portmoneCreateTransaction({
             currency,
             language,
             paytypes,
+            optionalParams,
         });
 
     if (!paymentData?.id) {

package/server/plugins/payment/processTransaction.js

@@ -37,7 +37,7 @@ export default async function processTransaction(id, { body, origin } = {}) {
     if (!service) throw new Error('invalid payment: service required');
     if (!controller[service]) { throw new Error('invalid params: service'); }
 
-    if (trxStatus === 'success') {
+    if (['error', 'success'].includes(trxStatus)) {
         throw new Error('Transaction was already processed');
     }
 
@@ -46,7 +46,7 @@ export default async function processTransaction(id, { body, origin } = {}) {
     const { status = 'error', err_description: err } = result || {};
 
     if (status !== 'success') {
-        throw new Error(err || 'Помилка перевірки статусу платежу');
+        // throw new Error(err || 'Помилка перевірки статусу платежу');
     }
 
     const balance = await pg.query(`select balance from ${table} 
@@ -55,6 +55,9 @@ export default async function processTransaction(id, { body, origin } = {}) {
         and balance is not null
         order by created_at desc limit 1`, [userId]).then(el => el.rows?.[0]?.balance || 0);
 
+    const newBalance = status === 'success' ? +result.amount + +balance : balance;
+    const successDate = status === 'success' ? newDate() : undefined;
+
     const row = await dataUpdate({
         table,
         data: {
@@ -64,16 +67,16 @@ export default async function processTransaction(id, { body, origin } = {}) {
             paytype: result?.paytype, // card, gpay etc
             receipt_url: result?.receipt_url,
             status,
-            balance: +result.amount + +balance,
-            success_date: newDate(),
+            balance: newBalance,
+            success_date: successDate,
         },
         id,
         uid: userId,
     });
 
     if (process.env.NODE_ENV === 'test') {
-        console.info(`id:${id}, status: ${result.status}, before: ${balance || 0}, sum: ${+result.amount}, after: ${+result.amount + +balance}`);
+        console.info(`id:${id}, status: ${result.status}, before: ${balance || 0}, sum: ${+result.amount}, after: ${newBalance}`);
     }
 
-    return { ...row, balance: +result.amount + +balance };
+    return { ...row, balance: newBalance };
 }

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