Version 5.0.0 beta 1

This commit is contained in:
Neo committed 2025-12-19 16:27:35 -08:00
1 parent 25ddeb65d6
commit 15c7beabc5
6736 files changed
+627902 -497943

No files matched your search

@@ -11,36 +11,53 @@
namespace IPS\nexus\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\DateTime;
use IPS\Db;
use IPS\Helpers\Chart;
use IPS\Helpers\Chart\Database;
use IPS\Http\Url;
use IPS\Member;
use IPS\nexus\Gateway;
use IPS\nexus\Invoice;
use IPS\nexus\Money;
use IPS\nexus\Transaction;
use IPS\Request;
use IPS\Theme;
use OutOfRangeException;
use function count;
use function defined;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Income extends \IPS\core\Statistics\Chart
class Income extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'nexus_reports_income_totals';
public ?string $controller = 'nexus_reports_income_totals';
/**
* @brief Identifier
*/
protected $_identifier = 'totals';
protected string $_identifier = 'totals';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
* @param Url $url URL the chart is being shown on.
* @return Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
public function getChart( Url $url ): Chart
{
$chart = new \IPS\Helpers\Chart\Database(
$chart = new Database(
$url,
'nexus_transactions',
't_date',
@@ -52,54 +69,54 @@ class _Income extends \IPS\core\Statistics\Chart
'lineWidth' => 1,
'areaOpacity' => 0.4
),
( \IPS\Request::i()->tab == 'members' ) ? 'PieChart' : 'AreaChart',
( Request::i()->tab == 'members' ) ? 'PieChart' : 'AreaChart',
'monthly',
array( 'start' => 0, 'end' => 0 ),
array(),
$this->_identifier
);
$chart->setExtension( $this );
$chart->where[] = array( '( t_status=? OR t_status=? ) AND t_method>0', \IPS\nexus\Transaction::STATUS_PAID, \IPS\nexus\Transaction::STATUS_PART_REFUNDED );
$chart->where[] = array( '( t_status=? OR t_status=? ) AND t_method>0', Transaction::STATUS_PAID, Transaction::STATUS_PART_REFUNDED );
$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 ) );
return Theme::i()->getTemplate('global', 'nexus')->userLink( Member::load( $val ) );
},
't_method' => function( $val ) {
if ( $val )
{
try
{
return \IPS\nexus\Gateway::load( $val )->_title;
return Gateway::load( $val )->_title;
}
catch ( \OutOfRangeException $e )
catch ( OutOfRangeException )
{
return '';
}
}
else
{
return \IPS\Member::loggedIn()->language()->addToStack('account_credit');
return Member::loggedIn()->language()->addToStack('account_credit');
}
},
't_amount' => function( $val, $row )
{
return (string) new \IPS\nexus\Money( $val, $row['t_currency'] );
return (string) new Money( $val, $row['t_currency'] );
},
't_invoice' => function( $val )
{
try
{
return \IPS\Theme::i()->getTemplate('invoices', 'nexus')->link( \IPS\nexus\Invoice::load( $val ) );
return Theme::i()->getTemplate('invoices', 'nexus')->link( Invoice::load( $val ) );
}
catch ( \OutOfRangeException $e )
catch ( OutOfRangeException )
{
return '';
}
},
't_date' => function( $val ) {
return \IPS\DateTime::ts( $val );
return DateTime::ts( $val );
}
);
@@ -109,12 +126,13 @@ class _Income extends \IPS\core\Statistics\Chart
/**
* Set Extra
*
* @param \IPS\Helpers\Chart $chart Chart
* @param Chart $chart Chart
* @param string $what What we're setting.
* @return void
*/
public function setExtra( \IPS\Helpers\Chart &$chart, string $what )
public function setExtra( Chart $chart, string $what ) : void
{
$currencies = \IPS\nexus\Money::currencies();
$currencies = Money::currencies();
$this->controller = "nexus_reports_income_{$what}";
$this->_identifier = $what;
@@ -131,7 +149,7 @@ class _Income extends \IPS\core\Statistics\Chart
{
$chart->groupBy = 't_member';
if( \count( $currencies ) === 1 )
if( count( $currencies ) === 1 )
{
$chart->format = array_pop( $currencies );
}
@@ -141,9 +159,9 @@ class _Income extends \IPS\core\Statistics\Chart
$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 )
foreach ( 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'] );
$chart->addSeries( Member::load( $member['t_member'] )->name, 'number', 'SUM(t_amount)-SUM(t_partial_refund)', TRUE, $member['t_member'] );
}
}
else
@@ -152,7 +170,7 @@ class _Income extends \IPS\core\Statistics\Chart
$chart->groupBy = 't_method';
$chart->format = $what;
foreach ( \IPS\nexus\Gateway::roots() as $gateway )
foreach ( Gateway::roots() as $gateway )
{
$chart->addSeries( $gateway->_title, 'number', 'SUM(t_amount)-SUM(t_partial_refund)', TRUE, $gateway->id );
}
@@ -11,36 +11,48 @@
namespace IPS\nexus\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use InvalidArgumentException;
use IPS\GeoLocation;
use IPS\Helpers\Chart;
use IPS\Helpers\Chart\Database;
use IPS\Http\Url;
use IPS\Member;
use IPS\nexus\Invoice;
use IPS\nexus\Money;
use function defined;
use function in_array;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Market extends \IPS\core\Statistics\Chart
class Market extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'nexus_reports_markets_count';
public ?string $controller = 'nexus_reports_markets_count';
/**
* @brief Identifier
*/
protected $_identifier = 'count';
protected string $_identifier = 'count';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
* @param Url $url URL the chart is being shown on.
* @return Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
public function getChart( Url $url ): Chart
{
$chart = new \IPS\Helpers\Chart\Database(
$chart = new Database(
$url,
'nexus_invoices',
'i_paid',
@@ -60,12 +72,12 @@ class _Market extends \IPS\core\Statistics\Chart
);
$chart->setExtension( $this );
$chart->availableTypes = array( 'GeoChart', 'AreaChart', 'LineChart', 'ColumnChart', 'BarChart', 'PieChart' );
$chart->where[] = array( 'i_status=? AND i_billcountry IS NOT NULL', \IPS\nexus\Invoice::STATUS_PAID );
$chart->where[] = array( 'i_status=? AND i_billcountry IS NOT NULL', Invoice::STATUS_PAID );
$chart->groupBy = 'i_billcountry';
foreach ( \IPS\GeoLocation::$countries as $countryCode )
foreach ( GeoLocation::$countries as $countryCode )
{
$chart->addSeries( [ 'value' => \IPS\Member::loggedIn()->language()->get( 'country-' . $countryCode ), 'key' => $countryCode ], 'number', $this->_identifier === 'count' ? 'COUNT(*)' : 'SUM(i_total)', TRUE, $countryCode );
$chart->addSeries( [ 'value' => Member::loggedIn()->language()->get( 'country-' . $countryCode ), 'key' => $countryCode ], 'number', $this->_identifier === 'count' ? 'COUNT(*)' : 'SUM(i_total)', TRUE, $countryCode );
}
if ( $chart->type === 'GeoChart' )
@@ -80,14 +92,15 @@ class _Market extends \IPS\core\Statistics\Chart
/**
* Set Currency
*
* @param \IPS\Helpers\Chart $chart Chart
* @param Chart $chart Chart
* @param string $currency Currency
* @return void
*/
public function setCurrency( \IPS\Helpers\Chart &$chart, string $currency )
public function setCurrency( Chart $chart, string $currency ) : void
{
if ( !\in_array( $currency, \IPS\nexus\Money::currencies() ) )
if ( !in_array( $currency, Money::currencies() ) )
{
throw new \InvalidArgumentException;
throw new InvalidArgumentException;
}
$this->_identifier = $currency;
@@ -11,31 +11,41 @@
namespace IPS\nexus\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\DateTime;
use IPS\Db;
use IPS\Helpers\Chart;
use IPS\Helpers\Chart\Database;
use IPS\Http\Url;
use IPS\Member;
use IPS\Theme;
use function defined;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Sales extends \IPS\core\Statistics\Chart
class Sales extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'nexus_reports_purchases';
public ?string $controller = 'nexus_reports_purchases';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
* @param Url $url URL the chart is being shown on.
* @return Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
public function getChart( Url $url ): Chart
{
$chart = new \IPS\Helpers\Chart\Database(
$chart = new Database(
$url,
'nexus_purchases',
'ps_start',
@@ -54,20 +64,20 @@ class _Sales extends \IPS\core\Statistics\Chart
$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 ) );
return Theme::i()->getTemplate('global', 'nexus')->userLink( Member::load( $val ) );
},
'ps_start' => function( $val ) {
return \IPS\DateTime::ts( $val );
return DateTime::ts( $val );
},
'ps_expire' => function( $val ) {
return $val ? \IPS\DateTime::ts( $val ) : '';
return $val ? DateTime::ts( $val ) : '';
}
);
$packages = array();
foreach ( \IPS\Db::i()->select( 'p_id', 'nexus_packages' ) as $packageId )
foreach ( Db::i()->select( 'p_id', 'nexus_packages' ) as $packageId )
{
$packages[ $packageId ] = \IPS\Member::loggedIn()->language()->get( 'nexus_package_' . $packageId );
$packages[ $packageId ] = Member::loggedIn()->language()->get( 'nexus_package_' . $packageId );
}
asort( $packages );
@@ -1,78 +0,0 @@
<?php
/**
* @brief Statistics Chart Extension
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
* @copyright (c) Invision Power Services, Inc.
* @license https://www.invisioncommunity.com/legal/standards/
* @subpackage Commerce
* @since 26 Jan 2023
*/
namespace IPS\nexus\extensions\core\Statistics;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Statistics Chart Extension
*/
class _Support extends \IPS\core\Statistics\Chart
{
/**
* @brief Controller
*/
public $controller = 'nexus_support_volume';
/**
* Render Chart
*
* @param \IPS\Http\Url $url URL the chart is being shown on.
* @return \IPS\Helpers\Chart
*/
public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
{
$chart = new \IPS\Helpers\Chart\Database( $url, 'nexus_support_requests', 'r_started', '',
array(
'vAxis' => array( 'title' => \IPS\Member::loggedIn()->language()->addToStack('support_requests_created') ),
'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
),
'AreaChart'
);
$chart->setExtension( $this );
$chart->groupBy = 'r_department';
foreach( \IPS\nexus\Support\Department::roots() as $department )
{
$chart->addSeries( $department->_title, 'number', 'COUNT(*)', TRUE, $department->id );
}
$chart->tableInclude = array( 'r_id', 'r_title', 'r_member', 'r_department', 'r_status', 'r_started', 'r_last_reply', 'r_replies' );
$chart->tableParsers = array(
'r_member' => function( $val ) {
return \IPS\Theme::i()->getTemplate('global', 'nexus')->userLink( \IPS\Member::load( $val ) );
},
'r_department' => function( $val ) {
return \IPS\Member::loggedIn()->language()->addToStack( 'nexus_department_' . $val );
},
'r_status' => function( $val, $row )
{
return \IPS\Member::loggedIn()->language()->addToStack( 'nexus_status_' . $val . '_admin' );
},
'r_started' => function( $val ) {
return \IPS\DateTime::ts( $val );
},
'r_last_reply' => function( $val ) {
return \IPS\DateTime::ts( $val );
}
);
return $chart;
}
}