@opengis/pay 1.1.13 → 1.1.14

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.1.14",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",

package/plugin.js

@@ -2,10 +2,11 @@ import fp from 'fastify-plugin';
 
 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';
+import paymentInfo from './server/routes/payment.info.js';
+
+const { prefix = '/api' } = config;
 
 /**
  * This plugins adds some utilities to handle http errors
@@ -25,6 +26,15 @@ async function plugin(app) {
     handler: portmoneRedirect,
   });
 
+  app.route({
+    method: 'GET',
+    url: `${prefix}/payment-info/:id`,
+    config: {
+      policy: ['site'],
+    },
+    handler: paymentInfo,
+  });
+
   app.route({
     method: 'POST',
     url: `${prefix}/portmone/:id/:status`,

package/server/routes/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

@@ -1,7 +1,7 @@
 import request from 'request-promise';
 
 import {
-  config, pgClients, logger, dataInsert, dataUpdate,
+  config, pgClients, logger, dataInsert, dataUpdate, handlebarsSync,
 } from '@opengis/fastify-table/utils.js';
 
 /**
@@ -25,7 +25,7 @@ export default async function PortmoneRedirect(req, reply) {
     pg = pgClients.client, user = {}, query = {}, headers = {},
   } = req;
 
-  const { host, payeeId } = config.integrations?.pay || {};
+  const { host, payeeId, paymentRedirect = config.paymentRedirect } = config.integrations?.pay || {};
   const domain = req.hostname.split(':').shift();
 
   if (!host) {
@@ -63,31 +63,32 @@ export default async function PortmoneRedirect(req, reply) {
     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_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 = {
@@ -107,6 +108,7 @@ export default async function PortmoneRedirect(req, reply) {
     accountId,
     price: paymentAmount,
     domain,
+    paymentRedirectUrl: paymentRedirect ? handlebarsSync.compile(paymentRedirect)({ id: paymentId }) : headers?.referer,
     uid: user?.uid || '0',
   };