// Remember row count in constant
$content['rowspan'] = ($numDepths * 2 + 15);
-// Init some vars...
-$content['total_points'] = '0';
-$content['total_referals'] = '0';
-$content['total_locked'] = '0';
+// Initialize array elements
+$content['part_points'] = '0.00000';
+$content['part_referals'] = '0';
+$content['part_locked'] = '0.00000';
+$content['part_order'] = '0.00000';
+$content['part_locked_order'] = '0.00000';
+$content['counter'] = '0';
+$content['points'] = '0.00000';
+$content['order_points'] = '0.00000';
+$content['locked_points'] = '0.00000';
+$content['locked_order_points'] = '0.00000';
+
+// And output variable
$OUT = '';
// Load ref levels
// Merge it together
$content = merge_array($content, $data);
- // Initialize array elements
- $content['counter'] = '0';
- $content['points'] = '0.00000';
- $content['locked_points'] = '0.00000';
-
// Load referal points
$result_points = SQL_QUERY_ESC("SELECT
p.`points`,
+ p.`order_points`,
p.`locked_points`,
+ p.`locked_order_points`,
r.`counter`
FROM
`{?_MYSQL_PREFIX?}_user_points` AS p
-INNER JOIN
+LEFT JOIN
`{?_MYSQL_PREFIX?}_refsystem` AS r
ON
p.`userid`=r.`userid` AND
p.`ref_depth`=r.`level`
WHERE
p.`userid`=%s AND
- p.`ref_depth`='%s'
+ p.`ref_depth`=%s
LIMIT 1",
array(
getMemberId(),
$content = merge_array($content, SQL_FETCHARRAY($result_points));
// Add all entries
- $content['total_points'] += $content['points'];
- $content['total_locked'] += $content['locked_points'];
- $content['total_referals'] += $content['counter'];
+ $content['part_points'] += $content['points'];
+ $content['part_order'] += $content['order_points'];
+ $content['part_locked'] += $content['locked_points'];
+ $content['part_locked_order'] += $content['locked_order_points'];
+ $content['part_referals'] += $content['counter'];
} // END - if
// Free result
$content['rows'] = $OUT;
// Remember several values in constants
-$content['total_points'] = ($content['total_points'] - getUserData('used_points'));
+$content['total_points'] = $content['part_points'] - getUserData('used_points') + $content['part_order'];
// Fixes a bug when there is no bonus extension installed
if (isExtensionInstalledAndOlder('bonus', '0.4.4')) {
// Display login bonus and turbo-click bonus
if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (isBonusRallyeActive())) {
// Total bonus points
- $content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
+ $content['bonus_total_points'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
// Output rows
$content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
if (isExtensionActive('payout')) {
// Payput extension is installed and active so we can check if the user has enougth points
- outputPayoutList($content['total_points'] - getUserData('used_points'));
+ outputPayoutList($content['part_points'] - getUserData('used_points'));
} // END - if
// [EOF]