Version 4.7.13

This commit is contained in:
Neo committed 2025-12-19 16:14:56 -08:00
1 parent fd22d99e69
commit 7124a02564
954 files changed
+29277 -59308

No files matched your search

@@ -72,109 +72,12 @@ class _income extends \IPS\Dispatcher\Controller
$tabs[ $currency ] = \IPS\Member::loggedIn()->language()->addToStack( 'nexus_report_income_by_method', FALSE, array( 'sprintf' => array( $currency ) ) );
}
$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'totals';
\IPS\Request::i()->tab ??= 'totals';
$activeTab = ( 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',
't_date',
'',
array(
'backgroundColor' => '#ffffff',
'colors' => array( '#10967e', '#ea7963', '#de6470', '#6b9dde', '#b09be4', '#eec766', '#9fc973', '#e291bf', '#55c1a6', '#5fb9da' ),
'hAxis' => array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
'lineWidth' => 1,
'areaOpacity' => 0.4
),
( \IPS\Request::i()->tab == 'members' ) ? 'PieChart' : 'AreaChart',
'monthly',
array( 'start' => 0, 'end' => 0 ),
array(),
$activeTab
);
$chart->where[] = array( '( t_status=? OR t_status=? ) AND t_method>0', \IPS\nexus\Transaction::STATUS_PAID, \IPS\nexus\Transaction::STATUS_PART_REFUNDED );
if ( $activeTab === 'totals' )
{
$chart->groupBy = 't_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 );
$chart->groupBy = 't_method';
$chart->format = $activeTab;
foreach ( \IPS\nexus\Gateway::roots() as $gateway )
{
$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 );
}
);
$extension = \IPS\core\Statistics\Chart::loadFromExtension( 'nexus', 'Income' );
$chart = $extension->getChart( \IPS\Http\Url::internal( 'app=nexus&module=reports&controller=income&tab=' . $activeTab ) );
$extension->setExtra( $chart, $activeTab );
if ( \IPS\Request::i()->isAjax() )
{