X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=ba12785779e0d203a637d3240792a3f3711b09c5;hb=4cec044b57773e28423261c71f918f3e22ca8a75;hp=120c40a65078ede93c35bd07670acf36c781ae05;hpb=455f56ecb794f44ca49b8beb511ce1ad24181398;p=mailer.git diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 120c40a650..ba12785779 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -1,7 +1,7 @@ = min_points -ORDER BY type ASC", + $result = SQL_QUERY_ESC("SELECT + `id`, `type`, `rate`, `min_points`, `allow_url` +FROM + `{?_MYSQL_PREFIX?}_payout_types` +WHERE + %s >= `min_points` +ORDER BY + `type` ASC", array($totalPoints), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Free memory @@ -109,7 +113,7 @@ WHERE p.userid = %s ORDER BY p.payout_timestamp DESC", - array(getUserId()), __FILE__, __LINE__); + array(getMemberId()), __FILE__, __LINE__); if (SQL_NUMROWS($result_payouts) > 0) { // List all his requests $OUT = ''; $SW = 2; @@ -136,14 +140,13 @@ ORDER BY } // Prepare data for the template - // @TODO Rewritings: acc->target_account,bank->target_bank in templates $content = array( - 'sw' => $SW, - 'acc' => $content['target_account'], - 'points' => translateComma($content['payout_total']) . ' ' . $content['type'], - 'bank' => $content['target_bank'], - 'stamp' => generateDateTime($content['payout_timestamp'], 2), - 'status' => $content['status'] + 'sw' => $SW, + 'target_account' => $content['target_account'], + 'points' => translateComma($content['payout_total']) . ' ' . $content['type'], + 'target_bank' => $content['target_bank'], + 'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2), + 'status' => $content['status'] ); // Load row template and switch colors @@ -160,6 +163,9 @@ ORDER BY // Output payout list outputPayoutList($totalPoints); + } else { + // No payout types setup + loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES')); } } else { // Chedk if he can get paid by selected type @@ -167,15 +173,15 @@ ORDER BY array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { - // ID is valid so load the data + // id is valid so load the data $content = SQL_FETCHARRAY($result); // Calculate maximum value $max = round($totalPoints * $content['rate'] - 0.5); - $PAY_MAX = 0; + $PAY_MAX = '0'; // Calulcate points from submitted amount - $points = 0; + $points = '0'; if (isPostRequestElementSet('payout')) { $points = bigintval(postRequestElement('payout')) / $content['rate']; $PAY_MAX = $max / $content['rate']; @@ -190,7 +196,7 @@ ORDER BY setRequestPostElement('type' , $content['type']); // Subtract points from member's account - subtractPoints('payout', getUserId(), $points); + subtractPoints('payout', getMemberId(), $points); // Add entry to his tranfer history if ($content['allow'] == 'Y') { @@ -198,7 +204,7 @@ ORDER BY SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`, `payout_total`, `payout_id`, `payout_timestamp`, `status`, `target_url`, `link_text`, `banner_url`) VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')", array( - getUserId(), + getMemberId(), bigintval(postRequestElement('payout')), bigintval(getRequestElement('payout')), postRequestElement('turl'), @@ -207,18 +213,18 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')", ), __FILE__, __LINE__); // Load templates - $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getUserId()); + $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId()); if (getExtensionVersion('admins') >= '0.4.1') { $adm_tpl = 'admin_payout_request_banner'; } else { - $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getUserId()); + $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId()); } } else { // e-currency payout requested SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`, `payout_total`, `target_account`, `target_bank`, `payout_id`, `payout_timestamp`, `status`, `password`) VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", array( - getUserId(), + getMemberId(), bigintval(postRequestElement('payout')), bigintval(postRequestElement('account')), postRequestElement('bank'), @@ -227,8 +233,8 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", ), __FILE__, __LINE__); // Load templates - $message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getUserId()); - $message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getUserId()); + $message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getMemberId()); + $message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getMemberId()); $admin_tpl = ''; // @TODO Rewrite this to a filter @@ -238,13 +244,13 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", } // Generate task - createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getUserId()); + createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getMemberId()); // Send out mails - sendEmail(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem); + sendEmail(getMemberId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem); // To admin(s) - sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getUserId()); + sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId()); // Load template and output it loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT')); @@ -274,7 +280,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH')); } } else { - // ID is invalid + // id is invalid loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID')); }