oxpoe/open-isp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(qris): selaras skema hangus, satu tagihan terbaru
All checks were successful
CI / test (push) Successful in 5m10s
Details

Browse Source 
- batalkan pelunasan multi-tagihan: tagihan lama otomatis void saat tagihan baru terbit
- QRIS manual memakai tagihan terbaru, bukan total tunggakan
- versi 0.5.6
This commit is contained in:
oxpoe
2026-11-05 13:19:14 +07:00
parent a78e6b766a
commit d68cc1d664
7 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/billingSendService.js
View File

@@ -40,8 +40,8 @@ function spintax(t) {
});
}
function buildMessage(tplRaw, c, inv, qr, totalAmount) {
const amount = Number(totalAmount || inv.amount || 0);
function buildMessage(tplRaw, c, inv, qr) {
const amount = Number(inv.amount || 0);
const qrisAmount = Number((qr && qr.amount) || 0) || amount;
const qrisCode = Number((qr && qr.uniqueCode) || 0) || 0;
const qrisAttached = !!(qr && qr.payload);
@@ -76,9 +76,8 @@ function buildTargets(isolateDay) {
try { invs = billingSvc.getUnpaidInvoicesByCustomerId(c.id) || []; } catch (e) {}
if (!invs.length) continue;
if (!c.phone || String(c.phone).replace(/\D/g, '').length < 9) continue;
// invoice terurut dari periode terlama; tagih yang paling lama dulu
const total = invs.reduce((sum, row) => sum + (Number(row.amount) || 0), 0);
targets.push({ c, inv: invs[0], total });
// skema hangus: hanya tagihan terbaru yang valid; tagihan lama otomatis void saat tagihan baru terbit
targets.push({ c, inv: invs[invs.length - 1] });
}
return targets;
}
@@ -119,10 +118,10 @@ async function start(opts = {}) {
(async () => {
for (let i = 0; i < targets.length; i++) {
if (STATUS.stopped) break;
const { c, inv, total } = targets[i];
const { c, inv } = targets[i];
try {
const qr = (isQris && ensureInvoiceQris) ? (ensureInvoiceQris(inv, total) || {}) : null;
const caption = buildMessage(tplRaw, c, inv, qr, total);
const qr = (isQris && ensureInvoiceQris) ? (ensureInvoiceQris(inv) || {}) : null;
const caption = buildMessage(tplRaw, c, inv, qr);
if (isQris && QRCode && qr && qr.payload) {
const url = await QRCode.toDataURL(qr.payload, { errorCorrectionLevel: 'M', margin: 1, width: 520 });
const buf = Buffer.from(String(url).split(',')[1], 'base64');

5
services/invoiceQrisService.js
View File

@@ -30,11 +30,10 @@ function isQrisAmountTaken(amount, opts = {}) {
return false;
}
function ensureInvoiceQris(inv, baseAmountOverride) {
function ensureInvoiceQris(inv) {
const settings = getSettings() || {};
const invId = Number((inv && inv.id) || 0);
// baseAmountOverride dipakai bila nominal QRIS = total beberapa tagihan
const base = Number(baseAmountOverride || (inv && inv.amount) || 0);
const base = Number((inv && inv.amount) || 0);
if (!invId || base <= 0) return { uniqueCode: 0, amount: base, payload: '' };
let code = Number(inv.qris_unique_code || 0);