ayrisdev/Pay2Gateway
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: merchant specific fees, TRON & BTC support, coin logos, and bug fixes

Browse Source
This commit is contained in:
mstfyldz
2026-03-13 00:34:42 +03:00
parent b0c1055c13
commit 2d435a4ee8
17 changed files with 708 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/admin/settings/route.ts
View File

@@ -23,6 +23,7 @@ export async function GET() {
// Fill defaults if empty
if (!settings.sol_platform_address) settings.sol_platform_address = process.env.SOL_PLATFORM_ADDRESS || '';
if (!settings.evm_platform_address) settings.evm_platform_address = process.env.EVM_PLATFORM_ADDRESS || '';
if (!settings.default_fee_percent) settings.default_fee_percent = '1.0';
return NextResponse.json(settings);
} catch (err: any) {
@@ -33,11 +34,12 @@ export async function GET() {
export async function POST(req: NextRequest) {
try {
const body = await req.json();
const { sol_platform_address, evm_platform_address } = body;
const { sol_platform_address, evm_platform_address, default_fee_percent } = body;
const queries = [
{ key: 'sol_platform_address', value: sol_platform_address },
{ key: 'evm_platform_address', value: evm_platform_address }
{ key: 'evm_platform_address', value: evm_platform_address },
{ key: 'default_fee_percent', value: default_fee_percent || '1.0' }
];
for (const q of queries) {

10
app/api/create-payment-intent/route.ts
View File

@@ -74,10 +74,14 @@ export async function POST(req: NextRequest) {
// 3. Generate Temporary Wallets for Crypto fallback
const evmWallet = await CryptoEngine.createTemporaryWallet('POLYGON');
const solWallet = await CryptoEngine.createTemporaryWallet('SOLANA');
const tronWallet = await CryptoEngine.createTemporaryWallet('TRON');
const btcWallet = await CryptoEngine.createTemporaryWallet('BITCOIN');
const cryptoWallets = {
EVM: { address: evmWallet.address, privateKey: evmWallet.privateKey },
SOLANA: { address: solWallet.address, privateKey: solWallet.privateKey }
SOLANA: { address: solWallet.address, privateKey: solWallet.privateKey },
TRON: { address: tronWallet.address, privateKey: tronWallet.privateKey },
BITCOIN: { address: btcWallet.address, privateKey: btcWallet.privateKey }
};
// 4. Log transaction in Supabase
@@ -108,7 +112,9 @@ export async function POST(req: NextRequest) {
provider,
wallets: {
EVM: evmWallet.address,
SOLANA: solWallet.address
SOLANA: solWallet.address,
TRON: tronWallet.address,
BITCOIN: btcWallet.address
}
});
} catch (err: any) {

20
app/api/crypto-sweep/route.ts
View File

@@ -45,22 +45,27 @@ export async function POST(request: Request) {
return NextResponse.json({ success: false, error: `No temporary wallet found for ${walletType}` }, { status: 500 });
}
// 3. Define Platform Address (Fetch from dynamic settings)
const platformAddresses = await (async () => {
const result = await db.query('SELECT key, value FROM system_settings WHERE key IN (\'sol_platform_address\', \'evm_platform_address\')');
// 3. Define Platform Address & Fee (Fetch from dynamic settings)
const settings = await (async () => {
const result = await db.query('SELECT key, value FROM system_settings WHERE key IN (\'sol_platform_address\', \'evm_platform_address\', \'default_fee_percent\')');
const map: Record<string, string> = {};
result.rows.forEach(r => map[r.key] = r.value);
return {
sol: map.sol_platform_address || process.env.SOL_PLATFORM_ADDRESS || "5pLH1tqZhx8p8WpZ18yr28N42KXB3FXVPzZ9ceCtpBVe",
evm: map.evm_platform_address || process.env.EVM_PLATFORM_ADDRESS || "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
evm: map.evm_platform_address || process.env.EVM_PLATFORM_ADDRESS || "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
fee: parseFloat(map.default_fee_percent || '1.0')
};
})();
const platformAddress = selectedNetwork === 'SOLANA' ? platformAddresses.sol : platformAddresses.evm;
const platformAddress = selectedNetwork === 'SOLANA' ? settings.sol : settings.evm;
// 4. Define Merchant Address (Fetch from transaction's merchant)
const merchantResult = await db.query('SELECT * FROM merchants WHERE id = $1', [transaction.merchant_id]);
const merchant = merchantResult.rows[0];
// Prioritize merchant's specific fee, fallback to global setting
const feePercent = merchant?.fee_percent !== undefined && merchant?.fee_percent !== null
? parseFloat(merchant.fee_percent)
: settings.fee;
let merchantAddress = merchant?.wallet_address || platformAddress;
@@ -95,7 +100,8 @@ export async function POST(request: Request) {
tempWalletConfig.privateKey,
merchantAddress,
platformAddress,
selectedToken
selectedToken,
feePercent
);
if (!sweepResult.success) {

6
app/api/merchants/[id]/route.ts
View File

@@ -29,7 +29,7 @@ export async function PATCH(
) {
try {
const { id } = await context.params;
const { name, webhook_url, payment_provider, provider_config } = await req.json();
const { name, webhook_url, payment_provider, provider_config, fee_percent } = await req.json();
if (!name) {
return NextResponse.json(
@@ -39,8 +39,8 @@ export async function PATCH(
}
const result = await db.query(
'UPDATE merchants SET name = $1, webhook_url = $2, payment_provider = $3, provider_config = $4 WHERE id = $5 RETURNING *',
[name, webhook_url, payment_provider, provider_config, id]
'UPDATE merchants SET name = $1, webhook_url = $2, payment_provider = $3, provider_config = $4, fee_percent = $5 WHERE id = $6 RETURNING *',
[name, webhook_url, payment_provider, provider_config, fee_percent || 1.0, id]
);
const data = result.rows[0];

8
app/api/merchants/route.ts
View File

@@ -3,7 +3,7 @@ import { db } from '@/lib/db';
export async function POST(req: NextRequest) {
try {
const { name, webhook_url, payment_provider, provider_config } = await req.json();
const { name, webhook_url, payment_provider, provider_config, fee_percent } = await req.json();
if (!name) {
return NextResponse.json(
@@ -27,9 +27,9 @@ export async function POST(req: NextRequest) {
const configStr = provider_config ? JSON.stringify(provider_config) : '{}';
const result = await db.query(
`INSERT INTO merchants (name, webhook_url, short_id, payment_provider, provider_config)
VALUES ($1, $2, $3, $4, $5) RETURNING *`,
[name, webhook_url, shortId, provider, configStr]
`INSERT INTO merchants (name, webhook_url, short_id, payment_provider, provider_config, fee_percent)
VALUES ($1, $2, $3, $4, $5, $6) RETURNING *`,
[name, webhook_url, shortId, provider, configStr, fee_percent || 1.0]
);
if (result.rows.length === 0) {