@opengis/pay 1.1.13 → 1.2.0

package/module/pay/cls/billing.payment_status.json

@@ -1,17 +1,22 @@
 [
     {
         "id": "inprogress",
-        "text": "Не оплачено",
-        "color": "gray"
+        "text": "В процесі",
+        "color": "blue"
     },
     {
         "id": "success",
         "text": "Оплачено",
         "color": "green"
     },
+    {
+        "id": "unpaid",
+        "text": "Не оплачено",
+        "color": "gray"
+    },
     {
         "id": "error",
-        "text": "Помилка при оплаті",
+        "text": "Помилка оплати",
         "color": "red"
     }
 ]

package/module/pay/select/billing.subscription_id.sql

@@ -0,0 +1 @@
+select subscription_id,coalesce((select name from billing.products where product_id=a.product_id),'')||' '||coalesce(product_plan_type,'')  from billing.subscriptions a

package/module/pay1/cls/billing.payment_status.json

@@ -0,0 +1,22 @@
+[
+    {
+        "id": "inprogress",
+        "text": "В процесі",
+        "color": "blue"
+    },
+    {
+        "id": "success",
+        "text": "Оплачено",
+        "color": "green"
+    },
+    {
+        "id": "unpaid",
+        "text": "Не оплачено",
+        "color": "gray"
+    },
+    {
+        "id": "error",
+        "text": "Помилка оплати",
+        "color": "red"
+    }
+]

package/module/pay1/pt/marketplace-service-payment-client-template.html

@@ -0,0 +1,147 @@
+<div>
+    <br>
+</div>
+<div>
+    <table style="width:100%;">
+        <tbody>
+            <tr>
+                <td style="width:20px;">&nbsp;</td>
+                <td align="center">
+                    <table style="width:100%" bgcolor="#ffffff">
+                        <tbody>
+                            <tr>
+                                <td align="center"><a href="//{{domain}}" class="logo"><img src="https://softpro.ua/tpl/img/logo.svg"/></a>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td style="padding:7px 0" align="center"><span style="color:#555454;font-family:'Open-sans',sans-serif;font-size:small">
+                                    <span style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">{{select account_id data="billing.account_id"}}, дякуємо за здійснення замовлення на порталі <a href="//{{domain}}">{{domain}}</a></span> </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="padding:0">&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td style="box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);padding:7px 0;border-radius:30px">
+                                    <table style="width:100%">
+                                        <tbody>
+                                            <tr >
+                                                <td style="padding:7px 0" width="10">&nbsp;</td>
+                                                <td style="padding:7px 0">
+                                                    <span style="color:#555454;font-family:'Open-sans',sans-serif;font-size:small"> </span>
+                                                    {{#if service_id}}
+                                                        <p style="color:#61677b;border-bottom:1px solid #61677b;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">Послуга: {{service_id_text}}</p>
+                                                    {{/if}}
+                                                    <br>
+                                                    <span style="color:#61677b"><strong>Дата замовлення:</strong> {{formatDate cdate format='dd.mm.yy hh:mi'}}</span>
+                                                    <br>
+                                                    <span style="color:#61677b"><strong>Статус замовлення:</strong> {{select payment_status data="billing.payment_status"}}</span>
+                                                    {{#if withdrawal_sum}}
+                                                        <br>
+                                                        <span style="color:#61677b"><strong>Вартість послуги:</strong> {{num_format withdrawal_sum dec="2"}}</span>
+                                                    {{/if}}
+                                                    {{#if payment_amount}}
+                                                        <br>
+                                                        <span style="color:#61677b"><strong>Поповнення рахунку:</strong> {{num_format payment_amount dec="2"}}</span>
+                                                    {{/if}}  
+                                                    {{#if total_balance}}
+                                                        <br>
+                                                        <span style="color:#61677b"><strong>Поточний баланс:</strong> {{num_format total_balance dec="2"}}</span>
+                                                    {{/if}}
+                                                </td>
+                                                <td style="padding:7px 0" width="10">&nbsp;</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                            
+                            <tr>
+                                <td style="padding:7px 0">
+                                    <span style="color:#555454;font-family:'Open-sans',sans-serif;font-size:small"> </span>
+                                    <table style="width:100%;border-collapse:collapse" bgcolor="#ffffff">
+                                        <tbody>
+                                            <tr>
+                                                <th style="border:1px solid #d6d4d4;background-color:#fbfbfb;color:#61677b;font-family:Arial;font-size:13px;padding:10px" bgcolor="#f8f8f8">Назва послуги</th>
+                                                <th style="border:1px solid #d6d4d4;background-color:#fbfbfb;color:#61677b;font-family:Arial;font-size:13px;padding:10px" bgcolor="#f8f8f8" width="17%">Ціна послуги</th>
+                                            </tr>
+                                                <tr>
+                                                    <td style="border:1px solid #d6d4d4">
+                                                        <table>
+                                                            <tbody>
+                                                                <tr>
+                                                                    <td style="padding: 0 10px">
+                                                                        <font size="2" face="Open-sans, sans-serif" color="#555454"> 
+                                                                            <strong>
+                                                                                {{#if service_id}}
+                                                                                {{service_id_text}}
+                                                                                {{^}}
+                                                                                    Поповнення рахунку
+                                                                                {{/if}}
+                                                                            </strong>
+                                                                        </font>
+                                                                    </td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                    <td style="border:1px solid #d6d4d4">
+                                                        <table>
+                                                            <tbody>
+                                                                <tr>
+                                                                    <td width="10">&nbsp;</td>
+                                                                    <td align="right">
+                                                                        <font size="2" face="Open-sans, sans-serif" color="#555454"> {{num_format (coalesce withdrawal_sum payment_amount)}} грн.</font>
+                                                                    </td>
+                                                                    <td width="10">&nbsp;</td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+
+                                            <tr>
+                                                <td colspan="2" style="border:1px solid #d6d4d4;text-align:center;color:#777;padding:7px 0">&nbsp;&nbsp;</td>
+                                            </tr>
+                                            
+                                            <tr>
+                                                <td colspan="1" style="border:1px solid #d6d4d4;color:#61677b;padding:7px 0" bgcolor="#f8f8f8">
+                                                    <table style="width:100%;border-collapse:collapse">
+                                                        <tbody>
+                                                            <tr>
+                                                                <td style="color:#61677b;padding:0" width="10">&nbsp;</td>
+                                                                <td style="color:#61677b;padding:0" align="right"><span style="color:#555454;font-family:'Open-sans',sans-serif;font-size:small"> <strong>Поточний баланс</strong> </span></td>
+                                                                <td style="color:#61677b;padding:0" width="10">&nbsp;</td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                                <td colspan="1" style="border:1px solid #d6d4d4;color:#61677b;padding:7px 0" bgcolor="#f8f8f8">
+                                                    <table style="width:100%;border-collapse:collapse">
+                                                        <tbody>
+                                                            <tr>
+                                                                <td style="color:#61677b;padding:0" width="10">&nbsp;</td>
+                                                                <td style="color:#61677b;padding:0" align="right"><span style="color:#555454;font-family:'Open-sans',sans-serif;font-size:large">{{total_balance}} грн. </span></td>
+                                                                <td style="color:#61677b;padding:0" width="10">&nbsp;</td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                            
+                            <tr>
+                                <td style="border-top:4px solid #61677b;padding:7px 0"><span><a href="//{{domain}}"><img src="https://softpro.ua/tpl/img/logo.svg"/></a></span></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </td>
+                <td style="width:20px;">&nbsp;</td>
+            </tr>
+        </tbody>
+    </table>
+</div>

package/module/pay1/select/billing.account_id.sql

@@ -0,0 +1 @@
+select account_id, account_name from billing.accounts order by account_name

package/module/pay1/select/billing.service_id.sql

@@ -0,0 +1 @@
+select service_id, service_name from billing.service order by service_name

package/module/pay1/select/billing.subscription_id.sql

@@ -0,0 +1 @@
+select subscription_id,coalesce((select name from billing.products where product_id=a.product_id),'')||' '||coalesce(product_plan_type,'')  from billing.subscriptions a

package/module/pay1/select/billing.user_id.sql

@@ -0,0 +1 @@
+select user_id, user_name || coalesce(login,'') as name from billing.users order by user_name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",
@@ -21,10 +21,11 @@
   },
   "dependencies": {
     "@opengis/admin": "^0.2.14",
-    "@opengis/fastify-table": "^1.1.96",
+    "@opengis/fastify-table": "^1.2.64",
     "cross-env": "^7.0.3",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
+    "liqpayjs-sdk": "^3.3.1",
     "request-promise": "^4.2.6"
   },
   "devDependencies": {

package/plugin.js

@@ -1,12 +1,10 @@
 import fp from 'fastify-plugin';
+import path from 'node:path';
 
 import { config, execMigrations } from '@opengis/fastify-table/utils.js';
 
 const { prefix = '/api' } = config;
 
-import portmoneRedirect from './server/routes/portmone.redirect.js';
-import portmoneStatus from './server/routes/portmone.status.js';
-
 /**
  * This plugins adds some utilities to handle http errors
  *
@@ -15,26 +13,10 @@ import portmoneStatus from './server/routes/portmone.status.js';
 
 async function plugin(app) {
   app.register(import('./server/plugins/cron.js'));
+  app.register(import('./server/routes/portmone/index.mjs'), { prefix });
+  app.register(import('./server/routes/liqpay/index.mjs'), { prefix });
 
-  app.route({
-    method: 'GET',
-    url: `${prefix}/portmone-redirect`,
-    config: {
-      policy: ['site'],
-    },
-    handler: portmoneRedirect,
-  });
-
-  app.route({
-    method: 'POST',
-    url: `${prefix}/portmone/:id/:status`,
-    config: {
-      policy: ['public'],
-    },
-    handler: portmoneStatus,
-  });
-
-  execMigrations().catch(err => console.log(err));
+  execMigrations(path.join(process.cwd(), 'server/migrations')).catch(err => console.log(err));
 }
 
 export default fp(plugin);

package/server/migrations/5_payments.sql

@@ -11,6 +11,7 @@ alter table billing.payments add column if not exists payment_status text NOT NU
 alter table billing.payments add column if not exists success_date timestamp with time zone;
 alter table billing.payments add column if not exists payment_data json;
 alter table billing.payments add column if not exists payment_amount numeric;
+alter table billing.payments add column if not exists payment_service text;
 alter table billing.payments add column if not exists total_balance numeric;
 alter table billing.payments add column if not exists referer_url text;
 alter table billing.payments add column if not exists cdate timestamp without time zone DEFAULT now();
@@ -24,7 +25,8 @@ COMMENT ON COLUMN billing.payments.payment_id IS 'ID';
 COMMENT ON COLUMN billing.payments.account_id IS 'ID акаунту клієнта';
 COMMENT ON COLUMN billing.payments.payment_status IS 'Статус транзації';
 COMMENT ON COLUMN billing.payments.success_date IS 'Дата успішного завершення транзакції';
-COMMENT ON COLUMN billing.payments.payment_data IS 'Дані від portmone';
+COMMENT ON COLUMN billing.payments.payment_data IS 'Дані від сервісу оплати';
+COMMENT ON COLUMN billing.payments.payment_service IS 'Сервіс оплати (portmone, liqpay)';
 COMMENT ON COLUMN billing.payments.payment_amount IS 'Сума поповнення рахунку';
 COMMENT ON COLUMN billing.payments.total_balance IS 'Поточний баланс';
 COMMENT ON COLUMN billing.payments.referer_url IS 'Посилання';

package/server/plugins/cron.js

@@ -1,6 +1,6 @@
 import { addCron, pgClients } from '@opengis/fastify-table/utils.js';
 
-import updateTrxStatus from '../routes/utils/portmone.check.status.js';
+import updateTrxStatus from '../routes/portmone/utils/portmone.check.status.js';
 
 async function updateOldTrxsStatus() {
   const inprogress = pgClients.client.pk?.['billing.payments']
@@ -18,5 +18,5 @@ async function updateOldTrxsStatus() {
 }
 
 export default async function cron() {
-//   addCron(updateOldTrxsStatus, 60 * 60 * 24);
+  //   addCron(updateOldTrxsStatus, 60 * 60 * 24);
 }

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

@@ -0,0 +1,142 @@
+import request from 'request-promise';
+import LiqPay from 'liqpayjs-sdk';
+
+import {
+    config, logger, pgClients, dataInsert, dataUpdate, handlebarsSync,
+} from '@opengis/fastify-table/utils.js';
+
+const { prefix = '/api' } = config;
+
+const { publicKey, privateKey, paymentRedirect } = config.integrations?.liqpay || {};
+const liqpay = new LiqPay(publicKey, privateKey);
+
+const host = 'https://www.liqpay.ua';
+
+export default async function liqpayRedirect(req, reply) {
+    const {
+        pg = pgClients.client, query = {}, user = {}, headers = {},
+    } = req;
+
+    if (!publicKey || !privateKey) {
+        return reply.status(400).send('invalid liqpay integration settings');
+    }
+
+    const domain = req.hostname.split(':').shift();
+
+    const data = query.id ? await pg.query('select payment_id, account_id, payment_amount, payment_status from billing.payments where payment_id=$1', [query.id])
+        .then(el => el.rows?.[0] || {}) : {};
+
+    if (data.payment_status && data.payment_status === 'success') {
+        return { message: 'already processed', status: 400 };
+    }
+
+    const paymentAmount = data.payment_amount || query.price;
+
+    if (!paymentAmount) {
+        return { message: 'price is required', status: 400 };
+    }
+
+    const accountId = data.account_id
+        || (user?.uid ? await pg.query('select account_id from billing.account_user where user_id=$1 limit 1', [user?.uid]).then(el => el.rows?.[0]?.account_id) : null);
+
+    if (!accountId) {
+        return { message: 'account_id is required', status: 400 };
+    }
+
+    const { payment_id: paymentId } = !data.payment_id
+        ? await dataInsert({
+            table: 'billing.payments',
+            data: {
+                payment_amount: paymentAmount,
+                account_id: accountId,
+                payment_service: 'liqpay',
+                payment_status: 'inprogress',
+            },
+            uid: user?.uid || '0',
+        }).then(el => el.rows?.[0] || {})
+        : { payment_id: data.payment_id };
+
+    if (!paymentId) {
+        return { message: 'payment not found', status: 404 };
+    }
+
+    await dataUpdate({
+        table: 'billing.payments',
+        id: paymentId,
+        data: {
+            referer_url: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
+            payment_status: 'inprogress',
+        },
+        uid: user?.uid || '0',
+    });
+
+    const protocol = headers?.referer?.split?.('://')?.shift?.() || req.protocol || 'https';
+    const rootPageUrl = `${protocol || 'https'}://${domain}${config.port ? `:${config.port}` : ''}`;
+
+    const resultUrl = paymentRedirect
+        ? `${rootPageUrl}${handlebarsSync.compile(paymentRedirect)({ id: paymentId })}`
+        : headers?.referer || `${rootPageUrl}`;
+    const serverUrl = `${rootPageUrl}${prefix}/liqpay/${paymentId}/success`;
+
+    const html = liqpay.cnb_form({
+        action: 'pay',
+        amount: paymentAmount,
+        currency: 'UAH',
+        description: 'regular payment',
+        order_id: paymentId,
+        version: '3',
+        server_url: serverUrl, // update payment info - api url
+        result_url: resultUrl, // redirect user after payment - page url
+    });
+
+    const logObj = {
+        type: 'redirect',
+        paymentId,
+        accountId,
+        price: paymentAmount,
+        service: 'liqpay',
+        domain,
+        paymentRedirectUrl: resultUrl,
+        serverUrl,
+        uid: user?.uid || '0',
+    };
+
+    if (config.debug && query?.debug) {
+        return reply.status(302).headers({ 'Content-Type': 'text/html' }).send(html);
+    }
+
+    const body = {
+        data: html.match(/<input type="hidden" name="data" value="([^"]+)"/)?.[1],
+        signature: html.match(/<input type="hidden" name="signature" value="([^"]+)"/)?.[1],
+    };
+
+    try {
+        const response = await request({
+            url: `${host}/api/3/checkout`,
+            method: 'POST',
+            form: body,
+            followAllRedirects: false,
+            jar: true,
+            timeout: 6000,
+            simple: false, // prevent not 2xx code trigger catch
+            resolveWithFullResponse: true,
+        });
+
+        if (response.statusCode !== 302 || !response.headers?.location) {
+            throw new Error(response);
+        }
+
+        if (response.headers?.location?.includes?.('throw_error')) {
+            throw new Error(response.headers?.location);
+        }
+
+        Object.assign(logObj, { paymentId, redirect: response.headers?.location, status: 302 });
+        logger.file('payments', logObj);
+        return reply.redirect(response.headers.location);
+    }
+    catch (err) {
+        Object.assign(logObj, { error: err.toString() });
+        logger.file('payments/error', logObj);
+        return reply.status(500).send(err.toString());
+    }
+}

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

@@ -0,0 +1,168 @@
+import LiqPay from 'liqpayjs-sdk';
+
+import {
+    config, logger, pgClients, dataUpdate, getTemplate,
+} from '@opengis/fastify-table/utils.js';
+
+import { sendNotification } from '@opengis/admin/utils.js';
+
+const newDate = () => {
+    const date = new Date();
+    const tzOffset = date.getTimezoneOffset();
+    const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
+    return new Date(currentTimeWithTimezome).toISOString();
+};
+
+const { publicKey, privateKey } = config.integrations?.liqpay || {};
+const liqpay = new LiqPay(publicKey, privateKey);
+
+/**
+ * Апі перенаправлює з liqpay назад на сторінку замовлення
+ *
+ * @method POST
+ * @alias liqpayStatus
+ * @summary redirect з liqpay на сторінку замовлення
+ * @type api
+ * @param {String} paymentId - Ідентифікатор замовлення
+ * @param {String} refillSum - Сума поповнення рахунку
+ * @returns {Number} status - номер помилки. Повертається, якщо була допущенна помилка в отриманих параметрах, або з бази. Це може бути 400 або 500
+ * @returns {String} error - опис помилки
+ * @returns {String} redirect - шлях до переадресації
+ * @returns {String} message - повідомлення про успішне виконання і передача певних даних або помилку
+ * @returns {String} headers - заголовки HTTP
+ * @returns {String} file - шлях файла або його назва
+ */
+
+export default async function liqpayStatus(req, reply) {
+    const {
+        pg = pgClients.client, params = {}, headers = {}, body = {}, user = {}, unittest,
+    } = req;
+
+    if (!publicKey || !privateKey) {
+        return reply.status(400).send('invalid liqpay integration settings');
+    }
+
+    if (!body?.data || !body?.signature) {
+        return reply.status(400).send('not enough body params: data, signature');
+    }
+
+    const sign = liqpay.str_to_sign(
+        privateKey
+        + body.data
+        + privateKey,
+    );
+
+    const origin = headers?.origin || headers?.referer;
+    const { status: responseStatus, id: paymentId } = params;
+
+    if (body.signature !== sign) {
+        logger.file('payments/warn', {
+            type: 'status',
+            service: 'liqpay',
+            paymentId,
+            origin,
+            uid: user?.uid || '0',
+            message: 'Transaction signature does not match',
+        });
+        return reply.status(403).send('access restricted: signature mismatch');
+    }
+
+    const data = await pg.query('select * from billing.payments where payment_id=$1', [paymentId])
+        .then(el => el.rows?.[0] || {});
+
+    const {
+        payment_id: trx,
+        payment_amount: refillSum = 0,
+        referer_url: redirectUrl,
+        payment_status: trxStatus,
+        payment_service: paymentService,
+        account_id: accountId,
+    } = data;
+
+    if (trxStatus === 'success') {
+        logger.file('payments/skip', {
+            type: 'status',
+            service: 'liqpay',
+            paymentId,
+            origin,
+            uid: user?.uid || '0',
+            message: 'Transaction was already processed',
+        });
+        return reply.status(400).send('Transaction was already processed');
+    }
+
+    if (!trx) {
+        return reply.status(404).send('Transaction not found');
+    }
+
+    if (paymentService !== 'liqpay') {
+        return reply.status(400).send('Payment not registered via liqpay service');
+    }
+
+    logger.file('payments', {
+        type: 'status',
+        service: 'liqpay',
+        paymentId,
+        origin,
+        uid: user?.uid || '0',
+        refill: refillSum,
+        body,
+        params,
+    });
+
+    // last trx contains total balance
+    const { total_balance: totalBalance = 0 } = await pg.query(`select total_balance from billing.payments 
+    where account_id=$1
+    and payment_status in ('success', 'error')
+    and total_balance is not null
+    order by cdate desc limit 1`, [accountId]).then(el => el.rows?.[0] || {});
+
+    await dataUpdate({
+        table: 'billing.payments',
+        data: {
+            payment_data: body,
+            payment_status: responseStatus,
+            total_balance: +refillSum + +totalBalance,
+            success_date: newDate(),
+        },
+        id: paymentId,
+        uid: user?.uid || '0',
+    });
+
+    if (unittest) {
+        console.log(`id:${trx}, status: ${responseStatus}, before: ${totalBalance || 0}, after: ${+refillSum + +totalBalance} (${refillSum})`);
+    }
+
+    const { account_email: to } = await pg.query('select account_email from billing.accounts where account_id=$1', [accountId])
+        .then(el => el.rows?.[0] || {});
+
+    logger.file('payments', {
+        type: 'status',
+        service: 'liqpay',
+        paymentId,
+        responseStatus,
+        to,
+        origin,
+        redirect: redirectUrl,
+        uid: user.uid || '0',
+    });
+
+    Object.assign(data, {
+        domain: req.hostname,
+        total_balance: +refillSum + +totalBalance,
+    });
+
+    if (to) {
+        const pt = await getTemplate('pt', 'marketplace-service-payment-client-template');
+        const options = {
+            pg,
+            to,
+            title: `Поповнення рахунку на порталі ${req.hostname}`,
+            template: pt?.html || pt,
+            data,
+            nocache: config?.local,
+        };
+        await sendNotification(options);
+    }
+    return reply.redirect(redirectUrl || '/');
+}

package/server/routes/liqpay/index.mjs

@@ -0,0 +1,22 @@
+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,
+    });
+}

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

@@ -0,0 +1,45 @@
+import { metaFormat, pgClients } from '@opengis/fastify-table/utils.js';
+
+/**
+ * Апі для отримання інформації за ID
+ *
+ * @method GET
+ * @alias paymentInfo
+ * @type api
+ * @param {String} params.id - ID платежу
+ * @returns {Number} status - номер помилки. Повертається, якщо була допущенна помилка в отриманих параметрах, або з бази. Це може бути 400 або 500
+ * @returns {String} error - опис помилки
+ * @returns {String} message - повідомлення про успішне виконання і передача певних даних або помилку
+ */
+
+export default async function paymentInfo({
+  pg = pgClients.client, user = {}, params = {},
+}) {
+  if (!user?.uid) {
+    return { message: 'unauthorized', status: 401 };
+  }
+
+  if (!params?.id) {
+    return { message: 'not enough query params: id', status: 400 };
+  }
+
+  const { rows = [] } = await pg.query(`select 
+    payment_id,
+    account_id,
+    payment_amount,
+    payment_status,
+    total_balance,
+    payment_num,
+    subscription_id
+  from billing.payments
+  where payment_id = $1
+  and   account_id in (select account_id from billing.account_user where user_id = $2)`, [params.id, user.uid]);
+
+  if (!rows.length) {
+    return { message: 'payment not found', status: 404 };
+  }
+
+  await metaFormat({ rows, cls: { account_id: 'billing.account_id', payment_status: 'billing.payment_status', subscription_id: 'billing.subscription_id' } });
+
+  return rows[0];
+}

package/server/routes/{portmone.redirect.js → portmone/controllers/portmone.redirect.js}

@@ -1,9 +1,11 @@
 import request from 'request-promise';
 
 import {
-  config, pgClients, logger, dataInsert, dataUpdate,
+  config, pgClients, logger, dataInsert, dataUpdate, handlebarsSync,
 } from '@opengis/fastify-table/utils.js';
 
+const { host, payeeId, paymentRedirect = config.paymentRedirect } = config.integrations?.pay || {};
+
 /**
  * Апі перенаправлює до стороннього сервісу оплати карткою онлайн
  *
@@ -25,9 +27,6 @@ export default async function PortmoneRedirect(req, reply) {
     pg = pgClients.client, user = {}, query = {}, headers = {},
   } = req;
 
-  const { host, payeeId } = config.integrations?.pay || {};
-  const domain = req.hostname.split(':').shift();
-
   if (!host) {
     return { message: 'empty integration host', status: 400 };
   }
@@ -36,6 +35,8 @@ export default async function PortmoneRedirect(req, reply) {
     return { message: 'empty integration payeeId', status: 400 };
   }
 
+  const domain = req.hostname.split(':').shift();
+
   const data = query.id ? await pg.query('select payment_id, account_id, payment_amount, payment_status from billing.payments where payment_id=$1', [query.id])
     .then(el => el.rows?.[0] || {}) : {};
 
@@ -58,36 +59,38 @@ export default async function PortmoneRedirect(req, reply) {
 
   if ((!headers?.referer || !headers.referer.includes(domain))) {
     logger.file('payments/warn', {
-      message: 'invalid referer', domain, referer: headers?.referer, uid: user?.uid,
+      message: 'invalid referer', service: 'portmone', domain, referer: headers?.referer, uid: user?.uid,
     });
     if (!config.auth?.disableRestricted) return { message: 'access restricted: referer', status: 403 };
   }
 
-  const { payment_id: paymentId } = data.payment_id
-    ? await dataUpdate({
-      table: 'billing.payments',
-      id: data.payment_id,
-      data: {
-        referer_url: headers?.referer,
-        payment_status: 'inprogress',
-      },
-      uid: user?.uid || '0',
-    })
-    : await dataInsert({
+  const { payment_id: paymentId } = !data.payment_id
+    ? await dataInsert({
       table: 'billing.payments',
       data: {
         payment_amount: paymentAmount,
         account_id: accountId,
-        referer_url: headers?.referer,
+        payment_service: 'portmone',
         payment_status: 'inprogress',
       },
       uid: user?.uid || '0',
-    }).then(el => el.rows?.[0] || {});
+    }).then(el => el.rows?.[0] || {})
+    : { payment_id: data.payment_id };
 
   if (!paymentId) {
     return { message: 'payment not found', status: 404 };
   }
 
+  await dataUpdate({
+    table: 'billing.payments',
+    id: paymentId,
+    data: {
+      referer_url: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
+      payment_status: 'inprogress',
+    },
+    uid: user?.uid || '0',
+  });
+
   const protocol = headers?.referer.split('://').shift();
 
   const formData = {
@@ -102,11 +105,13 @@ export default async function PortmoneRedirect(req, reply) {
 
   const logObj = {
     type: 'redirect',
+    service: 'portmone',
     payeeId,
     paymentId,
     accountId,
     price: paymentAmount,
     domain,
+    paymentRedirectUrl: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
     uid: user?.uid || '0',
   };
 

package/server/routes/{portmone.status.js → portmone/controllers/portmone.status.js}

@@ -4,6 +4,15 @@ import {
 
 import { sendNotification } from '@opengis/admin/utils.js';
 
+const newDate = () => {
+  const date = new Date();
+  const tzOffset = date.getTimezoneOffset();
+  const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
+  return new Date(currentTimeWithTimezome).toISOString();
+};
+
+const { host } = config.integrations?.pay || {};
+
 /**
  * Апі перенаправлює з portmone назад на сторінку замовлення
  *
@@ -25,7 +34,6 @@ export default async function portmoneStatus(req, reply) {
   const {
     pg = pgClients.client, params = {}, headers = {}, body = {}, user = {}, unittest,
   } = req;
-  const { host } = config.integrations?.pay || {};
 
   if (!host) {
     return { message: 'empty integration host', status: 400 };
@@ -50,6 +58,7 @@ export default async function portmoneStatus(req, reply) {
     if (trxStatus === 'success') {
       logger.file('payments/skip', {
         type: 'status',
+        service: 'portmone',
         paymentId,
         origin,
         uid: user?.uid || '0',
@@ -68,6 +77,7 @@ export default async function portmoneStatus(req, reply) {
     if (!origin?.startsWith(host)) {
       logger.file('payments/warn', {
         type: 'status',
+        service: 'portmone',
         paymentId,
         origin,
         uid: user?.uid || '0',
@@ -79,6 +89,7 @@ export default async function portmoneStatus(req, reply) {
 
     logger.file('payments', {
       type: 'status',
+      service: 'portmone',
       paymentId,
       origin,
       uid: user?.uid || '0',
@@ -98,7 +109,7 @@ export default async function portmoneStatus(req, reply) {
         payment_data: body,
         payment_status: responseStatus,
         total_balance: +(refill) + (+totalBalance || 0),
-        success_date: new Date(),
+        success_date: newDate(),
       },
       id: paymentId,
       uid: user?.uid || '0',
@@ -113,6 +124,7 @@ export default async function portmoneStatus(req, reply) {
 
     logger.file('payments', {
       type: 'status',
+      service: 'portmone',
       paymentId,
       responseStatus,
       to,
@@ -143,12 +155,13 @@ export default async function portmoneStatus(req, reply) {
   catch (err) {
     logger.file('payments/error', {
       type: 'status',
+      service: 'portmone',
       paymentId,
       origin,
       responseStatus,
       uid: user?.uid || '0',
       error: err.toString(),
     });
-    return { error: err.toString(), status: 500 };
+    return reply.status(500).send(err.toString());
   }
 }

package/server/routes/portmone/index.mjs

@@ -0,0 +1,30 @@
+import portmoneRedirect from './controllers/portmone.redirect.js';
+import portmoneStatus from './controllers/portmone.status.js';
+import paymentInfo from './controllers/payment.info.js';
+
+export default async function plugin(app, opts) {
+    app.route({
+        method: 'GET',
+        url: '/portmone-redirect',
+        config: {
+            policy: ['site'],
+        },
+        handler: portmoneRedirect,
+    });
+    app.route({
+        method: 'GET',
+        url: '/payment-info/:id',
+        config: {
+            policy: ['site'],
+        },
+        handler: paymentInfo,
+    });
+    app.route({
+        method: 'POST',
+        url: '/portmone/:id/:status',
+        config: {
+            policy: ['public'],
+        },
+        handler: portmoneStatus,
+    });
+}