Version 4.7.13

applications/nexus/sources/Customer/BillingAgreement.php

@@ -306,10 +306,10 @@ class _BillingAgreement extends \IPS\Patterns\ActiveRecord
 		{
 			$transaction = $this->latestUnclaimedTransaction();
 		}
-		/* If there isn't one yet, it might just be that PayPal hasn't taken it yet. Let it try for up to 5 days before giving up, which is how long PayPal will try for if there's an issue. */
+		/* If there isn't one yet, it might just be that PayPal hasn't taken it yet. Let it try for up to 11 days before giving up, which is how long PayPal will try for if there's an issue. */
 		catch ( \OutOfRangeException $e )
 		{
-			if ( $this->next_cycle->getTimestamp() > ( time() - ( 86400 * 5 ) ) )
+			if ( $this->next_cycle->getTimestamp() > ( time() - ( 86400 * 11 ) ) )
 			{
 				throw new \UnderflowException;
 			}

applications/nexus/sources/Customer/Customer.php

@@ -323,7 +323,7 @@ class _Customer extends \IPS\Member
 				{
 					try
 					{
-						$location = \IPS\GeoLocation::getByIp( \IPS\Request::i()->ipAddress() );
+						$location = \IPS\GeoLocation::getRequesterLocation();
 						\IPS\Request::i()->setCookie( 'location', $this->_addMemberToAddress( $location ) );
 					}
 					catch ( \Exception $e )