@opengis/pay 2.0.1 → 2.0.3

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "@opengis/pay",
-  "version": "2.0.1",
-  "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.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"
+}

package/server/migrations/7_transactions.sql

@@ -17,8 +17,20 @@ alter table pay.transactions add column if not exists created_by text NOT NULL d
 alter table pay.transactions add column if not exists updated_by text;
 alter table pay.transactions add column if not exists updated_at timestamp without time zone;
 alter table pay.transactions add column if not exists invoice_id text;
+alter table pay.transactions add column if not exists payment_id text;
+alter table pay.transactions add column if not exists order_id text;
+alter table pay.transactions add column if not exists description text;
+alter table pay.transactions add column if not exists action text;
+alter table pay.transactions add column if not exists currency text;
+alter table pay.transactions add column if not exists expired_date date;
+alter table pay.transactions add column if not exists language text;
+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;
+
+COMMENT ON TABLE pay.transactions IS 'Транзакції';
 
-COMMENT ON TABLE pay.transactions IS 'Платежі';
 COMMENT ON COLUMN pay.transactions.transaction_id IS 'ID';
 COMMENT ON COLUMN pay.transactions.user_id IS 'ID користувача';
 COMMENT ON COLUMN pay.transactions.status IS 'Статус транзації';
@@ -28,7 +40,18 @@ COMMENT ON COLUMN pay.transactions.service IS 'Сервіс оплати (portmo
 COMMENT ON COLUMN pay.transactions.amount IS 'Сума поповнення рахунку';
 COMMENT ON COLUMN pay.transactions.balance IS 'Поточний баланс';
 COMMENT ON COLUMN pay.transactions.referer_url IS 'Посилання';
-COMMENT ON COLUMN pay.transactions.invoice_id IS 'ID транзакції з сервісу оплати';
+COMMENT ON COLUMN pay.transactions.invoice_id IS 'ID рахунку сервісу оплати';
+COMMENT ON COLUMN pay.transactions.invoice_id IS 'ID платежу сервісу оплати';
+COMMENT ON COLUMN pay.transactions.order_id IS 'Внутрішній ID замовлення';
+COMMENT ON COLUMN pay.transactions.description IS 'Опис';
+COMMENT ON COLUMN pay.transactions.action IS 'Дія';
+COMMENT ON COLUMN pay.transactions.currency IS 'Валюта';
+COMMENT ON COLUMN pay.transactions.expired_date IS 'Термін дії';
+COMMENT ON COLUMN pay.transactions.language IS 'Мова';
+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 'Посилання на квітанцію сервісу оплати';
 
 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

@@ -5,23 +5,30 @@ import dataInsert from '../crud/dataInsert.js';
 const { paymentRedirect, table = 'pay.transactions' } = config.integrations?.pay || {};
 
 export default async function createPayment({
-    paymentId, price, referer, uid, service,
+    paymentId, 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 (!price) { throw new Error('not enough params: price'); }
+    if (!amount) { throw new Error('not enough params: amount'); }
 
     const result = await dataInsert({
         id: paymentId,
         pg,
         table,
         data: {
-            referer_url: paymentRedirect ? paymentRedirect.replace(/{{id}}/g, paymentId) : referer,
-            amount: price,
+            referer_url: referer,
+            amount,
             user_id: uid,
+            order_id: orderId,
             service,
             status: 'inprogress',
+            action,
+            expired_date: expiredDate,
+            description,
+            language,
+            currency,
+            paytypes,
         },
         uid,
     }).then(el => el.rows?.[0]);

package/server/plugins/payment/createTransaction.js

@@ -13,14 +13,31 @@ const controller = {
 };
 
 export default async function createTransaction({
-    id, price, rootUrl, referer, uid, debug, service,
+    orderId, amount, referer, uid, debug, service, expiredDate, description, action, language, paytypes, currency,
 }, pg = pgClients.client) {
     if (!service) throw new Error('not enough params: service');
     if (!controller[service]) { throw new Error('invalid params: service'); }
-    if (price && !uid) throw new Error('not enough params: uid');
+    if (amount && !uid) throw new Error('not enough params: uid');
+
+    if (currency && !['uah', 'usd', 'eur'].includes(currency)) {
+        throw new Error('invalid params: currency');
+    }
+
+    if (language && !['uk', 'en'].includes(language)) {
+        throw new Error('invalid params: language');
+    }
 
     const result = await controller[service]({
-        id, price, rootUrl, referer, uid, debug,
+        orderId,
+        amount,
+        referer,
+        uid,
+        debug,
+        action,
+        expiredDate,
+        description,
+        language,
+        paytypes,
     }, pg);
     return result;
 }

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

@@ -9,7 +9,9 @@ const { host = 'https://www.liqpay.ua', publicKey, privateKey } = config.integra
 
 const liqpay = new LiqPay(publicKey, privateKey);
 
-export default async function liqpayCheckStatus(id, origin, pg = pgClients.client) {
+const pg = pgClients.client;
+
+export default async function liqpayCheckStatus(id, { origin } = {}) {
     if (!id) throw new Error('not enough params: id');
     if (!publicKey || !privateKey) throw new Error('empty integration params: liqpay');
 
@@ -38,6 +40,26 @@ export default async function liqpayCheckStatus(id, origin, pg = pgClients.clien
             'Content-Type': 'application/x-www-form-urlencoded',
         },
     });
+
     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',
+        },
+    }); */
+
     return result;
 }

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

@@ -7,7 +7,7 @@ import pgClients from '../pg/pgClients.js';
 import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
-const { table = 'pay.transactions' } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl: bUrl } = config.integrations?.pay || {};
 
 const {
     host = 'https://www.liqpay.ua',
@@ -17,18 +17,24 @@ const {
 const liqpay = new LiqPay(publicKey, privateKey);
 
 export default async function liqpayCreateTransaction({
-    id, price, rootUrl, referer, uid, debug,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, paytypes, action = 'pay', currency = 'uah', language = 'uk',
 }, pg = pgClients.client) {
+    const backUrl = bUrl || referer.slice(0, referer.indexOf('/', 7));
+
     if (!publicKey || !privateKey) {
         throw new Error('invalid liqpay integration settings');
     }
 
-    if (!id && !price) {
-        throw new Error('not enough params: id or price required');
+    if (!['pay', 'hold', 'subscribe', 'paydonate'].includes(action)) {
+        throw new Error('invalid params: action');
+    }
+
+    if (paytypes && paytypes.split(',').find(el => !['apay', 'gpay', 'card', 'privat24', 'moment_part', 'paypart', 'cash', 'invoice', 'qr'].includes(el))) {
+        throw new Error('invalid params: paytypes');
     }
 
-    if (!rootUrl) {
-        throw new Error('not enough params: rootUrl required');
+    if (!id && !amount) {
+        throw new Error('not enough params: id or amount required');
     }
 
     if (!uid) {
@@ -40,32 +46,42 @@ export default async function liqpayCreateTransaction({
     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,
-            price,
+            orderId,
+            amount,
             referer,
             uid,
-            service: 'liqpay',
+            expiredDate,
+            description,
+            action,
+            currency,
+            language,
+            paytypes,
         });
 
     if (!paymentData?.id) {
         throw new Error('payment not found / creation failed');
     }
 
-    const paymentAmount = id ? paymentData.amount : price;
+    const paymentAmount = id ? paymentData.amount : amount;
 
     if (!paymentAmount) {
         throw new Error('invalid payment amount');
     }
 
     const paymentOptions = {
-        action: 'pay',
+        action,
         amount: paymentAmount,
-        currency: 'UAH',
-        description: 'regular payment',
+        currency: currency.toUpperCase(),
+        description: description || 'regular payment',
         order_id: paymentData.id,
         version: '3',
-        // server_url: `${rootUrl}${prefix}/liqpay/${paymentData.id}/success`, // update payment info - api url, does not work on sdk package out of the box
-        result_url: `${rootUrl}${prefix}/liqpay/${paymentData.id}/success`, // redirect user after payment - page url
+        language,
+        paytypes,
+        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
     };
 
     // html interface for debug via browser only

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

@@ -10,7 +10,9 @@ const {
 
 const timeoutMs = 5000;
 
-export default async function monopayCheckStatus(id, origin, pg = pgClients.client) {
+const pg = pgClients.client;
+
+export default async function monopayCheckStatus(id, { origin } = {}) {
     if (!id) { throw new Error('not enough params: id'); }
 
     const {
@@ -44,5 +46,11 @@ export default async function monopayCheckStatus(id, origin, pg = pgClients.clie
         ? await resp.json()
         : { error: await resp.text() };
 
-    return { ...body, amount: body.amount / 100, status: body.status };
+    return {
+        ...body,
+        paytype: body.paymentInfo?.maskedPan ? 'card' : null,
+        payment_id: body.paymentInfo?.tranId,
+        amount: body.amount / 100,
+        status: body.status,
+    };
 }

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' } = config.integrations?.pay || {};
+const { table = 'pay.transactions', backUrl } = config.integrations?.pay || {};
 
 const {
     host = 'https://api.monobank.ua',
@@ -15,23 +15,21 @@ const {
 
 const timeoutMs = 5000;
 
+const ccyObj = {
+    uah: 980,
+    usd: 840,
+    eur: 978,
+};
+
 export default async function monopayCreateTransaction({
-    id, price, rootUrl, referer, uid, debug,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency, language,
 }, pg = pgClients.client) {
-    if (!host) {
-        throw new Error('empty integration host');
-    }
-
-    if (!token) {
-        throw new Error('empty integration token');
-    }
-
-    if (!id && !price) {
-        throw new Error('not enough params: id or price required');
+    if (!host || !token || !backUrl) {
+        throw new Error('invalid monopay integration settings');
     }
 
-    if (!rootUrl) {
-        throw new Error('not enough params: rootUrl required');
+    if (!id && !amount) {
+        throw new Error('not enough params: id or amount required');
     }
 
     if (!uid) {
@@ -43,33 +41,42 @@ export default async function monopayCreateTransaction({
     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,
-            price,
+            orderId,
+            amount,
             referer,
             uid,
-            service: 'monopay',
+            expiredDate,
+            description,
+            action,
+            currency,
+            language,
         });
 
     if (!paymentData?.id) {
         throw new Error('payment not found / creation failed');
     }
-    const paymentAmount = id ? paymentData.amount : price;
+
+    const paymentAmount = id ? paymentData.amount : amount;
 
     if (!paymentAmount) {
         throw new Error('invalid payment amount');
     }
 
     // redirect to api to check payment status and redirect user to page afterwards
-    const serverUrl = `${rootUrl}${prefix}/monopay/${paymentId}/success`;
+    const serverUrl = `${backUrl}${prefix}/monopay/${paymentId}/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;
 
     const paymentOptions = {
-        amount: paymentAmount * 100, // price=1 === 0.01 uah
-        ccy: 980, // ISO 4217, 980 = UAH
+        amount: paymentAmount * 100, // amount=1 === 0.01 uah
+        ccy: ccyObj[currency] || 980, // ISO 4217, 980 = UAH
         merchantPaymInfo,
         redirectUrl: serverUrl,
         // redirectUrl: (paymentRedirect ? `${rootPageUrl}${paymentRedirect.replace(/{{id}}/g, paymentId)}` : headers?.referer) || rootPageUrl,
         webHookUrl: serverUrl,
-        validity: 86400, // 1 day by default, then invalid
+        validity, // 1 day by default, then invalid
         paymentType: 'debit',
         // displayType: 'iframe', // default = null > url to mono
     };

package/server/plugins/payment/paymentInfo.js

@@ -10,6 +10,7 @@ export default async function paymentInfo(id, pg = pgClients.client) {
         amount,
         status,
         service,
+        order_id: orderId,
         referer_url: referer,
         user_id: userId,
     } = id && pg.pk?.[table] ? await pg.query(`select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]}=$1`, [id])
@@ -17,7 +18,8 @@ export default async function paymentInfo(id, pg = pgClients.client) {
 
     return {
         id, // id for existing transtaction
-        price: amount, // price for new transtaction as is, else - preCreated
+        orderId, // order ID, optional
+        amount, // amount for new transtaction as is, else - preCreated
         status, // payment status
         service, // service name
         referer, // redirect user after finish of transaction

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

@@ -12,7 +12,9 @@ const {
   payeeId,
 } = config.integrations?.portmone || {};
 
-export default async function portmoneCheckStatus(id, origin, pg = pgClients.client) {
+const pg = pgClients.client;
+
+export default async function portmoneCheckStatus(id, { body, origin } = {}) {
   if (!payeeId) throw new Error('empty integration params: payeeId');
   if (!id) throw new Error('not enough params: id');
 
@@ -31,12 +33,25 @@ export default async function portmoneCheckStatus(id, origin, pg = pgClients.cli
 
   const isValidOrigin = origin && origin === host;
 
-  if (!(login && password) && !isValidOrigin) {
+  /* if (!(login && password) && !isValidOrigin) {
     throw new Error('empty integration params: portmone 2');
+  } */
+
+  if (!isValidOrigin) {
+    throw new Error('access denied');
   }
 
+  const mockResult = {
+    ...body || {},
+    paytype: !body?.RESULT || body?.CARD_MASK ? 'card' : null,
+    billAmount: body?.BILL_AMOUNT || data.amount,
+    receipt_url: body?.RECEIPT_URL,
+    payment_id: body?.SHOPBILLID,
+    status: !body?.RESULT || body?.RESULT === '0' ? 'success' : 'error',
+  };
+
   // ? likely cause timeout, skip be origin check or check credentials i.e.: login, password
-  const response = isValidOrigin ? { billAmount: data.amount, status: 'success' } : await request({
+  const response = isValidOrigin ? mockResult : await request({
     url: `${host}/gateway/`,
     method: 'POST',
     formData,

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

@@ -7,26 +7,22 @@ import createPayment from './createPayment.js';
 
 const { prefix = '/api' } = config;
 
-const { table = 'pay.transactions' } = config.integrations?.pay || {};
+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, price, rootUrl, referer, uid, debug,
+    id, orderId, amount, referer, uid, debug, expiredDate, description, action, currency = 'uah', language = 'uk', paytypes,
 }, pg = pgClients.client) {
-    if (!host) {
-        throw new Error('empty integration host');
+    if (!host || !payeeId || !backUrl) {
+        throw new Error('invalid portmone integration settings');
     }
 
-    if (!payeeId) {
-        throw new Error('empty integration payeeId');
+    if (paytypes && paytypes.split(',').find(el => !['card', 'portmone', 'token', 'clicktopay', 'privat', 'gpay', 'createtokenonly', 'gpayonly', 'applepay', 'applepayonly', 'link'].includes(el))) {
+        throw new Error('invalid params: paytypes');
     }
 
-    if (!id && !price) {
-        throw new Error('not enough params: id or price required');
-    }
-
-    if (!rootUrl) {
-        throw new Error('not enough params: rootUrl required');
+    if (!id && !amount) {
+        throw new Error('not enough params: id or amount required');
     }
 
     if (!uid) {
@@ -38,18 +34,25 @@ export default async function portmoneCreateTransaction({
     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,
-            price,
+            orderId,
+            amount,
             referer,
             uid,
-            service: 'portmone',
+            expiredDate,
+            description,
+            action,
+            currency,
+            language,
+            paytypes,
         });
 
     if (!paymentData?.id) {
         throw new Error('payment not found / creation failed');
     }
 
-    const paymentAmount = id ? paymentData.amount : price;
+    const paymentAmount = id ? paymentData.amount : amount;
 
     if (!paymentAmount) {
         throw new Error('invalid payment amount');
@@ -57,12 +60,13 @@ export default async function portmoneCreateTransaction({
 
     const formData = {
         payee_id: payeeId,
-        description: `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,
+        description: description || `Послуга - поповнення рахунку на суму ${paymentAmount} грн`,
         shop_order_number: paymentData.id,
         bill_amount: paymentAmount,
-        success_url: `${rootUrl}${prefix}/portmone/${paymentData.id}/success`,
-        failure_url: `${rootUrl}${prefix}/portmone/${paymentData.id}/error`,
-        lang: 'ua',
+        bill_currency: currency.toUpperCase(),
+        success_url: `${backUrl}${prefix}/portmone/${paymentData.id}/success`,
+        failure_url: `${backUrl}${prefix}/portmone/${paymentData.id}/error`,
+        lang: language === 'uk' ? 'ua' : language,
     };
 
     // portmone always returns error without simple: false options

package/server/plugins/payment/processTransaction.js

@@ -15,13 +15,15 @@ const controller = {
 const newDate = () => {
     const date = new Date();
     const tzOffset = date.getTimezoneOffset();
-    const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
-    return new Date(currentTimeWithTimezome).toISOString();
+    const currentTimeWithTimezone = date - tzOffset * 60 * 1000;
+    return new Date(currentTimeWithTimezone).toISOString();
 };
 
 const { table = 'pay.transactions' } = config.integrations?.pay || {};
 
-export default async function processTransaction(id, origin, pg = pgClients.client) {
+const pg = pgClients.client;
+
+export default async function processTransaction(id, { body, origin } = {}) {
     if (!id) throw new Error('not enough params: id');
 
     const {
@@ -39,7 +41,7 @@ export default async function processTransaction(id, origin, pg = pgClients.clie
         throw new Error('Transaction was already processed');
     }
 
-    const result = await controller[service](id, origin);
+    const result = await controller[service](id, { origin, body });
 
     const { status = 'error', err_description: err } = result || {};
 
@@ -57,6 +59,10 @@ export default async function processTransaction(id, origin, pg = pgClients.clie
         table,
         data: {
             data: result,
+            payment_id: result?.payment_id, // payment service ID
+            customer: result?.customer, // payee
+            paytype: result?.paytype, // card, gpay etc
+            receipt_url: result?.receipt_url,
             status,
             balance: +result.amount + +balance,
             success_date: newDate(),

package/server/routes/core/controllers/payment.info.js

@@ -39,8 +39,8 @@ export default async function paymentInfo({
   }
 
   const { rows = [] } = await pg.query(
-    `select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]} = $1 and user_id = $2`,
-    [params.id, user.uid],
+    `select ${pg.pk?.[table]} as id, * from ${table} where ${pg.pk?.[table]} = $1 and ${user?.user_type?.includes?.('admin') ? '1=1' : 'user_id = $2'}`,
+    [params.id, user?.user_type?.includes?.('admin') ? null : user.uid].filter(Boolean),
   );
 
   if (!rows.length) {

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

@@ -6,32 +6,27 @@ import createTransaction from '../../../plugins/payment/liqpay.createTransaction
 
 export default async function liqpayRedirect(req, reply) {
     const {
-        hostname, headers, pg = pgClients.client, query = {}, user = {}, protocol,
+        headers, pg = pgClients.client, query = {}, user = {},
     } = req;
 
     if (!user?.uid) {
         return reply.status(401).send('unauthorized');
     }
 
-    const domain = hostname?.split?.(':')?.shift?.();
-    const rootUrl = `${protocol || 'https'}://${domain}`;
-
     const paymentData = query.id ? await paymentInfo(query.id) : {
-        price: query.price, // price for new transtaction as is, else - preCreated
+        orderId: query.order_id,
+        amount: query.amount, // amount for new transtaction as is, else - preCreated
         service: 'portmone',
         referer: headers?.referer, // redirect user after finish of transaction
         uid: user.uid, // user id
     };
 
-    // redirect back from payment service to API endpoint, provide protocol + domain
-    Object.assign(paymentData, { rootUrl });
-
     if (query.id && paymentData.status === 'success') {
         return reply.status(400).send('already processed');
     }
 
-    if (!paymentData?.price) {
-        return reply.status(400).send('price is required');
+    if (!paymentData?.amount) {
+        return reply.status(400).send('amount is required');
     }
 
     // create if not exists, then request to payment service

package/server/routes/liqpay/controllers/liqpay.status.js

@@ -7,6 +7,7 @@
 import pgClients from '../../../plugins/pg/pgClients.js';
 
 import processTransaction from '../../../plugins/payment/processTransaction.js';
+import dataUpdate from '../../../plugins/crud/dataUpdate.js';
 
 // import sendNotification from '../../../utils/sendNotification.js';
 

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

@@ -4,36 +4,31 @@ import pgClients from '../../../plugins/pg/pgClients.js';
 import paymentInfo from '../../../plugins/payment/paymentInfo.js';
 import createTransaction from '../../../plugins/payment/monopay.createTransaction.js';
 
-// http://billing.local.ua/api/monopay-redirect?price=50
+// http://billing.local.ua/api/monopay-redirect?amount=50
 
 export default async function monopayRedirect(req, reply) {
     const {
-        hostname, headers, pg = pgClients.client, query = {}, user = {}, protocol,
+        headers, pg = pgClients.client, query = {}, user = {},
     } = req;
 
     if (!user?.uid) {
         return reply.status(401).send('unauthrized');
     }
 
-    const domain = hostname?.split?.(':')?.shift?.();
-    const rootUrl = `${protocol || 'https'}://${domain}`;
-
     const paymentData = query.id ? await paymentInfo(query.id) : {
-        price: query.price, // price for new transtaction as is, else - preCreated
+        orderId: query.order_id, // order ID, optional
+        amount: query.amount, // amount for new transtaction as is, else - preCreated
         service: 'portmone',
         referer: headers?.referer, // redirect user after finish of transaction
         uid: user.uid, // user id
     };
 
-    // redirect back from payment service to API endpoint, provide protocol + domain
-    Object.assign(paymentData, { rootUrl });
-
     if (query.id && paymentData.status === 'success') {
         return reply.status(400).send('already processed');
     }
 
-    if (!paymentData?.price) {
-        return reply.status(400).send('price is required');
+    if (!paymentData?.amount) {
+        return reply.status(400).send('amount is required');
     }
 
     // create if not exists, then request to payment service

package/server/routes/monopay/index.mjs

@@ -5,7 +5,7 @@ const schema = {
     querystring: {
         type: 'object',
         properties: {
-            price: {
+            amount: {
                 type: 'number',
                 exclusiveMinimum: 0,
             },

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

@@ -11,7 +11,7 @@ import createTransaction from '../../../plugins/payment/portmone.createTransacti
  * @alias PortmonePaymentRedirect
  * @summary redirect на сервіс оплати карткою
  * @type api
- * @param {String} price - Сума поповнення рахунку
+ * @param {String} amount - Сума поповнення рахунку
  * @returns {Number} status - номер помилки. Повертається, якщо була допущенна помилка в отриманих параметрах, або з бази. Це може бути 400 або 500
  * @returns {String} error - опис помилки
  * @returns {String} redirect - шлях до переадресації
@@ -22,31 +22,26 @@ import createTransaction from '../../../plugins/payment/portmone.createTransacti
 
 export default async function portmoneRedirect(req, reply) {
   const {
-    hostname, headers, pg = pgClients.client, user = {}, query = {}, protocol,
+    headers, pg = pgClients.client, user = {}, query = {},
   } = req;
   if (!user?.uid) {
     return reply.status(401).send('unauthrized');
   }
 
-  const domain = hostname?.split?.(':')?.shift?.();
-  const rootUrl = `${protocol || 'https'}://${domain}`;
-
   const paymentData = query.id ? await paymentInfo(query.id) : {
-    price: query.price, // price for new transtaction as is, else - preCreated
+    orderId: query.order_id, // order ID, optional
+    amount: query.amount, // amount for new transtaction as is, else - preCreated
     service: 'portmone',
     referer: headers?.referer, // redirect user after finish of transaction
     uid: user.uid, // user id
   };
 
-  // redirect back from payment service to API endpoint, provide protocol + domain
-  Object.assign(paymentData, { rootUrl });
-
   if (query.id && paymentData.status === 'success') {
     return reply.status(400).send('already processed');
   }
 
-  if (!paymentData?.price) {
-    return reply.status(400).send('price is required');
+  if (!paymentData?.amount) {
+    return reply.status(400).send('amount is required');
   }
 
   // create if not exists, then request to payment service

package/server/routes/portmone/controllers/portmone.status.js

@@ -48,7 +48,7 @@ export default async function portmoneStatus(req, reply) {
 
   const paymentId = body?.shopOrderNumber || params?.id;
 
-  const trx = await processTransaction(paymentId, origin);
+  const trx = await processTransaction(paymentId, { body, origin });
 
   if (!trx) {
     return reply.status(404).send('Transaction not found');