@opengis/pay 1.1.11 → 1.1.13

package/module/pay/table/billing.payments.table.json

@@ -1,68 +1,68 @@
-{
-    "key": "payment_id",
-    "table": "billing.payments",
-    "order": "cdate desc",
-    "title_column": "account_id",
-    "form": "billing.payment.form",
-    "title_full": {
-        "ua": "Реєстр платежів"
-    },
-    "actions": [
-        "add",
-        "edit",
-        "del"
-    ],
-    "columns": [
-        {
-            "name": "account_id",
-            "data": "billing.account_id",
-            "format": "select",
-            "ua": "Назва організації"
-        },
-        {
-            "name": "payment_amount",
-            "format": "text",
-            "ua": "Сума поповнення рахунку"
-        },
-        {
-            "name": "total_balance",
-            "format": "text",
-            "ua": "Поточний баланс"
-        },
-        {
-            "name": "payment_status",
-            "data": "billing.payment_status",
-            "format": "badge",
-            "ua": "Статус транзації"
-        },
-        {
-            "name": "success_date",
-            "format": "date",
-            "ua": "Дата успішного завершення транзакції"
-        }
-    ],
-    "filter_list": [
-        {
-            "name": "account_id",
-            "data": "billing.account_id",
-            "type": "Text",
-            "ua": "Назва організації"
-        },
-        {
-            "name": "payment_amount",
-            "type": "Range",
-            "ua": "Сума поповнення рахунку"
-        },
-        {
-            "name": "payment_status",
-            "data": "billing.payment_status",
-            "type": "Check",
-            "ua": "Статус транзації"
-        },
-        {
-            "name": "success_date",
-            "type": "Date",
-            "ua": "Дата успішного завершення транзакції"
-        }
-    ]
+{
+    "key": "payment_id",
+    "table": "billing.payments",
+    "order": "cdate desc",
+    "title_column": "account_id",
+    "form": "billing.payment.form",
+    "title_full": {
+        "ua": "Реєстр платежів"
+    },
+    "actions": [
+        "add",
+        "edit",
+        "del"
+    ],
+    "columns": [
+        {
+            "name": "account_id",
+            "data": "billing.account_id",
+            "format": "select",
+            "ua": "Назва організації"
+        },
+        {
+            "name": "payment_amount",
+            "format": "text",
+            "ua": "Сума поповнення рахунку"
+        },
+        {
+            "name": "total_balance",
+            "format": "text",
+            "ua": "Поточний баланс"
+        },
+        {
+            "name": "payment_status",
+            "data": "billing.payment_status",
+            "format": "badge",
+            "ua": "Статус транзації"
+        },
+        {
+            "name": "success_date",
+            "format": "date",
+            "ua": "Дата успішного завершення транзакції"
+        }
+    ],
+    "filter_list": [
+        {
+            "name": "account_id",
+            "data": "billing.account_id",
+            "type": "Text",
+            "ua": "Назва організації"
+        },
+        {
+            "name": "payment_amount",
+            "type": "Range",
+            "ua": "Сума поповнення рахунку"
+        },
+        {
+            "name": "payment_status",
+            "data": "billing.payment_status",
+            "type": "Check",
+            "ua": "Статус транзації"
+        },
+        {
+            "name": "success_date",
+            "type": "Date",
+            "ua": "Дата успішного завершення транзакції"
+        }
+    ]
 }

package/module/pay/table/billing.users.table.json

@@ -1,71 +1,71 @@
-{
-    "key": "user_id",
-    "table": "billing.users",
-    "order": "cdate desc",
-    "form": "billing.users.form",
-    "title_column": "user_name",
-    "title_full": {
-        "ua": "Реєстр користувачів"
-    },
-    "actions": [
-        "add",
-        "edit",
-        "del"
-    ],
-    "columns": [
-        {
-            "name": "user_name",
-            "format": "text",
-            "title": "Ім'я"
-        },
-        {
-            "name": "sur_name",
-            "format": "text",
-            "title": "Прізвище"
-        },
-        {
-            "name": "father_name",
-            "format": "text",
-            "title": "По-батькові"
-        },
-        {
-            "name": "email",
-            "format": "text",
-            "title": "Email"
-        },
-        {
-            "name": "enabled",
-            "hidden": true,
-            "format": "yes/no",
-            "title": "On / off"
-        }
-    ],
-    "filter_list": [
-        {
-            "name": "user_name",
-            "type": "Text",
-            "ua": "Ім'я користувача"
-        },
-        {
-            "name": "sur_name",
-            "type": "Text",
-            "ua": "Прізвище користувача"
-        },
-        {
-            "name": "father_name",
-            "type": "Text",
-            "ua": "По-батькові користувача"
-        },
-        {
-            "name": "email",
-            "type": "Text",
-            "ua": "Email"
-        },
-        {
-            "name": "enabled",
-            "type": "Check",
-            "data": "yes_no",
-            "ua": "On / off"
-        }
-    ]
+{
+    "key": "user_id",
+    "table": "billing.users",
+    "order": "cdate desc",
+    "form": "billing.users.form",
+    "title_column": "user_name",
+    "title_full": {
+        "ua": "Реєстр користувачів"
+    },
+    "actions": [
+        "add",
+        "edit",
+        "del"
+    ],
+    "columns": [
+        {
+            "name": "user_name",
+            "format": "text",
+            "title": "Ім'я"
+        },
+        {
+            "name": "sur_name",
+            "format": "text",
+            "title": "Прізвище"
+        },
+        {
+            "name": "father_name",
+            "format": "text",
+            "title": "По-батькові"
+        },
+        {
+            "name": "email",
+            "format": "text",
+            "title": "Email"
+        },
+        {
+            "name": "enabled",
+            "hidden": true,
+            "format": "yes/no",
+            "title": "On / off"
+        }
+    ],
+    "filter_list": [
+        {
+            "name": "user_name",
+            "type": "Text",
+            "ua": "Ім'я користувача"
+        },
+        {
+            "name": "sur_name",
+            "type": "Text",
+            "ua": "Прізвище користувача"
+        },
+        {
+            "name": "father_name",
+            "type": "Text",
+            "ua": "По-батькові користувача"
+        },
+        {
+            "name": "email",
+            "type": "Text",
+            "ua": "Email"
+        },
+        {
+            "name": "enabled",
+            "type": "Check",
+            "data": "yes_no",
+            "ua": "On / off"
+        }
+    ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",
@@ -48,4 +48,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/plugin.js

@@ -14,11 +14,17 @@ import portmoneStatus from './server/routes/portmone.status.js';
  */
 
 async function plugin(app) {
+  app.register(import('./server/plugins/cron.js'));
+
   app.route({
     method: 'GET',
     url: `${prefix}/portmone-redirect`,
+    config: {
+      policy: ['site'],
+    },
     handler: portmoneRedirect,
   });
+
   app.route({
     method: 'POST',
     url: `${prefix}/portmone/:id/:status`,

package/server/migrations/1_users.sql

@@ -1,121 +1,121 @@
-create schema if not exists billing;
-
-CREATE TABLE if not exists billing.users();
-ALTER TABLE billing.users DROP CONSTRAINT if exists billing_user_id_pkey cascade;
-
-ALTER TABLE billing.users add column if not exists user_id text NOT NULL DEFAULT next_id();
-ALTER TABLE billing.users add column if not exists login text;
-ALTER TABLE billing.users add column if not exists password text NOT NULL DEFAULT ''::text;
-ALTER TABLE billing.users add column if not exists user_name text;
-ALTER TABLE billing.users add column if not exists sur_name text;
-ALTER TABLE billing.users add column if not exists father_name text;
-ALTER TABLE billing.users add column if not exists email text;
-ALTER TABLE billing.users add column if not exists phone text;
-ALTER TABLE billing.users add column if not exists avatar text;
-ALTER TABLE billing.users add column if not exists enabled boolean;
-ALTER TABLE billing.users add column if not exists user_personal_code text;
-ALTER TABLE billing.users add column if not exists last_activity_date timestamp without time zone;
-ALTER TABLE billing.users add column if not exists user_type text DEFAULT 'regular'::text;
-ALTER TABLE billing.users add column if not exists salt text;
-ALTER TABLE billing.users add column if not exists uid text;
-ALTER TABLE billing.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.users add column if not exists editor_id text;
-ALTER TABLE billing.users add column if not exists editor_date timestamp without time zone;
-ALTER TABLE billing.users add column if not exists files json;
-
-COMMENT ON TABLE billing.users IS 'Користувачі';
-
-COMMENT ON COLUMN billing.users.user_id IS 'ID користувача';
-COMMENT ON COLUMN billing.users.login IS 'Логін користувача';
-COMMENT ON COLUMN billing.users.password IS 'Пароль користувача';
-COMMENT ON COLUMN billing.users.user_name IS 'Ім''я користувача';
-COMMENT ON COLUMN billing.users.sur_name IS 'Прізвище користувача';
-COMMENT ON COLUMN billing.users.father_name IS 'По-батькові користувача';
-COMMENT ON COLUMN billing.users.email IS 'Ел. пошта користувача';
-COMMENT ON COLUMN billing.users.phone IS 'Номер телефону користувача';
-COMMENT ON COLUMN billing.users.avatar IS 'Аватар';
-COMMENT ON COLUMN billing.users.enabled IS 'On / Off';
-COMMENT ON COLUMN billing.users.last_activity_date IS 'Дата останньої активності';
-COMMENT ON COLUMN billing.users.user_type IS 'Тип користувача';
-COMMENT ON COLUMN billing.users.salt IS 'Сіль';
-
-CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
-CREATE OR REPLACE FUNCTION billing.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
-
-CREATE OR REPLACE FUNCTION billing.insert_update_user_before()
-RETURNS trigger AS
-
-$BODY$
-DECLARE 
-
-iterations  int;
-hash character varying;
-
-BEGIN
-
- if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
-	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
-		--raise exception 'password must be longer than 8 characters';
-	end if;
-	new.salt=md5(now()::text);
-	--raise exception '%','change pass';
-	if(new.salt ='') then
-		new.salt=gen_salt('md5');	
-	end if;	
-	iterations = 10;
-	hash=''; 
-	
-	loop   		
-		if iterations=0 then
-			exit;
-		end if;
-		hash = md5(new.password||hash||new.salt);
-		iterations=iterations-1;
-	end loop;
-	new.password=billing.crypt(hash,new.salt);
-	
- end if;
- RETURN new;
-END
-$BODY$
-
-LANGUAGE plpgsql VOLATILE COST 100;
-  
-DROP TRIGGER if exists insert_update_user_before on billing.users;
-CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON billing.users FOR EACH ROW 
-EXECUTE PROCEDURE billing.insert_update_user_before();
-
-CREATE TABLE if not exists billing.users_social_auth();
-ALTER TABLE billing.users_social_auth DROP CONSTRAINT if exists billing_users_social_auth_usa_id_pkey cascade;
-ALTER TABLE billing.users_social_auth DROP CONSTRAINT if exists billing_users_social_auth_user_id_fkey cascade;
-
-CREATE TABLE if not exists billing.users_social_auth();
-ALTER TABLE billing.users_social_auth add column if not exists usa_id text NOT NULL DEFAULT next_id();
-ALTER TABLE billing.users_social_auth add column if not exists user_id text;
-ALTER TABLE billing.users_social_auth add column if not exists user_name text;
-ALTER TABLE billing.users_social_auth add column if not exists sur_name text;
-ALTER TABLE billing.users_social_auth add column if not exists email text;
-ALTER TABLE billing.users_social_auth add column if not exists city text;
-ALTER TABLE billing.users_social_auth add column if not exists phone text;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_id text;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_type text;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_code text;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_obj json;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_date timestamp without time zone;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_softpro_code text;
-ALTER TABLE billing.users_social_auth add column if not exists enabled boolean;
-ALTER TABLE billing.users_social_auth add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE billing.users_social_auth add column if not exists editor_date timestamp without time zone;
-ALTER TABLE billing.users_social_auth add column if not exists uid text;
-ALTER TABLE billing.users_social_auth add column if not exists editor_id text;
-ALTER TABLE billing.users_social_auth add column if not exists files json;
-ALTER TABLE billing.users_social_auth add column if not exists lang text;
-ALTER TABLE billing.users_social_auth add column if not exists social_auth_url text;
-
-COMMENT ON TABLE billing.users_social_auth IS 'Авторизація користувачів через соц. мережі';
-COMMENT ON COLUMN billing.users_social_auth.user_id IS 'ID користувача';
-
-ALTER TABLE billing.users add CONSTRAINT billing_user_id_pkey PRIMARY KEY (user_id);
-ALTER TABLE billing.users_social_auth add CONSTRAINT billing_users_social_auth_usa_id_pkey PRIMARY KEY (usa_id);
-ALTER TABLE billing.users_social_auth add CONSTRAINT billing_users_social_auth_user_id_fkey FOREIGN KEY (user_id)
+create schema if not exists billing;
+
+CREATE TABLE if not exists billing.users();
+ALTER TABLE billing.users DROP CONSTRAINT if exists billing_user_id_pkey cascade;
+
+ALTER TABLE billing.users add column if not exists user_id text NOT NULL DEFAULT next_id();
+ALTER TABLE billing.users add column if not exists login text;
+ALTER TABLE billing.users add column if not exists password text NOT NULL DEFAULT ''::text;
+ALTER TABLE billing.users add column if not exists user_name text;
+ALTER TABLE billing.users add column if not exists sur_name text;
+ALTER TABLE billing.users add column if not exists father_name text;
+ALTER TABLE billing.users add column if not exists email text;
+ALTER TABLE billing.users add column if not exists phone text;
+ALTER TABLE billing.users add column if not exists avatar text;
+ALTER TABLE billing.users add column if not exists enabled boolean;
+ALTER TABLE billing.users add column if not exists user_personal_code text;
+ALTER TABLE billing.users add column if not exists last_activity_date timestamp without time zone;
+ALTER TABLE billing.users add column if not exists user_type text DEFAULT 'regular'::text;
+ALTER TABLE billing.users add column if not exists salt text;
+ALTER TABLE billing.users add column if not exists uid text;
+ALTER TABLE billing.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.users add column if not exists editor_id text;
+ALTER TABLE billing.users add column if not exists editor_date timestamp without time zone;
+ALTER TABLE billing.users add column if not exists files json;
+
+COMMENT ON TABLE billing.users IS 'Користувачі';
+
+COMMENT ON COLUMN billing.users.user_id IS 'ID користувача';
+COMMENT ON COLUMN billing.users.login IS 'Логін користувача';
+COMMENT ON COLUMN billing.users.password IS 'Пароль користувача';
+COMMENT ON COLUMN billing.users.user_name IS 'Ім''я користувача';
+COMMENT ON COLUMN billing.users.sur_name IS 'Прізвище користувача';
+COMMENT ON COLUMN billing.users.father_name IS 'По-батькові користувача';
+COMMENT ON COLUMN billing.users.email IS 'Ел. пошта користувача';
+COMMENT ON COLUMN billing.users.phone IS 'Номер телефону користувача';
+COMMENT ON COLUMN billing.users.avatar IS 'Аватар';
+COMMENT ON COLUMN billing.users.enabled IS 'On / Off';
+COMMENT ON COLUMN billing.users.last_activity_date IS 'Дата останньої активності';
+COMMENT ON COLUMN billing.users.user_type IS 'Тип користувача';
+COMMENT ON COLUMN billing.users.salt IS 'Сіль';
+
+CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
+CREATE OR REPLACE FUNCTION billing.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
+
+CREATE OR REPLACE FUNCTION billing.insert_update_user_before()
+RETURNS trigger AS
+
+$BODY$
+DECLARE 
+
+iterations  int;
+hash character varying;
+
+BEGIN
+
+ if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
+	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
+		--raise exception 'password must be longer than 8 characters';
+	end if;
+	new.salt=md5(now()::text);
+	--raise exception '%','change pass';
+	if(new.salt ='') then
+		new.salt=gen_salt('md5');	
+	end if;	
+	iterations = 10;
+	hash=''; 
+	
+	loop   		
+		if iterations=0 then
+			exit;
+		end if;
+		hash = md5(new.password||hash||new.salt);
+		iterations=iterations-1;
+	end loop;
+	new.password=billing.crypt(hash,new.salt);
+	
+ end if;
+ RETURN new;
+END
+$BODY$
+
+LANGUAGE plpgsql VOLATILE COST 100;
+  
+DROP TRIGGER if exists insert_update_user_before on billing.users;
+CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON billing.users FOR EACH ROW 
+EXECUTE PROCEDURE billing.insert_update_user_before();
+
+CREATE TABLE if not exists billing.users_social_auth();
+ALTER TABLE billing.users_social_auth DROP CONSTRAINT if exists billing_users_social_auth_usa_id_pkey cascade;
+ALTER TABLE billing.users_social_auth DROP CONSTRAINT if exists billing_users_social_auth_user_id_fkey cascade;
+
+CREATE TABLE if not exists billing.users_social_auth();
+ALTER TABLE billing.users_social_auth add column if not exists usa_id text NOT NULL DEFAULT next_id();
+ALTER TABLE billing.users_social_auth add column if not exists user_id text;
+ALTER TABLE billing.users_social_auth add column if not exists user_name text;
+ALTER TABLE billing.users_social_auth add column if not exists sur_name text;
+ALTER TABLE billing.users_social_auth add column if not exists email text;
+ALTER TABLE billing.users_social_auth add column if not exists city text;
+ALTER TABLE billing.users_social_auth add column if not exists phone text;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_id text;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_type text;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_code text;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_obj json;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_date timestamp without time zone;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_softpro_code text;
+ALTER TABLE billing.users_social_auth add column if not exists enabled boolean;
+ALTER TABLE billing.users_social_auth add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE billing.users_social_auth add column if not exists editor_date timestamp without time zone;
+ALTER TABLE billing.users_social_auth add column if not exists uid text;
+ALTER TABLE billing.users_social_auth add column if not exists editor_id text;
+ALTER TABLE billing.users_social_auth add column if not exists files json;
+ALTER TABLE billing.users_social_auth add column if not exists lang text;
+ALTER TABLE billing.users_social_auth add column if not exists social_auth_url text;
+
+COMMENT ON TABLE billing.users_social_auth IS 'Авторизація користувачів через соц. мережі';
+COMMENT ON COLUMN billing.users_social_auth.user_id IS 'ID користувача';
+
+ALTER TABLE billing.users add CONSTRAINT billing_user_id_pkey PRIMARY KEY (user_id);
+ALTER TABLE billing.users_social_auth add CONSTRAINT billing_users_social_auth_usa_id_pkey PRIMARY KEY (usa_id);
+ALTER TABLE billing.users_social_auth add CONSTRAINT billing_users_social_auth_user_id_fkey FOREIGN KEY (user_id)
 REFERENCES billing.users (user_id);