Version 5.0.0 beta 1

applications/nexus/extensions/core/Dashboard/Income.php

@@ -12,25 +12,36 @@
 namespace IPS\nexus\extensions\core\Dashboard;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DateInterval;
+use IPS\DateTime;
+use IPS\Db;
+use IPS\Extensions\DashboardAbstract;
+use IPS\Helpers\Chart;
+use IPS\Member;
+use IPS\nexus\Money;
+use IPS\nexus\Transaction;
+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;
 }
 
 /**
  * Dashboard extension: Income
  */
-class _Income
+class Income extends DashboardAbstract
 {
 	/**
 	* Can the current user view this dashboard item?
 	*
 	* @return	bool
 	*/
-	public function canView()
+	public function canView(): bool
 	{
-		return \IPS\Member::loggedIn()->hasAcpRestriction( 'nexus' , 'transactions', 'transactions_manage' );
+		return Member::loggedIn()->hasAcpRestriction( 'nexus' , 'transactions', 'transactions_manage' );
 	}
 
 	/** 
@@ -38,20 +49,20 @@ class _Income
 	 *
 	 * @return	string
 	 */
-	public function getBlock()
+	public function getBlock(): string
 	{
-		$chart = new \IPS\Helpers\Chart;
+		$chart = new Chart;
 		
 		$chart->addHeader( "Day", 'date' );
-		foreach ( \IPS\nexus\Money::currencies() as $currency )
+		foreach ( Money::currencies() as $currency )
 		{
 			$chart->addHeader( $currency, 'number' );
 		}
 		
-		$thirtyDaysAgo = \IPS\DateTime::create()->sub( new \DateInterval('P30D') );
+		$thirtyDaysAgo = DateTime::create()->sub( new DateInterval('P30D') );
 				
 		$results = array();
-		foreach( \IPS\Db::i()->select( "t_currency, DATE_FORMAT( FROM_UNIXTIME( t_date ), '%e %c %Y' ) AS date, SUM(t_amount)-SUM(t_partial_refund) AS amount", 'nexus_transactions', array( 't_date>? AND (t_status=? OR t_status=?) AND t_method>0', $thirtyDaysAgo->getTimestamp(), \IPS\nexus\Transaction::STATUS_PAID, \IPS\nexus\Transaction::STATUS_PART_REFUNDED ), NULL, NULL, array( 't_currency', 'date' ) ) as $result )
+		foreach( Db::i()->select( "t_currency, DATE_FORMAT( FROM_UNIXTIME( t_date ), '%e %c %Y' ) AS date, SUM(t_amount)-SUM(t_partial_refund) AS amount", 'nexus_transactions', array( 't_date>? AND (t_status=? OR t_status=?) AND t_method>0', $thirtyDaysAgo->getTimestamp(), Transaction::STATUS_PAID, Transaction::STATUS_PART_REFUNDED ), NULL, NULL, array( 't_currency', 'date' ) ) as $result )
 		{
 			$results[ $result['date'] ][ $result['t_currency'] ] = $result['amount'];
 		}
@@ -59,16 +70,16 @@ class _Income
 		$monthAndYear = date( 'n' ) . ' ' . date( 'Y' );
 		foreach ( range( 30, 0 ) as $daysAgo )
 		{
-			$datetime = new \IPS\DateTime;
-			$datetime->setTime( 0, 0, 0 );
-			$datetime->sub( new \DateInterval( 'P' . $daysAgo . 'D' ) );
+			$datetime = new DateTime;
+			$datetime->setTime( 0, 0 );
+			$datetime->sub( new DateInterval( 'P' . $daysAgo . 'D' ) );
 			$resultString = $datetime->format('j n Y');
 			
 			if ( isset( $results[ $resultString ] ) )
 			{
 				$row = array( $datetime );
 				
-				foreach ( \IPS\nexus\Money::currencies() as $currency )
+				foreach ( Money::currencies() as $currency )
 				{
 					if ( !isset( $results[ $resultString ][ $currency ] ) )
 					{
@@ -85,7 +96,7 @@ class _Income
 			else
 			{
 				$row = array( $datetime );
-				foreach ( \IPS\nexus\Money::currencies() as $currency )
+				foreach ( Money::currencies() as $currency )
 				{
 					$row[] = 0;
 				}
@@ -101,24 +112,4 @@ class _Income
 			'areaOpacity'		=> 0.4,
 		) );
 	}
-
-	/** 
-	 * Return the block information
-	 *
-	 * @return	array	array( 'name' => 'Block title', 'key' => 'unique_key', 'size' => [1,2,3], 'by' => 'Author name' )
-	 */
-	public function getInfo()
-	{
-		return array();
-	}
-
-	/**
-	 * Save the block data submitted.  This method is only necessary if your block accepts some sort of submitted data to save (such as the 'admin notes' block).
-	 *
-	 * @return	void
-	 * @throws	\LogicException
-	 */
-	public function saveBlock()
-	{
-	}
 }