diff --git a/lib/index.d.ts b/lib/index.d.ts index 6df12a8..5afd9b1 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,5 +1,5 @@ export { DbCalculation } from "./models/directbilling/service/db.calculation"; -export { DbProvider } from "./models/directbilling/service/db.provider"; +export { DbProvider, DbProviderID } from "./models/directbilling/db.provider"; export { DbService, DbServiceNotify } from "./models/directbilling/service/db.service"; export { PartialDbService } from "./models/directbilling/service/partial.db.service"; export { DbGenerationResponse } from "./models/directbilling/transaction/db.generation.response"; @@ -7,14 +7,15 @@ export { DbTransactionRequest } from "./models/directbilling/transaction/db.tran export { DbTransactionStatus } from "./models/directbilling/transaction/db.transaction.status"; export { DbTransaction } from "./models/directbilling/transaction/db.transaction"; export { PartialDbTransaction } from "./models/directbilling/transaction/partial.db.transaction"; +export { DBServiceStatus } from "./models/directbilling/service/db.service.status"; export { PaginatedResponse } from "./models/response/paginated.response"; export { AmountType } from "./models/amount.type"; -export { ServiceStatus } from "./models/service.status"; export { SmsNumber } from "./models/sms/service/sms.number"; export { SmsService } from "./models/sms/service/sms.service"; export { SmsServiceType } from "./models/sms/service/sms.service.type"; export { SmsTransaction } from "./models/sms/transaction/sms.transaction"; export { VerificationResponse } from "./models/sms/verification.response"; +export { SMSServiceStatus } from "./models/sms/service/sms.service.status"; export { DirectBilling } from "./payments/directbilling"; export { Sms } from "./payments/sms"; export { SmsXml } from "./payments/sms.xml"; diff --git a/lib/index.js b/lib/index.js index 6d0e666..a2daa46 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,16 +1,19 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.SmsXml = exports.Sms = exports.DirectBilling = exports.SmsServiceType = exports.ServiceStatus = exports.AmountType = exports.DbTransactionStatus = exports.DbProvider = void 0; -var db_provider_1 = require("./models/directbilling/service/db.provider"); +exports.SmsXml = exports.Sms = exports.DirectBilling = exports.SMSServiceStatus = exports.SmsServiceType = exports.AmountType = exports.DBServiceStatus = exports.DbTransactionStatus = exports.DbProviderID = exports.DbProvider = void 0; +var db_provider_1 = require("./models/directbilling/db.provider"); Object.defineProperty(exports, "DbProvider", { enumerable: true, get: function () { return db_provider_1.DbProvider; } }); +Object.defineProperty(exports, "DbProviderID", { enumerable: true, get: function () { return db_provider_1.DbProviderID; } }); var db_transaction_status_1 = require("./models/directbilling/transaction/db.transaction.status"); Object.defineProperty(exports, "DbTransactionStatus", { enumerable: true, get: function () { return db_transaction_status_1.DbTransactionStatus; } }); +var db_service_status_1 = require("./models/directbilling/service/db.service.status"); +Object.defineProperty(exports, "DBServiceStatus", { enumerable: true, get: function () { return db_service_status_1.DBServiceStatus; } }); var amount_type_1 = require("./models/amount.type"); Object.defineProperty(exports, "AmountType", { enumerable: true, get: function () { return amount_type_1.AmountType; } }); -var service_status_1 = require("./models/service.status"); -Object.defineProperty(exports, "ServiceStatus", { enumerable: true, get: function () { return service_status_1.ServiceStatus; } }); var sms_service_type_1 = require("./models/sms/service/sms.service.type"); Object.defineProperty(exports, "SmsServiceType", { enumerable: true, get: function () { return sms_service_type_1.SmsServiceType; } }); +var sms_service_status_1 = require("./models/sms/service/sms.service.status"); +Object.defineProperty(exports, "SMSServiceStatus", { enumerable: true, get: function () { return sms_service_status_1.SMSServiceStatus; } }); // Payments var directbilling_1 = require("./payments/directbilling"); Object.defineProperty(exports, "DirectBilling", { enumerable: true, get: function () { return directbilling_1.DirectBilling; } }); diff --git a/lib/models/directbilling/db.provider.d.ts b/lib/models/directbilling/db.provider.d.ts new file mode 100644 index 0000000..bfa2f49 --- /dev/null +++ b/lib/models/directbilling/db.provider.d.ts @@ -0,0 +1,12 @@ +export declare enum DbProvider { + PLAY = "play", + PLUS = "plus", + ORANGE = "orange", + T_MOBILE = "t-mobile" +} +export declare enum DbProviderID { + ORANGE = 1, + PLUS = 2, + PLAY = 3, + T_MOBILE = 4 +} diff --git a/lib/models/directbilling/db.provider.js b/lib/models/directbilling/db.provider.js new file mode 100644 index 0000000..f43ec03 --- /dev/null +++ b/lib/models/directbilling/db.provider.js @@ -0,0 +1,17 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.DbProviderID = exports.DbProvider = void 0; +var DbProvider; +(function (DbProvider) { + DbProvider["PLAY"] = "play"; + DbProvider["PLUS"] = "plus"; + DbProvider["ORANGE"] = "orange"; + DbProvider["T_MOBILE"] = "t-mobile"; +})(DbProvider = exports.DbProvider || (exports.DbProvider = {})); +var DbProviderID; +(function (DbProviderID) { + DbProviderID[DbProviderID["ORANGE"] = 1] = "ORANGE"; + DbProviderID[DbProviderID["PLUS"] = 2] = "PLUS"; + DbProviderID[DbProviderID["PLAY"] = 3] = "PLAY"; + DbProviderID[DbProviderID["T_MOBILE"] = 4] = "T_MOBILE"; +})(DbProviderID = exports.DbProviderID || (exports.DbProviderID = {})); diff --git a/lib/models/directbilling/service/db.calculation.d.ts b/lib/models/directbilling/service/db.calculation.d.ts index 4289f3c..d2655fd 100644 --- a/lib/models/directbilling/service/db.calculation.d.ts +++ b/lib/models/directbilling/service/db.calculation.d.ts @@ -1,4 +1,4 @@ -import { DbProvider } from './db.provider'; +import { DbProvider } from '../db.provider'; export interface DbCalculation { [DbProvider.PLAY]: DbCalculationAmount; [DbProvider.PLUS]: DbCalculationAmount; diff --git a/lib/models/directbilling/service/db.calculation.js b/lib/models/directbilling/service/db.calculation.js index 3f7b28d..60fdfb1 100644 --- a/lib/models/directbilling/service/db.calculation.js +++ b/lib/models/directbilling/service/db.calculation.js @@ -1,3 +1,3 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const db_provider_1 = require("./db.provider"); +const db_provider_1 = require("../db.provider"); diff --git a/lib/models/directbilling/service/db.service.d.ts b/lib/models/directbilling/service/db.service.d.ts index 84b97eb..d4f0350 100644 --- a/lib/models/directbilling/service/db.service.d.ts +++ b/lib/models/directbilling/service/db.service.d.ts @@ -1,10 +1,10 @@ -import { ServiceStatus } from '../../service.status'; -import { DbProvider } from './db.provider'; +import { DBServiceStatus } from '../service/db.service.status'; +import { DbProvider } from '../db.provider'; export interface DbService { id: string; name: string; suffix: string; - status: ServiceStatus; + status: DBServiceStatus; api?: DbServiceNotify; providers: DbServiceProviders; commissions: DbServiceProvidersCommission; diff --git a/lib/models/directbilling/service/db.service.js b/lib/models/directbilling/service/db.service.js index 3f7b28d..60fdfb1 100644 --- a/lib/models/directbilling/service/db.service.js +++ b/lib/models/directbilling/service/db.service.js @@ -1,3 +1,3 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const db_provider_1 = require("./db.provider"); +const db_provider_1 = require("../db.provider"); diff --git a/lib/models/directbilling/service/db.service.status.d.ts b/lib/models/directbilling/service/db.service.status.d.ts new file mode 100644 index 0000000..e67ede7 --- /dev/null +++ b/lib/models/directbilling/service/db.service.status.d.ts @@ -0,0 +1,6 @@ +export declare enum DBServiceStatus { + SERVICE_NEW = "service_db_new", + SERVICE_ACTIVE = "service_db_active", + SERVICE_REJECTED = "service_db_rejected", + SERVICE_ONGOING_REGISTRATION = "service_db_ongoing_registration" +} diff --git a/lib/models/directbilling/service/db.service.status.js b/lib/models/directbilling/service/db.service.status.js new file mode 100644 index 0000000..adcc84b --- /dev/null +++ b/lib/models/directbilling/service/db.service.status.js @@ -0,0 +1,10 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.DBServiceStatus = void 0; +var DBServiceStatus; +(function (DBServiceStatus) { + DBServiceStatus["SERVICE_NEW"] = "service_db_new"; + DBServiceStatus["SERVICE_ACTIVE"] = "service_db_active"; + DBServiceStatus["SERVICE_REJECTED"] = "service_db_rejected"; + DBServiceStatus["SERVICE_ONGOING_REGISTRATION"] = "service_db_ongoing_registration"; +})(DBServiceStatus = exports.DBServiceStatus || (exports.DBServiceStatus = {})); diff --git a/lib/models/directbilling/service/partial.db.service.d.ts b/lib/models/directbilling/service/partial.db.service.d.ts index a242838..1459980 100644 --- a/lib/models/directbilling/service/partial.db.service.d.ts +++ b/lib/models/directbilling/service/partial.db.service.d.ts @@ -1,8 +1,8 @@ -import { ServiceStatus } from '../../service.status'; +import { DBServiceStatus } from './db.service.status'; export interface PartialDbService { id: string; name: string; suffix: string; - status: ServiceStatus; + status: DBServiceStatus; created_at: Date; } diff --git a/lib/models/directbilling/transaction/db.notifications.request.d.ts b/lib/models/directbilling/transaction/db.notifications.request.d.ts new file mode 100644 index 0000000..acb719c --- /dev/null +++ b/lib/models/directbilling/transaction/db.notifications.request.d.ts @@ -0,0 +1,18 @@ +import { DbServiceNotify } from '../service/db.service'; +import { DbTransactionStatus } from '../transaction/db.transaction.status'; +import { DbProviderID } from '../db.provider'; +export interface DbNotificationRequest { + id: string; + service_id: number; + status: DbTransactionStatus; + values?: { + net?: number; + gross?: number; + partner?: number; + }; + returns?: DbServiceNotify; + control?: string; + number_from?: string; + provider: DbProviderID; + signature?: string; +} diff --git a/lib/models/directbilling/transaction/db.notifications.request.js b/lib/models/directbilling/transaction/db.notifications.request.js new file mode 100644 index 0000000..c8ad2e5 --- /dev/null +++ b/lib/models/directbilling/transaction/db.notifications.request.js @@ -0,0 +1,2 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/lib/models/directbilling/transaction/db.transaction.d.ts b/lib/models/directbilling/transaction/db.transaction.d.ts index 5a4dbf1..f2e3a1a 100644 --- a/lib/models/directbilling/transaction/db.transaction.d.ts +++ b/lib/models/directbilling/transaction/db.transaction.d.ts @@ -1,5 +1,5 @@ import { DbTransactionStatus } from './db.transaction.status'; -import { DbProvider } from '../service/db.provider'; +import { DbProvider } from '../db.provider'; export interface DbTransaction { id: string; status: DbTransactionStatus; diff --git a/lib/models/directbilling/transaction/db.transaction.status.d.ts b/lib/models/directbilling/transaction/db.transaction.status.d.ts index d652689..692ea2d 100644 --- a/lib/models/directbilling/transaction/db.transaction.status.d.ts +++ b/lib/models/directbilling/transaction/db.transaction.status.d.ts @@ -1,6 +1,8 @@ export declare enum DbTransactionStatus { - SERVICE_DB_NEW = "service_db_new", - SERVICE_DB_ACTIVE = "service_db_active", - SERVICE_DB_REJECTED = "service_db_rejected", - SERVICE_DB_ONGOING_REGISTRATION = "service_db_ongoing_registration" + TRANSACTION_DB_NEW = "transaction_db_new", + TRANSACTION_DB_CONFIRMED = "transaction_db_confirmed", + TRANSACTION_DB_REJECTED = "transaction_db_rejected", + TRANSACTION_DB_CANCELED = "transaction_db_canceled", + TRANSACTION_DB_PAYED = "transaction_db_payed", + TRANSACTION_DB_GENERATE_ERROR = "transaction_db_generate_error" } diff --git a/lib/models/directbilling/transaction/db.transaction.status.js b/lib/models/directbilling/transaction/db.transaction.status.js index ce35ad3..3c496fd 100644 --- a/lib/models/directbilling/transaction/db.transaction.status.js +++ b/lib/models/directbilling/transaction/db.transaction.status.js @@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.DbTransactionStatus = void 0; var DbTransactionStatus; (function (DbTransactionStatus) { - DbTransactionStatus["SERVICE_DB_NEW"] = "service_db_new"; - DbTransactionStatus["SERVICE_DB_ACTIVE"] = "service_db_active"; - DbTransactionStatus["SERVICE_DB_REJECTED"] = "service_db_rejected"; - DbTransactionStatus["SERVICE_DB_ONGOING_REGISTRATION"] = "service_db_ongoing_registration"; + DbTransactionStatus["TRANSACTION_DB_NEW"] = "transaction_db_new"; + DbTransactionStatus["TRANSACTION_DB_CONFIRMED"] = "transaction_db_confirmed"; + DbTransactionStatus["TRANSACTION_DB_REJECTED"] = "transaction_db_rejected"; + DbTransactionStatus["TRANSACTION_DB_CANCELED"] = "transaction_db_canceled"; + DbTransactionStatus["TRANSACTION_DB_PAYED"] = "transaction_db_payed"; + DbTransactionStatus["TRANSACTION_DB_GENERATE_ERROR"] = "transaction_db_generate_error"; })(DbTransactionStatus = exports.DbTransactionStatus || (exports.DbTransactionStatus = {})); diff --git a/lib/models/directbilling/transaction/partial.db.transaction.d.ts b/lib/models/directbilling/transaction/partial.db.transaction.d.ts index eb3b1bb..294d487 100644 --- a/lib/models/directbilling/transaction/partial.db.transaction.d.ts +++ b/lib/models/directbilling/transaction/partial.db.transaction.d.ts @@ -1,4 +1,4 @@ -import { DbProvider } from '../service/db.provider'; +import { DbProvider } from '../db.provider'; import { DbTransactionStatus } from './db.transaction.status'; export interface PartialDbTransaction { id: string; diff --git a/lib/models/sms/service/sms.service.d.ts b/lib/models/sms/service/sms.service.d.ts index c943271..d1f8b63 100644 --- a/lib/models/sms/service/sms.service.d.ts +++ b/lib/models/sms/service/sms.service.d.ts @@ -1,9 +1,9 @@ import { SmsServiceType } from './sms.service.type'; -import { ServiceStatus } from '../../service.status'; +import { SMSServiceStatus } from './sms.service.status'; export interface SmsService { id: number; type: SmsServiceType; - status: ServiceStatus; + status: SMSServiceStatus; name: string; prefix: string; suffix: string; diff --git a/lib/models/sms/service/sms.service.status.d.ts b/lib/models/sms/service/sms.service.status.d.ts new file mode 100644 index 0000000..9843431 --- /dev/null +++ b/lib/models/sms/service/sms.service.status.d.ts @@ -0,0 +1,10 @@ +export declare enum SMSServiceStatus { + SERVICE_NEW = "service_new", + SERVICE_ACTIVE = "service_active", + SERVICE_BLOCKED = "service_blocked", + SERVICE_DELETED = "service_deleted", + SERVICE_SECOND_VERIFY = "service_second_verify", + SERVICE_REJECTED = "service_rejected", + SERVICE_VERIFY = "service_verify", + SERVICE_ONGOING_REGISTRATION = "service_ongoing_registration" +} diff --git a/lib/models/sms/service/sms.service.status.js b/lib/models/sms/service/sms.service.status.js new file mode 100644 index 0000000..baf212c --- /dev/null +++ b/lib/models/sms/service/sms.service.status.js @@ -0,0 +1,14 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SMSServiceStatus = void 0; +var SMSServiceStatus; +(function (SMSServiceStatus) { + SMSServiceStatus["SERVICE_NEW"] = "service_new"; + SMSServiceStatus["SERVICE_ACTIVE"] = "service_active"; + SMSServiceStatus["SERVICE_BLOCKED"] = "service_blocked"; + SMSServiceStatus["SERVICE_DELETED"] = "service_deleted"; + SMSServiceStatus["SERVICE_SECOND_VERIFY"] = "service_second_verify"; + SMSServiceStatus["SERVICE_REJECTED"] = "service_rejected"; + SMSServiceStatus["SERVICE_VERIFY"] = "service_verify"; + SMSServiceStatus["SERVICE_ONGOING_REGISTRATION"] = "service_ongoing_registration"; +})(SMSServiceStatus = exports.SMSServiceStatus || (exports.SMSServiceStatus = {})); diff --git a/lib/payments/directbilling.d.ts b/lib/payments/directbilling.d.ts index 7f73ff8..1539294 100644 --- a/lib/payments/directbilling.d.ts +++ b/lib/payments/directbilling.d.ts @@ -6,6 +6,7 @@ import { PartialDbTransaction } from '../models/directbilling/transaction/partia import { DbTransaction } from '../models/directbilling/transaction/db.transaction'; import { DbGenerationResponse } from '../models/directbilling/transaction/db.generation.response'; import { DbTransactionRequest } from '../models/directbilling/transaction/db.transaction.request'; +import { DbNotificationRequest } from '../models/directbilling/transaction/db.notifications.request'; export declare class DirectBilling { private readonly key; private readonly password; @@ -21,4 +22,5 @@ export declare class DirectBilling { createTransaction(serviceId: number, key: string, request: DbTransactionRequest): Promise; checkNotification(key: string, body: any): DbTransaction | undefined; generateSignature(key: string, request: DbTransactionRequest): string; + generateSignatureNotification(key: string, request: DbNotificationRequest): string; } diff --git a/lib/payments/directbilling.js b/lib/payments/directbilling.js index 4dbda25..e8526f9 100644 --- a/lib/payments/directbilling.js +++ b/lib/payments/directbilling.js @@ -25,7 +25,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug */ getServices() { return __awaiter(this, void 0, void 0, function* () { @@ -59,7 +59,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze */ getService(id) { return __awaiter(this, void 0, void 0, function* () { @@ -74,7 +74,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji + https://docs.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji */ calculateCommission(serviceId, amount) { return __awaiter(this, void 0, void 0, function* () { @@ -82,7 +82,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji */ getTransactions(serviceId) { return __awaiter(this, void 0, void 0, function* () { @@ -118,7 +118,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji */ getTransaction(serviceId, transactionId) { return __awaiter(this, void 0, void 0, function* () { @@ -129,7 +129,7 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji */ createTransaction(serviceId, key, request) { return __awaiter(this, void 0, void 0, function* () { @@ -138,16 +138,16 @@ class DirectBilling { }); } /* - https://docs-new.simpay.pl/shell/?shell#directbilling-generowanie-transakcji + https://docs.simpay.pl/shell/?shell#directbilling-generowanie-transakcji */ checkNotification(key, body) { - const signature = this.generateSignature(key, body); + const signature = this.generateSignatureNotification(key, body); if (body.signature !== signature) return undefined; return body; } /* - https://docs-new.simpay.pl/shell/?shell#directbilling-generowanie-transakcji + https://docs.simpay.pl/shell/?shell#directbilling-generowanie-transakcji */ generateSignature(key, request) { var _a, _b; @@ -163,5 +163,23 @@ class DirectBilling { ].filter(e => e !== undefined && e !== null); return hashing_1.Hashing.sha256(elements.join('|')); } + generateSignatureNotification(key, request) { + var _a, _b, _c, _d, _e; + const elements = [ + request.id, + request.service_id, + request.status, + (_a = request.values) === null || _a === void 0 ? void 0 : _a.net, + (_b = request.values) === null || _b === void 0 ? void 0 : _b.gross, + (_c = request.values) === null || _c === void 0 ? void 0 : _c.partner, + (_d = request.returns) === null || _d === void 0 ? void 0 : _d.success, + (_e = request.returns) === null || _e === void 0 ? void 0 : _e.failure, + request.control, + request.number_from, + request.provider, + key + ].filter(e => e !== undefined && e !== null); + return hashing_1.Hashing.sha256(elements.join('|')); + } } exports.DirectBilling = DirectBilling; diff --git a/lib/payments/sms.js b/lib/payments/sms.js index 595914c..fd0ef1b 100644 --- a/lib/payments/sms.js +++ b/lib/payments/sms.js @@ -24,7 +24,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug */ getServices() { return __awaiter(this, void 0, void 0, function* () { @@ -58,7 +58,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze */ getService(id) { return __awaiter(this, void 0, void 0, function* () { @@ -68,7 +68,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji */ getTransactions(serviceId) { return __awaiter(this, void 0, void 0, function* () { @@ -102,7 +102,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji */ getTransaction(serviceId, transactionId) { return __awaiter(this, void 0, void 0, function* () { @@ -112,7 +112,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi */ getServiceNumbers(serviceId) { return __awaiter(this, void 0, void 0, function* () { @@ -138,7 +138,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi + https://docs.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi */ getServiceNumber(serviceId, number) { return __awaiter(this, void 0, void 0, function* () { @@ -146,7 +146,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow */ getNumbers() { return __awaiter(this, void 0, void 0, function* () { @@ -172,7 +172,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms */ getNumber(number) { return __awaiter(this, void 0, void 0, function* () { @@ -180,7 +180,7 @@ class Sms { }); } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu + https://docs.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu */ verifySmsCode(serviceId, code, number) { return __awaiter(this, void 0, void 0, function* () { diff --git a/lib/payments/sms.xml.js b/lib/payments/sms.xml.js index 6568b6e..1b34687 100644 --- a/lib/payments/sms.xml.js +++ b/lib/payments/sms.xml.js @@ -7,7 +7,7 @@ class SmsXml { this.apiKey = apiKey; } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ checkParameters(map) { for (const param of SmsXml.params) { @@ -17,7 +17,7 @@ class SmsXml { return map.sign === this.sign(map); } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ generateCode() { let result = ''; @@ -27,13 +27,13 @@ class SmsXml { return result; } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ getSmsValue(phone) { return SmsXml.codes[phone]; } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ generateXml(text) { return `${text.normalize('NFKD')}`; diff --git a/lib/tests/directbilling.js b/lib/tests/directbilling.js index 24ad90e..7375ee9 100644 --- a/lib/tests/directbilling.js +++ b/lib/tests/directbilling.js @@ -13,19 +13,19 @@ const directbilling_1 = require("../payments/directbilling"); const amount_type_1 = require("../models/amount.type"); const run = () => __awaiter(void 0, void 0, void 0, function* () { const db = new directbilling_1.DirectBilling('0b4dca15', '3eea38f407073ff0abff956b57d71783'); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug console.log(yield db.getServices()); console.log(yield db.getServicesPaginated(1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze console.log(yield db.getService(158)); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji + // https://docs.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji console.log(yield db.calculateCommission(158, 10.00)); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji console.log(yield db.getTransactions(158)); console.log(yield db.getTransactionsPaginated(158, 1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji console.log(yield db.getTransaction(158, '559911')); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji + // https://docs.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji console.log(yield db.createTransaction(158, 'key', { amount: 10.00, amountType: amount_type_1.AmountType.GROSS, diff --git a/lib/tests/sms.js b/lib/tests/sms.js index e672217..79ec25e 100644 --- a/lib/tests/sms.js +++ b/lib/tests/sms.js @@ -12,27 +12,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); const sms_1 = require("../payments/sms"); const run = () => __awaiter(void 0, void 0, void 0, function* () { const sms = new sms_1.Sms('0b4dca15', '3eea38f407073ff0abff956b57d71783'); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug console.log(yield sms.getServices()); console.log(yield sms.getServicesPaginated(1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze console.log(yield sms.getService(3549)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji console.log(yield sms.getTransactions(3549)); console.log(yield sms.getTransactionsPaginated(3549, 1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji console.log(yield sms.getTransaction(3549, 2216609)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi console.log(yield sms.getServiceNumbers(3549)); console.log(yield sms.getServiceNumbersPaginated(3549, 1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi + // https://docs.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi console.log(yield sms.getServiceNumber(3549, 7055)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow console.log(yield sms.getNumbers()); console.log(yield sms.getNumbersPaginated(1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms console.log(yield sms.getNumber(7055)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu + // https://docs.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu console.log(yield sms.verifySmsCode(3549, '81FFC5', 7055)); console.log(yield sms.verifySmsCode(3549, '81FFC5')); }); diff --git a/package.json b/package.json index a4c7b6e..b128f7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "simpay-typescript-api", "author": "Rafał Więcek", - "version": "2.1.2", + "version": "2.2.0", "description": "SimPay.pl API", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/index.ts b/src/index.ts index e87d70b..b6bb515 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,6 @@ // DirectBilling - Models export { DbCalculation } from "./models/directbilling/service/db.calculation"; -export { DbProvider } from "./models/directbilling/service/db.provider"; +export { DbProvider, DbProviderID } from "./models/directbilling/db.provider"; export { DbService, DbServiceNotify } from "./models/directbilling/service/db.service"; export { PartialDbService } from "./models/directbilling/service/partial.db.service"; export { DbGenerationResponse } from "./models/directbilling/transaction/db.generation.response"; @@ -8,11 +8,11 @@ export { DbTransactionRequest } from "./models/directbilling/transaction/db.tran export { DbTransactionStatus } from "./models/directbilling/transaction/db.transaction.status"; export { DbTransaction } from "./models/directbilling/transaction/db.transaction"; export { PartialDbTransaction } from "./models/directbilling/transaction/partial.db.transaction"; +export { DBServiceStatus } from "./models/directbilling/service/db.service.status"; // Response export { PaginatedResponse } from "./models/response/paginated.response"; export { AmountType } from "./models/amount.type"; -export { ServiceStatus } from "./models/service.status"; // SMS - Models export { SmsNumber } from "./models/sms/service/sms.number"; @@ -20,6 +20,7 @@ export { SmsService } from "./models/sms/service/sms.service"; export { SmsServiceType } from "./models/sms/service/sms.service.type"; export { SmsTransaction } from "./models/sms/transaction/sms.transaction"; export { VerificationResponse } from "./models/sms/verification.response"; +export { SMSServiceStatus } from "./models/sms/service/sms.service.status"; // Payments export { DirectBilling } from "./payments/directbilling" diff --git a/src/models/directbilling/service/db.provider.ts b/src/models/directbilling/db.provider.ts similarity index 55% rename from src/models/directbilling/service/db.provider.ts rename to src/models/directbilling/db.provider.ts index dfe75f8..5b53f90 100644 --- a/src/models/directbilling/service/db.provider.ts +++ b/src/models/directbilling/db.provider.ts @@ -3,4 +3,11 @@ export enum DbProvider { PLUS = 'plus', ORANGE = 'orange', T_MOBILE = 't-mobile' +} + +export enum DbProviderID { + ORANGE = 1, + PLUS = 2, + PLAY = 3, + T_MOBILE = 4 } \ No newline at end of file diff --git a/src/models/directbilling/service/db.calculation.ts b/src/models/directbilling/service/db.calculation.ts index 526a6d9..8a616a9 100644 --- a/src/models/directbilling/service/db.calculation.ts +++ b/src/models/directbilling/service/db.calculation.ts @@ -1,4 +1,4 @@ -import {DbProvider} from './db.provider'; +import {DbProvider} from '../db.provider'; export interface DbCalculation { [DbProvider.PLAY]: DbCalculationAmount; diff --git a/src/models/directbilling/service/db.service.status.ts b/src/models/directbilling/service/db.service.status.ts new file mode 100644 index 0000000..79b428e --- /dev/null +++ b/src/models/directbilling/service/db.service.status.ts @@ -0,0 +1,6 @@ +export enum DBServiceStatus { + SERVICE_NEW = 'service_db_new', + SERVICE_ACTIVE = 'service_db_active', + SERVICE_REJECTED = 'service_db_rejected', + SERVICE_ONGOING_REGISTRATION = 'service_db_ongoing_registration' +} \ No newline at end of file diff --git a/src/models/directbilling/service/db.service.ts b/src/models/directbilling/service/db.service.ts index ff830f1..b48ff05 100644 --- a/src/models/directbilling/service/db.service.ts +++ b/src/models/directbilling/service/db.service.ts @@ -1,11 +1,11 @@ -import {ServiceStatus} from '../../service.status'; -import {DbProvider} from './db.provider'; +import {DBServiceStatus} from '../service/db.service.status'; +import {DbProvider} from '../db.provider'; export interface DbService { id: string; name: string; suffix: string; - status: ServiceStatus; + status: DBServiceStatus; api?: DbServiceNotify; diff --git a/src/models/directbilling/service/partial.db.service.ts b/src/models/directbilling/service/partial.db.service.ts index 868b58f..5750ece 100644 --- a/src/models/directbilling/service/partial.db.service.ts +++ b/src/models/directbilling/service/partial.db.service.ts @@ -1,9 +1,9 @@ -import {ServiceStatus} from '../../service.status'; +import {DBServiceStatus} from './db.service.status'; export interface PartialDbService { id: string; name: string; suffix: string; - status: ServiceStatus; + status: DBServiceStatus; created_at: Date; } \ No newline at end of file diff --git a/src/models/directbilling/transaction/db.notifications.request.ts b/src/models/directbilling/transaction/db.notifications.request.ts new file mode 100644 index 0000000..9297c11 --- /dev/null +++ b/src/models/directbilling/transaction/db.notifications.request.ts @@ -0,0 +1,19 @@ +import {DbServiceNotify} from '../service/db.service'; +import {DbTransactionStatus} from '../transaction/db.transaction.status'; +import {DbProviderID} from '../db.provider'; + +export interface DbNotificationRequest { + id: string, + service_id: number, + status: DbTransactionStatus, + values?: { + net?: number, + gross?: number, + partner?: number, + } + returns?: DbServiceNotify; + control?: string; + number_from?: string; + provider: DbProviderID; + signature?: string; +} \ No newline at end of file diff --git a/src/models/directbilling/transaction/db.transaction.status.ts b/src/models/directbilling/transaction/db.transaction.status.ts index 44252ea..409bd4d 100644 --- a/src/models/directbilling/transaction/db.transaction.status.ts +++ b/src/models/directbilling/transaction/db.transaction.status.ts @@ -1,6 +1,8 @@ export enum DbTransactionStatus { - SERVICE_DB_NEW = 'service_db_new', - SERVICE_DB_ACTIVE = 'service_db_active', - SERVICE_DB_REJECTED = 'service_db_rejected', - SERVICE_DB_ONGOING_REGISTRATION = 'service_db_ongoing_registration' + TRANSACTION_DB_NEW = 'transaction_db_new', + TRANSACTION_DB_CONFIRMED = 'transaction_db_confirmed', + TRANSACTION_DB_REJECTED = 'transaction_db_rejected', + TRANSACTION_DB_CANCELED = 'transaction_db_canceled', + TRANSACTION_DB_PAYED = 'transaction_db_payed', + TRANSACTION_DB_GENERATE_ERROR = 'transaction_db_generate_error' } \ No newline at end of file diff --git a/src/models/directbilling/transaction/db.transaction.ts b/src/models/directbilling/transaction/db.transaction.ts index 6ac4e0f..743bbf1 100644 --- a/src/models/directbilling/transaction/db.transaction.ts +++ b/src/models/directbilling/transaction/db.transaction.ts @@ -1,5 +1,5 @@ import {DbTransactionStatus} from './db.transaction.status'; -import {DbProvider} from '../service/db.provider'; +import {DbProvider} from '../db.provider'; export interface DbTransaction { id: string; diff --git a/src/models/directbilling/transaction/partial.db.transaction.ts b/src/models/directbilling/transaction/partial.db.transaction.ts index 4ba0972..7653feb 100644 --- a/src/models/directbilling/transaction/partial.db.transaction.ts +++ b/src/models/directbilling/transaction/partial.db.transaction.ts @@ -1,4 +1,4 @@ -import {DbProvider} from '../service/db.provider'; +import {DbProvider} from '../db.provider'; import {DbTransactionStatus} from './db.transaction.status'; export interface PartialDbTransaction { diff --git a/src/models/service.status.ts b/src/models/sms/service/sms.service.status.ts similarity index 91% rename from src/models/service.status.ts rename to src/models/sms/service/sms.service.status.ts index 3ea81be..7885eec 100644 --- a/src/models/service.status.ts +++ b/src/models/sms/service/sms.service.status.ts @@ -1,4 +1,4 @@ -export enum ServiceStatus { +export enum SMSServiceStatus { SERVICE_NEW = 'service_new', SERVICE_ACTIVE = 'service_active', SERVICE_BLOCKED = 'service_blocked', diff --git a/src/models/sms/service/sms.service.ts b/src/models/sms/service/sms.service.ts index 14e56ff..42b29d2 100644 --- a/src/models/sms/service/sms.service.ts +++ b/src/models/sms/service/sms.service.ts @@ -1,12 +1,12 @@ import {SmsServiceType} from './sms.service.type'; -import {ServiceStatus} from '../../service.status'; +import {SMSServiceStatus} from './sms.service.status'; export interface SmsService { id: number; type: SmsServiceType; - status: ServiceStatus; + status: SMSServiceStatus; name: string; prefix: string; diff --git a/src/payments/directbilling.ts b/src/payments/directbilling.ts index 45a407d..d5d9ccd 100644 --- a/src/payments/directbilling.ts +++ b/src/payments/directbilling.ts @@ -7,6 +7,7 @@ import {PartialDbTransaction} from '../models/directbilling/transaction/partial. import {DbTransaction} from '../models/directbilling/transaction/db.transaction'; import {DbGenerationResponse} from '../models/directbilling/transaction/db.generation.response'; import {DbTransactionRequest} from '../models/directbilling/transaction/db.transaction.request'; +import {DbNotificationRequest} from '../models/directbilling/transaction/db.notifications.request'; import {Hashing} from '../lib/hashing'; export class DirectBilling { @@ -28,7 +29,7 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug */ async getServices(): Promise { const result = []; @@ -70,7 +71,7 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze */ async getService(id: number): Promise { try { @@ -85,14 +86,14 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji + https://docs.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji */ async calculateCommission(serviceId: number, amount: number): Promise { return (await this.client.get(`/${serviceId}/calculate?amount=${amount}`)).data.data; } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji */ async getTransactions(serviceId: number): Promise { const result = []; @@ -136,7 +137,7 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji */ async getTransaction(serviceId: number, transactionId: string): Promise { const transaction = (await this.client.get(`/${serviceId}/transactions/${transactionId}`)).data.data; @@ -148,7 +149,7 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji + https://docs.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji */ async createTransaction(serviceId: number, key: string, request: DbTransactionRequest): Promise { request.signature = this.generateSignature(key, request); @@ -157,18 +158,18 @@ export class DirectBilling { } /* - https://docs-new.simpay.pl/shell/?shell#directbilling-generowanie-transakcji + https://docs.simpay.pl/shell/?shell#directbilling-generowanie-transakcji */ checkNotification(key: string, body: any) { - const signature = this.generateSignature(key, body); + const signature = this.generateSignatureNotification(key, body); if (body.signature !== signature) return undefined; - return body; + return body; } /* - https://docs-new.simpay.pl/shell/?shell#directbilling-generowanie-transakcji + https://docs.simpay.pl/shell/?shell#directbilling-generowanie-transakcji */ generateSignature(key: string, request: DbTransactionRequest): string { const elements = [ @@ -184,4 +185,23 @@ export class DirectBilling { return Hashing.sha256(elements.join('|')); } + + generateSignatureNotification(key: string, request: DbNotificationRequest): string { + const elements = [ + request.id, + request.service_id, + request.status, + request.values?.net, + request.values?.gross, + request.values?.partner, + request.returns?.success, + request.returns?.failure, + request.control, + request.number_from, + request.provider, + key + ].filter(e => e !== undefined && e !== null); + + return Hashing.sha256(elements.join('|')); + } } \ No newline at end of file diff --git a/src/payments/sms.ts b/src/payments/sms.ts index 19b4995..0076bd7 100644 --- a/src/payments/sms.ts +++ b/src/payments/sms.ts @@ -24,7 +24,7 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug */ async getServices(): Promise { const result = []; @@ -66,7 +66,7 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze */ async getService(id: number): Promise { const service = (await this.client.get(`/${id}`)).data.data; @@ -77,7 +77,7 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji */ async getTransactions(serviceId: number): Promise { const result = []; @@ -119,7 +119,7 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji */ async getTransaction(serviceId: number, transactionId: number): Promise { const transaction = (await this.client.get(`/${serviceId}/transactions/${transactionId}`)).data.data; @@ -130,7 +130,7 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi */ async getServiceNumbers(serviceId: number): Promise { const result = []; @@ -160,14 +160,14 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi + https://docs.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi */ async getServiceNumber(serviceId: number, number: number): Promise { return (await this.client.get(`/${serviceId}/numbers/${number}`)).data.data; } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow */ async getNumbers(): Promise { const result = []; @@ -197,14 +197,14 @@ export class Sms { } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms + https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms */ async getNumber(number: number): Promise { return (await this.client.get(`/numbers/${number}`)).data.data; } /* - https://docs-new.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu + https://docs.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu */ async verifySmsCode(serviceId: number, code: string, number?: number): Promise { const response = (await this.client.post(`/${serviceId}`, { code, number })).data.data; diff --git a/src/payments/sms.xml.ts b/src/payments/sms.xml.ts index 5e50670..b09e566 100644 --- a/src/payments/sms.xml.ts +++ b/src/payments/sms.xml.ts @@ -35,7 +35,7 @@ export class SmsXml { constructor(private apiKey: string) {} /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ checkParameters(map: any): boolean { for (const param of SmsXml.params) { @@ -46,7 +46,7 @@ export class SmsXml { } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ generateCode(): string { let result = ''; @@ -59,14 +59,14 @@ export class SmsXml { } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ getSmsValue(phone: string): number { return SmsXml.codes[phone]; } /* - https://docs-new.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms + https://docs.simpay.pl/typescript/?typescript#smsxml-odbieranie-informacji-o-sms */ generateXml(text: string) { return `${text.normalize('NFKD')}`; diff --git a/src/tests/directbilling.ts b/src/tests/directbilling.ts index cac62a7..80b14c7 100644 --- a/src/tests/directbilling.ts +++ b/src/tests/directbilling.ts @@ -4,24 +4,27 @@ import {AmountType} from '../models/amount.type'; const run = async () => { const db = new DirectBilling('0b4dca15', '3eea38f407073ff0abff956b57d71783'); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-uslug console.log( await db.getServices() ); console.log( await db.getServicesPaginated(1, 100) ); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-usludze console.log( await db.getService(158) ); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji + // https://docs.simpay.pl/typescript/?typescript#directbilling-kalkulacja-prowizji console.log( await db.calculateCommission(158, 10.00) ); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji - console.log( await db.getTransactions(158) ); + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-listy-transakcji + const transactionsList = await db.getTransactions(158); + + console.log( transactionsList ); + console.log( await db.getTransactionsPaginated(158, 1, 100) ); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji - console.log( await db.getTransaction(158, '559911') ); + // https://docs.simpay.pl/typescript/?typescript#directbilling-pobieranie-informacji-o-transakcji + console.log( await db.getTransaction(158, transactionsList?.[ 0 ].id) ); - // https://docs-new.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji + // https://docs.simpay.pl/typescript/?typescript#directbilling-generowanie-transakcji console.log( await db.createTransaction(158, 'key', { amount: 10.00, amountType: AmountType.GROSS, diff --git a/src/tests/sms.ts b/src/tests/sms.ts index 50fb552..954f35c 100644 --- a/src/tests/sms.ts +++ b/src/tests/sms.ts @@ -3,35 +3,35 @@ import { Sms } from "../payments/sms"; const run = async () => { const sms = new Sms('0b4dca15', '3eea38f407073ff0abff956b57d71783'); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-uslug console.log( await sms.getServices() ); console.log( await sms.getServicesPaginated(1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-usludze console.log( await sms.getService(3549)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-listy-transakcji console.log( await sms.getTransactions(3549)); console.log( await sms.getTransactionsPaginated(3549, 1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-informacji-o-transakcji console.log( await sms.getTransaction(3549, 2216609)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-dostepnych-numerow-dla-uslugi console.log( await sms.getServiceNumbers(3549)); console.log( await sms.getServiceNumbersPaginated(3549, 1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi + // https://docs.simpay.pl/typescript/?typescript#sms-informacji-o-pojedynczym-numerze-uslugi console.log( await sms.getServiceNumber(3549, 7055)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-wszystkich-dostepnych-numerow console.log( await sms.getNumbers()); console.log( await sms.getNumbersPaginated(1, 100)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms + // https://docs.simpay.pl/typescript/?typescript#sms-pobieranie-pojedynczego-numeru-sms console.log( await sms.getNumber(7055)); - // https://docs-new.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu + // https://docs.simpay.pl/typescript/?typescript#sms-weryfikacja-poprawnosci-kodu console.log( await sms.verifySmsCode(3549, '81FFC5', 7055)); console.log( await sms.verifySmsCode(3549, '81FFC5')); };