Version 4.3.0

applications/nexus/modules/admin/reports/income.php

@@ -41,14 +41,29 @@ class _income extends \IPS\Dispatcher\Controller
 	 */
 	protected function manage()
 	{
-		$tabs['totals'] = 'nexus_report_income_totals';
-		foreach ( \IPS\nexus\Money::currencies() as $currency )
+		$currencies = \IPS\nexus\Money::currencies();
+
+		$tabs = array( 'totals' => 'nexus_report_income_totals' );
+
+		if( count( $currencies ) == 1 )
+		{
+			$tabs['members'] = 'nexus_report_income_members';
+		}
+		else
+		{
+			foreach ( $currencies as $currency )
+			{
+				$tabs[ 'members_' . $currency ] = \IPS\Member::loggedIn()->language()->addToStack( 'nexus_report_income_by_member', NULL, array( 'sprintf' => array( $currency ) ) );
+			}
+		}
+
+		foreach ( $currencies as $currency )
 		{
 			$tabs[ $currency ] = \IPS\Member::loggedIn()->language()->addToStack( 'nexus_report_income_by_method', NULL, array( 'sprintf' => array( $currency ) ) );
 		}
 		
 		$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'totals';
-				
+
 		$chart = new \IPS\Helpers\Chart\Database(
 			\IPS\Http\Url::internal( 'app=nexus&module=reports&controller=income&tab=' . $activeTab ),
 			'nexus_transactions',
@@ -61,7 +76,7 @@ class _income extends \IPS\Dispatcher\Controller
 				'lineWidth'			=> 1,
 				'areaOpacity'		=> 0.4,
 			),
-			'AreaChart',
+			( \IPS\Request::i()->tab == 'members' ) ? 'PieChart' : 'AreaChart',
 			'monthly',
 			array( 'start' => 0, 'end' => 0 ),
 			array(),
@@ -73,11 +88,30 @@ class _income extends \IPS\Dispatcher\Controller
 		{
 			$chart->groupBy = 't_currency';
 			
-			foreach ( \IPS\nexus\Money::currencies() as $currency )
+			foreach ( $currencies as $currency )
 			{
 				$chart->addSeries( $currency, 'number', 'SUM(t_amount)-SUM(t_partial_refund)', TRUE, $currency );
 			}
 		}
+		elseif( mb_strpos( $activeTab, 'members' ) === 0 )
+		{
+			$chart->groupBy = 't_member';
+
+			if( count( $currencies ) === 1 )
+			{
+				$chart->format = array_pop( $currencies );
+			}
+			else
+			{
+				$chart->format	= mb_substr( $activeTab, 8 );
+				$chart->where[]	= array( 't_currency=?', $chart->format );
+			}
+			
+			foreach ( \IPS\Db::i()->select( 't_member, SUM(t_amount)-SUM(t_partial_refund) as _amount', 'nexus_transactions', $chart->where, '_amount DESC', array( 0, 20 ), 't_member' ) as $member )
+			{
+				$chart->addSeries( \IPS\Member::load( $member['t_member'] )->name, 'number', 'SUM(t_amount)-SUM(t_partial_refund)', TRUE, $member['t_member'] );
+			}
+		}
 		else
 		{
 			$chart->where[] = array( 't_currency=?', $activeTab );
@@ -89,6 +123,48 @@ class _income extends \IPS\Dispatcher\Controller
 				$chart->addSeries( $gateway->_title, 'number', 'SUM(t_amount)-SUM(t_partial_refund)', TRUE, $gateway->id );
 			}
 		}
+
+		$chart->tableInclude = array( 't_id', 't_member', 't_invoice', 't_method', 't_amount', 't_date' );
+		$chart->tableParsers = array(
+			't_member'	=> function( $val ) {
+				return \IPS\Theme::i()->getTemplate('global', 'nexus')->userLink( \IPS\Member::load( $val ) );
+			},
+			't_method'	=> function( $val ) {
+				if ( $val )
+				{
+					try
+					{
+						return \IPS\nexus\Gateway::load( $val )->_title;
+					}
+					catch ( \OutOfRangeException $e )
+					{
+						return '';
+					}
+				}
+				else
+				{
+					return \IPS\Member::loggedIn()->language()->addToStack('account_credit');
+				}
+			},
+			't_amount'	=> function( $val, $row )
+			{
+				return (string) new \IPS\nexus\Money( $val, $row['t_currency'] );
+			},
+			't_invoice'	=> function( $val )
+			{
+				try
+				{
+					return \IPS\Theme::i()->getTemplate('invoices', 'nexus')->link( \IPS\nexus\Invoice::load( $val ) );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					return '';
+				}
+			},
+			't_date'	=> function( $val ) {
+				return \IPS\DateTime::ts( $val );
+			}
+		);
 		
 		if ( \IPS\Request::i()->isAjax() )
 		{

applications/nexus/modules/admin/reports/markets.php

@@ -56,7 +56,7 @@ class _markets extends \IPS\Dispatcher\Controller
 			'',
 			array(
 				'backgroundColor' 	=> '#ffffff',
-				'colors'			=> array( '#10967e', '#ea7963', '#de6470', '#6b9dde', '#b09be4', '#eec766', '#9fc973', '#e291bf', '#55c1a6', '#5fb9da' ),
+				'colors'			=> array( '#c9e2de', '#10967e' ),
 				'hAxis'				=> array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
 				'lineWidth'			=> 1,
 				'areaOpacity'		=> 0.4,

applications/nexus/modules/admin/reports/purchases.php

@@ -56,6 +56,18 @@ class _purchases extends \IPS\Dispatcher\Controller
 		);
 		$chart->where[] = array( 'ps_app=? AND ps_type=?', 'nexus', 'package' );
 		$chart->groupBy = 'ps_item_id';
+		$chart->tableInclude	= array( 'ps_id', 'ps_member', 'ps_name', 'ps_start', 'ps_expire' );
+		$chart->tableParsers	= array( 
+			'ps_member' => function( $val ) {
+				return \IPS\Theme::i()->getTemplate('global', 'nexus')->userLink( \IPS\Member::load( $val ) );
+			},
+			'ps_start'	=> function( $val ) {
+				return \IPS\DateTime::ts( $val );
+			},
+			'ps_expire'	=> function( $val ) {
+				return $val ? \IPS\DateTime::ts( $val ) : '';
+			}
+		);
 		
 		$packages = array();
 		foreach ( \IPS\Db::i()->select( 'p_id', 'nexus_packages' ) as $packageId )