Version 4.1.19

applications/nexus/sources/Customer/Customer.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Customer Model
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Nexus
  * @since		11 Feb 2014
  * @version		SVN_VERSION_NUMBER
@@ -32,13 +32,29 @@ class _Customer extends \IPS\Member
 	/**
 	 * @brief	Cached logged in member
 	 */
-	protected static $loggedInMember	= NULL;
+	public static $loggedInMember	= NULL;
 	
 	/**
 	 * @brief	[ActiveRecord] ID Database Column
 	 */
 	public static $databaseColumnId = 'member_id';
-	
+
+	/**
+	 * Get logged in member
+	 *
+	 * @return	\IPS\Member
+	 */
+	public static function loggedIn()
+	{
+		/* If we haven't loaded the member yet, or if the session member has changed since we last loaded the member, reload and cache */
+		if( static::$loggedInMember === NULL )
+		{
+			static::$loggedInMember = static::load( parent::loggedIn()->member_id );
+		}
+
+		return static::$loggedInMember;
+	}
+
 	/**
 	 * Construct Load Query
 	 *
@@ -204,7 +220,7 @@ class _Customer extends \IPS\Member
 		$save = array();
 		foreach ( $amounts as $amount )
 		{
-			$save[ $amount->currency ] = $amount->amount;
+			$save[ $amount->currency ] = $amount->amountAsString();
 		}
 		$this->_data['cm_credits'] = json_encode( $save );
 	}
@@ -499,6 +515,6 @@ class _Customer extends \IPS\Member
 	 */
 	public function acpUrl()
 	{
-		return \IPS\Http\Url::internal("app=nexus&module=customers&controller=view&id={$this->member_id}");
+		return \IPS\Http\Url::internal( "app=nexus&module=customers&controller=view&id={$this->member_id}", 'admin' );
 	}	
 }