diff --git a/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile b/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile index 21d750d2..321d572c 100644 --- a/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile +++ b/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile @@ -10,7 +10,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show body {margin: 0; padding: 0; min-width: 100%!important;} img {height: auto;} .content {width: 100%; max-width: 600px;} - .header {padding: 40px 30px 20px 30px;} + .header {padding: 20px 30px 20px 20px;} .innerpadding {padding: 30px 30px 30px 30px;} .borderbottom {border-bottom: 1px solid #f2eeed;} .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;} @@ -32,11 +32,6 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; background: #2f3942; border-radius: 5px; text-decoration: none!important; font-weight: bold;} } - /*@media only screen and (min-device-width: 601px) { - .content {width: 600px !important;} - .col425 {width: 425px!important;} - .col380 {width: 380px!important;} - }*/ @@ -53,42 +48,20 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show @@ -101,7 +74,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
- - - - -
- WrenchBoard -
- - - - - -
- +
- -
- {{site_name}} + + WrenchBoard
+ {{site_trade_name}}
-
- +
- {{send_firstname}} {{send_lastname}} will like to share {{site_name}}!. {{site_name}} connects your skills with people that need your service and also allow you to find people that can assist you on those jobs you need hands on. + {{send_firstname}} {{send_lastname}} will like to share {{site_name}}!. {{site_name}} connects your skills with people that need your service and also allow you to find people that can assist you on those jobs you need hands on.
@@ -112,7 +85,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
- +
@@ -127,7 +100,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show @@ -136,7 +109,7 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show
- Invitation Link :
https://{{server_name}}/invite?refer_link={{refer_link}} + Invitation Link :
{{server_name}}/invite?refer_link={{refer_link}}
- Invitation Link + Invitation Link
@@ -155,12 +128,12 @@ Subject: {{site_name}} - {{send_firstname}} {{send_lastname}} will like to show - + - -With {{site_name}}, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge. + + @@ -175,8 +148,8 @@ With {{site_n @@ -185,12 +158,12 @@ With {{site_n @@ -209,9 +182,6 @@ With {{site_n
- ® {{site_name}} 2017
- You received this email because a subscriber, {{send_firstname}} {{send_lastname}}, to {{site_name}} refer you, . If you get this email in error, please contact us. + ® {{site_name}} {{yyyy}}
+ You received this email because a subscriber, {{send_firstname}} {{send_lastname}}, to {{site_name}} refer you, . If you get this email in error, please contact us.
- Facebook + Facebook - Twitter + Twitter
- - - diff --git a/wrenchboard/etc/wrenchboard_api.conf b/wrenchboard/etc/wrenchboard_api.conf index 99006ec1..9a3d7a17 100644 --- a/wrenchboard/etc/wrenchboard_api.conf +++ b/wrenchboard/etc/wrenchboard_api.conf @@ -13,6 +13,7 @@ system: site_apple_app = "https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8"; site_andriod_app = "https://play.google.com/store/apps/details?id=com.wrenchboard.users"; upload_size_limit = "3145728"; + server_name = "https://oameye.work.wrenchboard.com"; }; flutterwave: diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 6309885d..7689564d 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -167,6 +167,8 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_SEND_CONTACTUS 11030 #define WRENCHBOARD_ACCOUNT_SENDREFER 11032 #define WRENCHBOARD_ACCOUNT_REFERLINK 11033 +#define WRENCHBOARD_ACCOUNT_REFRESENDLNK 11133 + #define WRENCHBOARD_SESSION_VERIFY 11034 #define WRENCHBOARD_UPDATE_PROFILE 11035 #define WRENCHBOARD_ACCOUNT_TERMS 11036 @@ -174,7 +176,7 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_ACCOUNT_SAVESKILL 11038 #define WRENCHBOARD_ACCOUNT_DELSKILL 11039 -#define WRENCHBOARD_LOG_MEMBER 11040 +#define WRENCHBOARD_LOG_MEMBER 11040 #define WRENCHBOARD_DELETE_RECACC 11041 #define WRENCHBOARD_SAVE_GALLERY 11042 @@ -193,6 +195,8 @@ enum { PARTNER_STRIPE }; #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 51ef8528..acde5025 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -115,6 +115,7 @@ 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 WrenchResendSendReferLoadLink(CVars in, CVars &out); long test() { FILE* oldFile = Output2FILE::Stream(); @@ -258,6 +259,11 @@ long account_calls(CVars in, CVars &out) { case WRENCHBOARD_ACCOUNT_REFERLINK: return WrenchSendReferLoadLink(in, out); break; + + case WRENCHBOARD_ACCOUNT_REFRESENDLNK: + return WrenchResendSendReferLoadLink(in, out); + break; + case WRENCHBOARD_SESSION_VERIFY: return VerifySession(in, out); break; @@ -1136,6 +1142,27 @@ long WrenchUpdateProfile(CVars in, CVars &out) { return ret; } +long WrenchResendSendReferLoadLink(CVars in, CVars &out) { + logfmt(logINFO, "long WrenchResendSendReferLoadLink(CVars in, CVars out)"); + long ret = PHP_API_BAD_PARAM; + try { + REQ_STRING(in, "uid", 3, 45, "(.*)"); + if (load_db_record(out, "SELECT id AS refer_id, * FROM members_refer_friend WHERE status<>5 AND uid ='%s'", in["uid"].c_str()) > 0) + { + in["refer_id"] = out["refer_id"]; + in["refer_id"].set_valid(true); + account_email(ACCOUNT_SEND_REFEREMAIL, in, out); + out["status"] = "Refer message sent"; + ret = PHP_API_OK; + } + + } catch (bad_parameter) { + out["status"] = "Invalid Parameters"; + } + logfmt(logINFO, "/long WrenchResendSendReferLoadLink(CVars in, CVars out)"); + return ret; +} + long WrenchSendReferLoadLink(CVars in, CVars &out) { logfmt(logINFO, "long WrenchSendReferLoadLink(CVars in, CVars out)"); long ret = PHP_API_BAD_PARAM; diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 85704cb5..9bfc29a0 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -283,7 +283,9 @@ long account_email(long mailtype, CVars in, CVars &out) { const PGresult *res; bool exclude_email = true; char * server_name = getenv("SERVER_NAME"); - form.LetStr("server_name", "https://dashboard.wrenchboard.com"); + + out["server_name"] = CfgReadChar("system.server_name"); + form.LetStr("server_name", out["server_name"].c_str()); form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); @@ -297,7 +299,7 @@ long account_email(long mailtype, CVars in, CVars &out) { case ACCOUNT_SEND_REFEREMAIL: REQ_LONG(in, "refer_id", 1, -1); - if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) { + if (load_db_record(x, "SELECT r.*,m.firstname AS send_firstname,m.lastname AS send_lastname,date_part('year',now()) AS yyyy FROM members_refer_friend r LEFT JOIN members m ON m.id = r.member_id WHERE r.id = %lu ", in["refer_id"].Long())) { vars2form(x, form); form.LetStr("email", x["email"].c_str()); form.Email("ACCOUNT/member_refer_individual.mailfile"); @@ -333,7 +335,7 @@ long account_email(long mailtype, CVars in, CVars &out) { if (!exclude_email && load_db_record(x, "SELECT *,email as email2,to_char(last_login, 'Day Mon dd, yyyy HH:MI AM') AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { - in["server_name"] = "https://dashboard.wrenchboard.com"; + //in["server_name"] = "https://dashboard.wrenchboard.com"; int c = 0; @@ -361,7 +363,7 @@ long account_email(long mailtype, CVars in, CVars &out) { CVars rec; map_to_cvars(f, rec); - sprintf(listing_items, "%s - %s
Duration:%s Day(s)", in["color"].c_str(), in["server_name"].c_str(), rec["offer_code"].c_str(), rec["title"].c_str(), rec["description"].c_str(), rec["timeline_days"].c_str()); + sprintf(listing_items, "%s - %s
Duration:%s Day(s)", in["color"].c_str(), out["server_name"].c_str(), rec["offer_code"].c_str(), rec["title"].c_str(), rec["description"].c_str(), rec["timeline_days"].c_str()); inv_list->LetStr("pin", listing_items); inv_list->CloseElement(); //
@@ -387,7 +389,7 @@ long account_email(long mailtype, CVars in, CVars &out) { " FROM password_reset p " " LEFT JOIN members m ON m.id =p.member_id WHERE p.id = %lu ", in["password_reset_id"].Long())) { vars2form(x, form); - form.LetStr("server_name", server_name); + form.LetStr("server_name", out["server_name"].c_str()); form.Email("ACCOUNT/member_resetpass.mailfile"); } break; @@ -436,8 +438,11 @@ long job_email(long mailtype, CVars in, CVars &out) { char listing_items[1024]; const PGresult *res; - char * server_name = getenv("SERVER_NAME"); - form.LetStr("server_name", server_name); + char * server_name; // = getenv("SERVER_NAME"); + out["server_name"] = CfgReadChar("system.server_name"); + sprintf(server_name, "%s", out["server_name"].c_str()); + form.LetStr("server_name", out["server_name"].c_str()); + form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); switch (mailtype) { @@ -719,8 +724,11 @@ long sendmoney_email(long mailtype, CVars in, CVars &out) { CVars x, y, z; C_CGI_Form form("", ""); - char * server_name = getenv("SERVER_NAME"); - form.LetStr("server_name", server_name); + char * server_name; // = getenv("SERVER_NAME"); + out["server_name"] = CfgReadChar("system.server_name"); + sprintf(server_name, "%s", out["server_name"].c_str()); + form.LetStr("server_name", out["server_name"].c_str()); + form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities");