WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

currency

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-10-09 09:25:49 -04:00
parent a5c7098760
commit 3b12450fd3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/src/shared_tool/account_mngt.cc
+3 -3
View File
@@ -295,7 +295,7 @@ long WrenchReturnMemberPaymentHx(CVars in, CVars &out) {
const PGresult *res;
res = pgsql_query("SELECT m.added::date AS trx_date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, m.id AS trx_id,"
" r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS recipient,mp.confirmation, c.code, c.description, c.symbol,"
" r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS recipient,mp.confirmation, c.code, c.description AS currency, c.symbol,"
" CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS status "
" FROM money_transfer m "
" LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
@@ -317,8 +317,8 @@ long WrenchReturnMemberPaymentHx(CVars in, CVars &out) {
snprintf(vname, sizeof (vname), "code_%05d", i);
out[vname] = rec["code"];
snprintf(vname, sizeof (vname), "description_%05d", i);
out[vname] = rec["description"];
snprintf(vname, sizeof (vname), "currency_%05d", i);
out[vname] = rec["currency"];
snprintf(vname, sizeof (vname), "symbol_%05d", i);
out[vname] = rec["symbol"];
www-api/app/Models/ResultFormatter.php
+4 -1
View File
@@ -820,7 +820,10 @@ class ResultFormatter extends Model
"confirmation" => $out["confirmation_${key}"],
"status" => $out["status_${key}"],
"trx_date" => $out["trx_date_${key}"],
"trx_id" => $out["trx_id_${key}"]
"trx_id" => $out["trx_id_${key}"],
"code" => $out["code_${key}"],
"currency" => $out["currency_${key}"],
"symbol" => $out["symbol_${key}"]
);
}
break;