Version 4.7.0

applications/nexus/sources/Purchase/Purchase.php

@@ -143,7 +143,7 @@ class _Purchase extends \IPS\Node\Model
 			$renewals = (string) $this->renewals;
 			if ( $this->renewals->tax )
 			{
-				$renewals .= \IPS\Member::loggedIn()->language()->addToStack( 'plus_tax_rate', NULL, array( 'sprintf' => array( $this->renewals->tax->_title ) ) );
+				$renewals .= \IPS\Member::loggedIn()->language()->addToStack( 'plus_tax_rate', FALSE, array( 'sprintf' => array( $this->renewals->tax->_title ) ) );
 			}
 			$description[] = $renewals;
 		}
@@ -1481,11 +1481,13 @@ class _Purchase extends \IPS\Node\Model
 	/* !ACP Display */
 		
 	/**
-	 * ACP URL
+	 * Get the URL of the AdminCP page for this node
 	 *
-	 * @return	\IPS\Http\Url
+	 * @param   string|NULL  $do The "do" query parameter of the url (e.g. 'form', 'permissions', etc).
+	 *
+	 * @return \IPS\Http\Url | NULL
 	 */
-	public function acpUrl()
+	public function acpUrl( $do="form" )
 	{
 		return \IPS\Http\Url::internal( "app=nexus&module=customers&controller=purchases&do=view&id={$this->id}", 'admin' );
 	}
@@ -1512,6 +1514,7 @@ class _Purchase extends \IPS\Node\Model
 			);
 		}
 		
+		$extension = NULL;
 		try
 		{
 			$extension = $this->extension();
@@ -1565,10 +1568,9 @@ class _Purchase extends \IPS\Node\Model
 		
 		if ( ( !$this->billing_agreement or $this->billing_agreement->canceled ) and ( !$this->grouped_renewals or !$parent or !$parent->billing_agreement or $parent->billing_agreement->canceled ) and \IPS\Member::loggedIn()->hasAcpRestriction( 'nexus', 'customers', 'purchases_cancel' ) )
 		{
-			$extension = $this->extension();
 			if ( $this->cancelled )
 			{
-				if ( $extension::canAcpReactivate( $this ) )
+				if ( $extension AND $extension::canAcpReactivate( $this ) )
 				{
 					$return['reactivate'] = array(
 						'icon'	=> 'check',