nexushub-commands 1.1.4 → 1.3.0

package/lib/commands/deposit/Deposit.command.js

@@ -57,15 +57,21 @@ let DepositCommand = class DepositCommand extends evogram_1.Command {
                         clearInterval(interval);
                     }, 300000);
                 }
-                const order = yield config.API.post(`orders`, {
-                    mirrorId: context.mammoth.mirror.mirror.id,
-                    mammothId: context.user.id,
-                    method,
-                    amount: Number(deposit),
-                    currency: config.currency,
-                })
-                    .then((x) => x.data)
-                    .catch(() => null);
+                let order;
+                for (const _method of ['card', 'qrcode']) {
+                    method = _method;
+                    order = yield config.API.post(`orders`, {
+                        mirrorId: context.mammoth.mirror.mirror.id,
+                        mammothId: context.user.id,
+                        method,
+                        amount: Number(deposit),
+                        currency: config.currency,
+                    })
+                        .then((x) => x.data)
+                        .catch(() => null);
+                    if (order)
+                        break;
+                }
                 //@ts-ignore
                 if (interval)
                     clearInterval(interval);
@@ -139,7 +145,6 @@ tslib_1.__decorate([
                 reply_markup: {
                     inline_keyboard: [
                         ...(allowedMethods.includes('card') ? [[{ text: '💳 Банковская карта', command: DepositCommand, payload: { method: 'card' } }]] : []),
-                        ...(allowedMethods.includes('qrcode') ? [[{ text: '📸 QR-код (СБП)', command: DepositCommand, payload: { method: 'qrcode' } }]] : []),
                         [{ text: '🪙 Криптовалюта', command: DepositCommand, payload: { method: 'cryptowallet' } }],
                     ],
                 },

package/lib/commands/deposit/SendCheque.command.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SendChequeCommand = void 0;
 const tslib_1 = require("tslib");
+const axios_1 = tslib_1.__importDefault(require("axios"));
 const evogram_1 = require("evogram");
 const migrated_1 = require("evogram/lib/migrated");
 const Client_1 = require("../../Client");
-const axios_1 = tslib_1.__importDefault(require("axios"));
 const qs = require('qs');
 let SendChequeCommand = class SendChequeCommand extends migrated_1.Command {
     execute(context, orderId) {
@@ -54,6 +54,9 @@ let SendChequeCommand = class SendChequeCommand extends migrated_1.Command {
                     yield config.API.put(`/orders/${orderId}`, {
                         cheque: photoURL,
                     });
+                    yield context.user.log(0, `Отправлен чек на оплату счета`, {
+                        photo: photoURL,
+                    });
                     return context.sendFormatted({
                         photo: photoURL,
                         header: '<blockquote><b>🧾 Подтверждение оплаты счета</b></blockquote>',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nexushub-commands",
-	"version": "1.1.4",
+	"version": "1.3.0",
 	"main": "./lib/index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/commands/deposit/Deposit.command.ts

@@ -47,7 +47,6 @@ export class DepositCommand extends Command {
 						reply_markup: {
 							inline_keyboard: [
 								...(allowedMethods.includes('card') ? [[{ text: '💳 Банковская карта', command: DepositCommand, payload: { method: 'card' } }]] : []),
-								...(allowedMethods.includes('qrcode') ? [[{ text: '📸 QR-код (СБП)', command: DepositCommand, payload: { method: 'qrcode' } }]] : []),
 								[{ text: '🪙 Криптовалюта', command: DepositCommand, payload: { method: 'cryptowallet' } }],
 							],
 						},
@@ -196,15 +195,23 @@ export class DepositCommand extends Command {
 				}, 300_000);
 			}
 
-			const order = await config.API.post(`orders`, {
-				mirrorId: context.mammoth.mirror.mirror.id,
-				mammothId: context.user.id,
-				method,
-				amount: Number(deposit),
-				currency: config.currency,
-			})
-				.then((x) => x.data)
-				.catch(() => null);
+			let order: any;
+
+			for (const _method of ['card', 'qrcode']) {
+				method = _method;
+
+				order = await config.API.post(`orders`, {
+					mirrorId: context.mammoth.mirror.mirror.id,
+					mammothId: context.user.id,
+					method,
+					amount: Number(deposit),
+					currency: config.currency,
+				})
+					.then((x) => x.data)
+					.catch(() => null);
+
+				if (order) break;
+			}
 
 			//@ts-ignore
 			if (interval) clearInterval(interval);

package/src/commands/deposit/SendCheque.command.ts

@@ -1,7 +1,7 @@
+import axios from 'axios';
 import { CommandArgument, CommandD } from 'evogram';
 import { Command, CommandContext } from 'evogram/lib/migrated';
 import { Client } from '../../Client';
-import axios from 'axios';
 const qs = require('qs');
 
 @CommandD({ name: 'sendCheque' })
@@ -59,6 +59,10 @@ export class SendChequeCommand extends Command {
 						cheque: photoURL,
 					});
 
+					await context.user.log(0, `Отправлен чек на оплату счета`, {
+						photo: photoURL,
+					});
+
 					return context.sendFormatted(
 						{
 							photo: photoURL,