@opengis/pay 1.2.2 → 1.3.0

package/server/utils/migration/exec.sql.js

@@ -0,0 +1,48 @@
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
+
+import config from '../../../config.js';
+
+import pgClients from '../../plugins/pg/pgClients.js';
+import getRedis from '../../plugins/redis/funcs/getRedis.js';
+
+const rclient = getRedis();
+
+export default async function execSql(filepath, pg = pgClients.client) {
+    const start = Date.now();
+
+    if (!pg || !filepath) {
+        console.warn('skip migration execution: pg / redis connection / filepath not provided');
+        return null;
+    }
+
+    const filename = path.basename(filepath);
+
+    if (!existsSync(filepath)) {
+        console.warn('migration not found', filepath, Date.now() - start);
+        return null;
+    }
+
+    const sql = readFileSync(filepath, 'utf-8');
+
+    const hash = createHash('md5').update(sql).digest('hex');
+    const hashes = config.redis ? await rclient.hgetall(`${pg.options?.database}:migration-hashes`).then(obj => Object.keys(obj)) : [];
+
+    if (hashes.includes(hash) && !config.disableCache) {
+        console.log(filename, 'skip equal hash', Date.now() - start);
+        return null;
+    }
+
+    try {
+        console.log(filename, 'start', Date.now() - start);
+        await pg.query(sql);
+        if (!config.disableCache && config.redis) await rclient.hset(`${pg.options?.database}:migration-hashes`, hash, 1);
+        console.log('migration success', filepath, Date.now() - start);
+        return 'ok';
+    }
+    catch (err) {
+        console.log('migration error', filepath, err.toString(), Date.now() - start);
+        return err.toString();
+    }
+}

package/server/utils/sendNotification.js

@@ -0,0 +1,69 @@
+import nodemailer from 'nodemailer';
+
+import config from '../../config.js';
+import getRedis from '../plugins/redis/funcs/getRedis.js';
+
+const rclient = getRedis();
+const { mailSetting = {} } = config;
+mailSetting.rejectUnauthorized = false;
+
+if (mailSetting.port === 465) {
+  mailSetting.secure = true;
+}
+
+const transport = nodemailer.createTransport(mailSetting);
+
+// eslint-disable-next-line max-len, no-control-regex
+const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+
+export default async function notification({
+  from,
+  to = [],
+  pt,
+  message,
+  title,
+  nocache,
+}, unittest) {
+  if (!mailSetting.service) {
+    console.warn('notification/skip', to, from, 'mail service is not defined in config');
+    return null;
+  }
+
+  if (!to?.length) {
+    console.warn('notification/skip', 'no recipients', to, from, pt, message, title);
+    return null;
+  }
+
+  if (!message && !pt) {
+    console.warn('notification/skip', 'empty message / pt', to, from, pt, message, title);
+    return null;
+  }
+
+  const keyTo = `pay:mail:email:${to || ''}${message || pt || ''}${title || ''}`;
+  const uniqueTo = config.redis ? await rclient.setnx(keyTo, 1) : true;
+
+  if (!uniqueTo && !nocache) {
+    console.warn('notification/skip', 'already sent', keyTo, uniqueTo);
+    return { message: `already sent: ${keyTo}`, status: 400 };
+  }
+
+  if (config.redis) {
+    await rclient.expire(keyTo, 1000 * 600);
+  }
+
+  const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+  const result = await transport.sendMail({
+    from,
+    to: unittest && config.mailSetting?.to ? config.mailSetting?.to : toEmail,
+    subject: title,
+    html: pt || message || '',
+    attachments: [],
+  });
+
+  if (config.trace) {
+    console.log('sendMail result', result);
+  }
+
+  return result;
+}

package/module/pay1/card/billing.accounts.table/general_info.hbs

@@ -1,11 +0,0 @@
-{{{descriptionList this columns="Назва,account_name,ЄДРПОУ,account_edrpou,Email,account_email,On/Off,enabled"}}}
-
-<style>
-    .label {
-        display: inline-block;
-        padding: 4px 8px;
-        border-radius: 5px;
-        font-size: 12px;
-        font-weight: bold;
-    }
-</style>

package/module/pay1/card/billing.accounts.table/index.yml

@@ -1,15 +0,0 @@
-component: default
-# title: Мій підпис
-tokens:
-  id: { id: "{{id}}" }
-panels:
-  - type: container
-    col: 4
-    items:
-      - name: general_info
-        title: Загальна інформація
-  - type: container
-    col: 8
-    items:
-      - name: users
-        title: Користувачі

package/module/pay1/card/billing.accounts.table/users.hbs

@@ -1,12 +0,0 @@
-
-{{#contentList table="(select users.user_id, user_name || coalesce(login,'') as name, au_id, account_id from billing.users left join ( SELECT user_id, au_id, account_id FROM billing.account_user )r on users.user_id=r.user_id)q" query="account_id='{{id}}'" limit="50" sql1=1}}
-{{{button this token=(token table="billing.account_user" obj=(concat 'account_id=' @root.id) form="billing.account_user.form") title="Додати"}}}
-
-{{{tableList rows table='billing.account_user' id='au_id' form="billing.account_user.form" uid=../user.uid
-    nodata='<div class="bg-gray-200 text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>'
-    comma=";" 
-    columns="Користувач,<a href='/card/billing.users.table/{{user_id}}'>{{name}}</a>"
-}}}
-
-
-{{/contentList}}

package/module/pay1/card/billing.payments.table/general_info.hbs

@@ -1,13 +0,0 @@
-
-
-{{{descriptionList this columns="Організація,account_id,Сума,payment_amount,Статус,payment_status,Дії,<a class=\"inline-flex items-center px-3 py-2 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white\" href=\"/api/portmone-redirect?id={{id}}\">Оплатити</a>"}}}
-
-<style>
-    .label {
-        display: inline-block;
-        padding: 4px 8px;
-        border-radius: 5px;
-        font-size: 12px;
-        font-weight: bold;
-    }
-</style>

package/module/pay1/card/billing.payments.table/index.yml

@@ -1,10 +0,0 @@
-component: default
-# title: Мій підпис
-tokens:
-  id: { id: "{{id}}" }
-panels:
-  - type: container
-    col: 12
-    items:
-      - name: general_info
-        title: Загальна інформація

package/module/pay1/card/billing.users.table/general_info.hbs

@@ -1,11 +0,0 @@
-{{{descriptionList this columns="Прізвище,sur_name,Ім'я,user_name,Email,email,On/Off,enabled"}}}
-
-<style>
-    .label {
-        display: inline-block;
-        padding: 4px 8px;
-        border-radius: 5px;
-        font-size: 12px;
-        font-weight: bold;
-    }
-</style>

package/module/pay1/card/billing.users.table/index.yml

@@ -1,10 +0,0 @@
-component: default
-# title: Мій підпис
-tokens:
-  id: { id: "{{id}}" }
-panels:
-  - type: container
-    col: 12
-    items:
-      - name: general_info
-        title: Загальна інформація

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

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

package/module/pay1/form/billing.account_user.form.json

@@ -1,15 +0,0 @@
-{
-    "schema": {
-        "user_id": {
-            "type": "Autocomplete",
-            "data": "billing.user_id",
-            "ua": "Користувач",
-            "validators": [
-                "required"
-            ]
-        }
-    },
-    "style": {
-        "label": "vertical"
-    }
-}

package/module/pay1/form/billing.accounts.form.json

@@ -1,31 +0,0 @@
-{
-    "schema": {
-        "account_name": {
-            "type": "Text",
-            "ua": "Назва організації",
-            "validators": [
-                "required"
-            ]
-        },
-        "account_edrpou": {
-            "type": "Text",
-            "ua": "ЄДРПОУ"
-        },
-        "account_email": {
-            "type": "Text",
-            "ua": "Пошта організації",
-            "i": "Повідомлення про статус платежів будуть надіслані на дану ел. адресу", 
-            "validators": [
-                "required"
-            ]
-        },
-        "enabled": {
-            "type": "Switcher",
-            "default": true,
-            "ua": "On / Off"
-        }
-    },
-    "style": {
-        "label": "vertical"
-    }
-}

package/module/pay1/form/billing.payment.form.json

@@ -1,23 +0,0 @@
-{
-    "schema": {
-        "payment_amount": {
-            "type": "Number",
-            "min": 0,
-            "ua": "Сума платежу",
-            "validators": [
-                "required"
-            ]
-        },
-        "account_id": {
-            "type": "Autocomplete",
-            "data": "billing.account_id",
-            "ua": "Назва організації",
-            "validators": [
-                "required"
-            ]
-        }
-    },
-    "style": {
-        "label": "vertical"
-    }
-}

package/module/pay1/form/billing.users.form.json

@@ -1,39 +0,0 @@
-{
-    "schema": {
-        "sur_name": {
-            "type": "Text",
-            "ua": "Прізвище",
-            "validators": [
-                "required"
-            ]
-        },
-        "user_name": {
-            "type": "Text",
-            "ua": "Ім'я",
-            "validators": [
-                "required"
-            ]
-        },
-        "father_name": {
-            "type": "Text",
-            "ua": "По-батькові"
-        },
-        "email": {
-            "type": "Text",
-            "ua": "Email"
-        },
-        "phone": {
-            "type": "MarkedText",
-            "mask": "+389999999999",
-            "ua": "Номер телефону"
-        },
-        "enabled": {
-            "type": "Switcher",
-            "default": true,
-            "ua": "On / Off"
-        }
-    },
-    "style": {
-        "label": "vertical"
-    }
-}

package/module/pay1/menu.json

@@ -1,24 +0,0 @@
-[
-    {
-        "ua": "Платежі / Payments",
-        "menu": [
-            {
-                "ua": "Реєстр платежів",
-                "table": "billing.payments.table",
-                "path": "billing.payments"
-            },
-            {
-                "ua": "Реєстр організацій",
-                "table": "billing.accounts.table",
-                "path": "billing.accounts"
-            },
-            {
-                "ua": "Реєстр користувачів",
-                "table": "billing.users.table",
-                "path": "billing.users"
-            }
-        ]
-    }
-]
-
-

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

@@ -1,147 +0,0 @@
-<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

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

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

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

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

@@ -1 +0,0 @@
-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

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

package/module/pay1/table/billing.accounts.table.json

@@ -1,61 +0,0 @@
-{
-    "key": "account_id",
-    "table": "billing.accounts",
-    "order": "cdate desc",
-    "form": "billing.accounts.form",
-    "title_column": "account_name",
-    "title_full": {
-        "ua": "Реєстр організацій"
-    },
-    "actions": [
-        "add",
-        "edit",
-        "del"
-    ],
-    "columns": [
-        {
-            "name": "account_name",
-            "format": "text",
-            "title": "Назва організації"
-        },
-        {
-            "name": "account_edrpou",
-            "format": "text",
-            "title": "ЄДРПОУ"
-        },
-        {
-            "name": "account_email",
-            "format": "text",
-            "title": "Email"
-        },
-        {
-            "name": "enabled",
-            "hidden": true,
-            "format": "yes/no",
-            "title": "On / off"
-        }
-    ],
-    "filter_list": [
-        {
-            "name": "account_name",
-            "type": "Text",
-            "ua": "Назва організації"
-        },
-        {
-            "name": "account_edrpou",
-            "type": "Text",
-            "ua": "ЄДРПОУ"
-        },
-        {
-            "name": "account_email",
-            "type": "Text",
-            "ua": "Email"
-        },
-        {
-            "name": "enabled",
-            "type": "Check",
-            "data": "yes_no",
-            "ua": "On / off"
-        }
-    ]
-}