diff --git a/wrenchboard/src/shared_tool/account_mngt.cc b/wrenchboard/src/shared_tool/account_mngt.cc index 3b012c20..52337894 100644 --- a/wrenchboard/src/shared_tool/account_mngt.cc +++ b/wrenchboard/src/shared_tool/account_mngt.cc @@ -295,12 +295,13 @@ 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||'
Acc:'||r.account_no||'-'||b.name AS recipient,mp.confirmation," + " r.firstname||' '||r.lastname||'
Acc:'||r.account_no||'-'||b.name AS recipient,mp.confirmation, c.code, c.description, 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 " " LEFT JOIN bank_entity_codes b ON b.code = r.bank_code " " LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id " + " LEFT JOIN currency c ON c.country=m.terminatingcountrycode " " WHERE m.member_id =%lu AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT %lu", in["member_id"].Long(),limit); if (res != NULL && pgsql_num_rows(res) > 0) { @@ -312,6 +313,16 @@ long WrenchReturnMemberPaymentHx(CVars in, CVars &out) { CVars rec; map_to_cvars(f, rec); + + 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), "symbol_%05d", i); + out[vname] = rec["symbol"]; + snprintf(vname, sizeof (vname), "trx_date_%05d", i); out[vname] = rec["trx_date"]; diff --git a/wrenchboard/src/shared_tool/history.cc b/wrenchboard/src/shared_tool/history.cc index b8a893d4..bef3f210 100644 --- a/wrenchboard/src/shared_tool/history.cc +++ b/wrenchboard/src/shared_tool/history.cc @@ -113,7 +113,7 @@ long WrenchPurchaseHx( CVars in, CVars &out ) out["total_record"] = "0"; const PGresult *res; - res = pgsql_query("SELECT id, uid,added::date AS added_date," + res = pgsql_query("SELECT id, uid,added::date AS added_date,currency," " (CASE WHEN code ='MNCCD' THEN 'New Card Payment' " "WHEN code ='MRCCD' THEN 'Repeat Card Payment' " "ELSE '' END) AS description,amount*0.01 AS amount,fee*0.01 as fee,confirmation " @@ -129,6 +129,9 @@ long WrenchPurchaseHx( CVars in, CVars &out ) CVars rec; map_to_cvars(f, rec); + snprintf(vname, sizeof (vname), "currency_%05d", i); + out[vname] = rec["currency"]; + snprintf(vname, sizeof (vname), "added_date_%05d", i); out[vname] = rec["added_date"]; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index e8756a07..e4bf6a3d 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -841,7 +841,8 @@ class ResultFormatter extends Model "status" => $out["status_${key}"], "added_date" => $out["added_date_${key}"], "payment_id" => $out["id_${key}"], - "payment_uid" => $out["uid_${key}"] + "payment_uid" => $out["uid_${key}"], + "currency"=> $out["currency_${key}"], ); } break;