diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 8446a00d..b9040b89 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -250,6 +250,8 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_MOBILE_TASKMESSAGE 15047 #define WRENCHBOARD_MOBILE_SENDTASKMESSAGE 15048 +#define WRENCHBOARD_MOBILE_PURCHASEHX 15049 + #define WRENCHBOARD_MOBILE_END 15999 //************************************************************** diff --git a/wrenchboard/src/shared_tool/history.cc b/wrenchboard/src/shared_tool/history.cc index ab8760a4..e50c8e65 100644 --- a/wrenchboard/src/shared_tool/history.cc +++ b/wrenchboard/src/shared_tool/history.cc @@ -31,11 +31,11 @@ long WrenchPurchaseHx( CVars in, CVars &out ) out["total_record"] = "0"; const PGresult *res; - res = pgsql_query("SELECT added::date AS added_date," \ - " (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 " \ - "FROM members_payments " \ + res = pgsql_query("SELECT id, uid,added::date AS added_date," + " (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 " + "FROM members_payments " "WHERE member_id = %lu AND status = 1 ORDER BY id DESC LIMIT %lu",member_id,limit); if (res != NULL && pgsql_num_rows(res) > 0) { @@ -63,8 +63,11 @@ long WrenchPurchaseHx( CVars in, CVars &out ) snprintf(vname, sizeof (vname), "confirmation_%05d", i); out[vname] = rec["confirmation"]; - snprintf(vname, sizeof (vname), "card_icon_%05d", i); - out[vname] = rec["card_icon"]; + snprintf(vname, sizeof (vname), "id_%05d", i); + out[vname] = rec["id"]; + + snprintf(vname, sizeof (vname), "uid_%05d", i); + out[vname] = rec["uid"]; } } diff --git a/wrenchboard/src/shared_tool/mobile.cc b/wrenchboard/src/shared_tool/mobile.cc index ad732c51..15b4744c 100644 --- a/wrenchboard/src/shared_tool/mobile.cc +++ b/wrenchboard/src/shared_tool/mobile.cc @@ -11,6 +11,7 @@ #include "pgsql_wrapper.h" #include #include "account.h" +#include "history.h" #include "account_mngt.h" #include "contract.h" @@ -44,7 +45,9 @@ long mobile_calls(CVars in, CVars &out) { case WRENCHBOARD_MOBILE_PAYMENTHX: return WrenchReturnMemberPaymentHx( in, out); break; - + case WRENCHBOARD_MOBILE_PURCHASEHX: + return WrenchPurchaseHx( in, out); + break; case WRENCHBOARD_MOBILE_TASKMESSAGE: return WrenchReturnTaskMessage( in, out); break; diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index b5fc8aeb..7cd59fe8 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -241,8 +241,7 @@ define('WRENCHBOARD_MOBILE_MESSAGE', 15045); define('WRENCHBOARD_MOBILE_PAYMENTHX', 15046); define('WRENCHBOARD_MOBILE_TASKMESSAGE', 15047); define('WRENCHBOARD_MOBILE_SENDTASKMESSAGE', 15048); - - +define('WRENCHBOARD_MOBILE_PURCHASEHX', 15049); define('WRENCHBOARD_SMONEY_ADDRECIPIENT', 33010); diff --git a/www-api/public/svs/constants.php b/www-api/public/svs/constants.php index 19821bb0..fd4c1746 100755 --- a/www-api/public/svs/constants.php +++ b/www-api/public/svs/constants.php @@ -144,6 +144,7 @@ define('WRENCHBOARD_MOBILE_MESSAGE', 15045); define('WRENCHBOARD_MOBILE_PAYMENTHX', 15046); define('WRENCHBOARD_MOBILE_TASKMESSAGE', 15047); define('WRENCHBOARD_MOBILE_SENDTASKMESSAGE', 15048); +define('WRENCHBOARD_MOBILE_PURCHASEHX', 15049); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 7748891d..3dee857b 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -25,6 +25,7 @@ $endpoints = array( 'message' => array('POST'), 'pendingjob' => array('POST'), 'paymenthx' => array('POST'), + 'purchasehx' => array('POST'), 'getjob' => array('POST'), 'mybanklist' => array('POST'), 'sendmoney' => array('POST'), @@ -235,10 +236,10 @@ switch ($endpoint) { case 'activejoblist': $in["action"] = WRENCHBOARD_MOBILE_ACTIVEJOB; break; case 'message': $in["action"] = WRENCHBOARD_MOBILE_MESSAGE; - break; case 'paymenthx': $in["action"] = WRENCHBOARD_MOBILE_PAYMENTHX; - + break; + case 'purchasehx': $in["action"] = WRENCHBOARD_MOBILE_PURCHASEHX; break; case 'getjobsdata': $in["action"] = WRENCHBOARD_ACCOUNT_JOBLIST; break;