Version 4.1.2

applications/nexus/sources/Gateway/Gateway.php

@@ -227,6 +227,41 @@ class _Gateway extends \IPS\Node\Model
 		return $return;
 	}
 	
+	/**
+	 * [ActiveRecord] Save Changed Columns
+	 *
+	 * @return	void
+	 */
+	public function save()
+	{
+		parent::save();
+		static::recountCardStorageGateways();
+	}
+	
+	/**
+	 * [ActiveRecord] Delete
+	 *
+	 * @return	void
+	 */
+	public function delete()
+	{
+		parent::delete();
+		static::recountCardStorageGateways();
+	}
+	
+	/**
+	 * Recount card storage gateays
+	 *
+	 * @return	void
+	 */
+	protected static function recountCardStorageGateways()
+	{
+		$count = count( static::cardStorageGateways() );
+		\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => $count ), array( 'conf_key=?', 'card_storage_gateways' ) );
+		\IPS\Settings::i()->card_storage_gateways = $count;
+		unset( \IPS\Data\Store::i()->settings );
+	}
+	
 	/* !Features (Each gateway will override) */
 
 	const SUPPORTS_REFUNDS = FALSE;

applications/nexus/sources/Gateway/Manual/Manual.php

@@ -55,7 +55,7 @@ class _Manual extends \IPS\nexus\Gateway
 	 */
 	public function settings( &$form )
 	{
-		$form->add( new \IPS\Helpers\Form\Translatable( 'manual_instructions', NULL, TRUE, array( 'app' => 'nexus', 'key' => ( $this->id ? "nexus_gateway_{$this->id}_ins" : NULL ), 'editor' => array( 'app' => 'nexus', 'key' => 'Admin', 'autoSaveKey' => ( $this->id ? "nexus-gateway-{$this->id}" : "nexus-new-gateway" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'forum_description_placeholder' ) ) ) );
+		$form->add( new \IPS\Helpers\Form\Translatable( 'manual_instructions', NULL, TRUE, array( 'app' => 'nexus', 'key' => ( $this->id ? "nexus_gateway_{$this->id}_ins" : NULL ), 'editor' => array( 'app' => 'nexus', 'key' => 'Admin', 'autoSaveKey' => ( $this->id ? "nexus-gateway-{$this->id}" : "nexus-new-gateway" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'manual_gateway_description_placeholder' ) ) ) );
 	}
 	
 	/**

applications/nexus/sources/Gateway/PayPal/PayPal.php

@@ -336,8 +336,8 @@ class _PayPal extends \IPS\nexus\Gateway
 								'expire_month'		=> intval( $card->expMonth ),
 								'expire_year'		=> intval( $card->expYear ),
 								'cvv2'				=> intval( $card->ccv ),
-								'first_name'		=> $transaction->member->cm_first_name,
-								'last_name'			=> $transaction->member->cm_last_name,
+								'first_name'		=> $transaction->invoice->member->cm_first_name,
+								'last_name'			=> $transaction->invoice->member->cm_last_name,
 								'billing_address'	=> $billingAddress
 							)
 						),