From c56c08f31120aa6a19074ce3c9b4b455299c8c05 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 7 Aug 2022 13:34:07 -0400 Subject: [PATCH] fix --- wrenchboard/src/include/wrenchboard_api.h | 1 + wrenchboard/src/shared_tool/account.cc | 64 ++++++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index bace9180..9358afc6 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -189,6 +189,7 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_ACCOUNT_WALLETS 11060 #define WRENCHBOARD_ACCOUNT_PREPARE_TOPUP 11062 +#define WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP 11063 #define WRENCHBOARD_USER_DELETEACC 11990 #define WRENCHBOARD_ACCOUNT_END 11999 diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 6bfe52d9..9152544c 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -114,6 +114,7 @@ long WrenchBoardMobileSendJobInterest(CVars in, CVars &out); long WrenchReturnPendingJobList(CVars in, CVars &out); long WrenchBoardMobileSendUserWallet(CVars in, CVars &out); long WrenchBoardStartBalanceTopup(CVars in, CVars &out); +long WrenchBoardCompleteBalanceTopup(CVars in, CVars &out); long test() { FILE* oldFile = Output2FILE::Stream(); @@ -358,6 +359,10 @@ long account_calls(CVars in, CVars &out) { return WrenchBoardStartBalanceTopup(in, out); break; + case WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP: + logfmt(logINFO, "/WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP()"); + return WrenchBoardCompleteBalanceTopup(in, out); + break; case WRENCHBOARD_USER_DELETEACC: REQ_LONG(in, "member_id", 1, -1); REQ_STRING(in, "reason", 2, 149, "(.*)"); @@ -378,10 +383,67 @@ long account_calls(CVars in, CVars &out) { #define PHP_API_TRANSFER_COMPLETE 200 +long WrenchBoardCompleteBalanceTopup(CVars in, CVars &out){ + logfmt(logINFO, "WrenchBoardStartBalanceTopup()"); + long trx_id = 0; + try { + REQ_STRING(in, "tx_ref", 2, 50, "(.*)"); + REQ_STRING(in, "transaction_id", 2, 50, "(.*)"); + REQ_STRING(in, "status", 2, 50, "(.*)"); + + /* + + $in['tx_ref'] = $this->input->get('tx_ref'); + $in['transaction_id'] = $this->input->get('transaction_id'); + $in['status'] = $this->input->get('status'); + + */ + + out["status"] = "OK"; + } catch (bad_parameter) { + logfmt(logINFO, "ERROR CALL long WrenchBoardStartBalanceTopup(CVars in, CVars &out)"); + } + return trx_id; +} + long WrenchBoardStartBalanceTopup(CVars in, CVars &out){ logfmt(logINFO, "WrenchBoardStartBalanceTopup()"); + long trx_id = 0; +/* +$data['tx_ref'] = 'wrench-'.rand(1000000000,9999999999); + $data['currency'] = "NGN"; + $data['customer_email'] = $_SESSION['username']; + $data['customer_phone_number'] = ''; + $data['customer_name'] = $_SESSION['firstname'].' '.$_SESSION['lastname']; + $data['consumer_id'] = $_SESSION['member_id']; + $data['consumer_mac'] = $_SESSION['member_id']."-912ba-1192a"; + $data['redirect_url'] = base_url() . "dash"; //"https://oameye.work.wrenchboard.com/dash"; + $data['public_key'] = "FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X"; +*/ - return 0; + try { + REQ_LONG(in, "member_id", 1, -1); + REQ_LONG(in, "amount", 1, -1); + REQ_STRING(in, "currency", 2, 10, "(.*)"); + CVars x; + x["member_id"] = in["member_id"]; + x["member_id"].set_valid(true); + x["amount"] = in["amount"]; + x["amount"].set_valid(true); + x["currency"] = in["currency"]; + x["currency"].set_valid(true); + + trx_id = insert_db_record(DBS_VALID, "flutterwave_payments", "flutterwave_payments_id_seq", x); + + if (trx_id > 0) { + load_db_record(out, "SELECT fp.member_id AS consumer_id,fp.tx_ref,fp.tx_ref,fp.currency,m.phone,m.uid AS consumer_mac " \ + "FROM flutterwave_payments fp LEFT JOIN members m ON m.id=fp.member_id WHERE fp.id =%lu",trx_id); + } + out["status"] = "OK"; + } catch (bad_parameter) { + logfmt(logINFO, "ERROR CALL long WrenchBoardStartBalanceTopup(CVars in, CVars &out)"); + } + return trx_id; } long WrenchBoardMobileSendUserWallet(CVars in, CVars &out) { logfmt(logINFO, "WrenchBoardMobileSendUserWallet()");