Version 4.6.0

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

@@ -107,6 +107,51 @@ class _BillingAgreement extends \IPS\nexus\Customer\BillingAgreement
 			return new \IPS\DateTime( $data['agreement_details']['next_billing_date'] );
 		}
 	}
+
+	/**
+	 * Get latest unclaimed transaction (only gets transactions within the last 31 days which do not yet have a matching transaction)
+	 *
+	 * @return	\IPS\nexus\Transaction
+	 * @throws	\IPS\nexus\Gateway\PayPal\Exception
+	 * @throws	\OutOfRangeException
+	 * @throws  \IPS\Http\Url\Exception
+	 */
+	public function latestUnclaimedTransaction()
+	{
+		$url = "payments/billing-agreements/{$this->gw_id}/transactions?start_date=" . date('Y-m-d', time() - (86400 * 31)) . '&end_date=' . date('Y-m-d');
+		try
+		{
+			$transactions = $this->method->api( $url, NULL, 'get' );
+			foreach ( array_reverse( $transactions['agreement_transaction_list'] ) as $t )
+			{
+				if ( $t['status'] == 'Completed' )
+				{
+					try
+					{
+						$existingTransaction = \IPS\Db::i()->select( 't_id', 'nexus_transactions', array( 't_method=? AND t_gw_id=?', $this->method->id, $t['transaction_id'] ) )->first();
+					}
+					catch ( \UnderflowException $e )
+					{
+						$transaction = new \IPS\nexus\Transaction;
+						$transaction->member = $this->member;
+						$transaction->method = $this->method;
+						$transaction->amount = new \IPS\nexus\Money( $t['amount']['value'], $t['amount']['currency'] );
+						$transaction->date = new \IPS\DateTime( $t['time_stamp'] );
+						$transaction->extra = array( 'automatic' => TRUE );
+						$transaction->gw_id = $t['transaction_id'];
+						$transaction->billing_agreement = $this;
+						return $transaction;
+					}
+				}
+			}
+		}
+		catch ( \IPS\Http\Url\Exception $e )
+		{
+			throw $e;
+		}
+
+		throw new \OutOfRangeException( "{$this->id} ({$this->gw_id})\n{$url}\n\n" . print_r( $transactions, TRUE ) );
+	}
 	
 	/**
 	 * Suspend
@@ -183,6 +228,11 @@ class _BillingAgreement extends \IPS\nexus\Customer\BillingAgreement
 			try
 			{
 				$this->_payPalData = $this->method->api( "billing/subscriptions/{$this->gw_id}", NULL, 'get' );
+
+				if( !isset( $this->_payPalData['plan_id'] ) )
+				{
+					throw new \RuntimeException;
+				}
 			}
 			catch ( \Exception $e )
 			{