@opengis/pay 2.0.5 → 2.0.6

package/package.json

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

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

@@ -20,6 +20,10 @@ 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,
 }, pg = pgClients.client) {
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!publicKey || !privateKey) {

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

@@ -24,6 +24,10 @@ const ccyObj = {
 export default async function monopayCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language,
 }, pg = pgClients.client) {
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!host || !token) {

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

@@ -14,6 +14,10 @@ const { host = 'https://www.portmone.com.ua', payeeId } = config.integrations?.p
 export default async function portmoneCreateTransaction({
     id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency = 'uah', language = 'uk', paytypes,
 }, pg = pgClients.client) {
+    if (!referer) {
+        throw new Error('not enough params: referer required');
+    }
+
     const rootUrl = referer.slice(0, referer.indexOf('/', 7));
 
     if (!payeeId) {

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