Version 4.7.0

applications/nexus/modules/admin/payments/billingagreements.php

@@ -54,6 +54,7 @@ class _billingagreements extends \IPS\Dispatcher\Controller
 			if ( !$billingAgreement->canceled and $billingAgreement->status() == $billingAgreement::STATUS_CANCELED )
 			{
 				$billingAgreement->canceled = TRUE;
+				$billingAgreement->next_cycle = NULL;
 				$billingAgreement->save();
 			}
 		}

applications/nexus/modules/admin/payments/checkoutsettings.php

@@ -60,6 +60,11 @@ class _checkoutsettings extends \IPS\Dispatcher\Controller
 		{
 			$requireBillingOptions['domain'] = 'nexus_require_billing_domain';
 		}
+		
+		if ( \IPS\Settings::i()->nexus_subs_enabled and \IPS\Db::i()->select( 'COUNT(*)', 'nexus_member_subscription_packages' )->first() )
+ 		{
+ 			$requireBillingOptions['subscriptions'] = 'nexus_require_billing_subscriptions';
+ 		}
 
 		$requireBillingOptions['other'] = 'nexus_require_billing_other';
 

applications/nexus/modules/admin/payments/gateways.php

@@ -138,6 +138,11 @@ class _gateways extends \IPS\Node\Controller
 						$values = $obj->formatFormValues( $values );
 						$obj->settings = json_encode( $settings );
 						$obj->countries = $values['countries'];
+						if( isset(  $values['validationfile'] ) )
+						{
+							$obj->validationfile = $values['validationfile'];
+						}
+
 						$obj->save();
 						\IPS\Lang::saveCustom( 'nexus', "nexus_paymethod_{$obj->id}", $name );
 

applications/nexus/modules/admin/payments/shipping.php

@@ -560,7 +560,11 @@ class _shipping extends \IPS\Dispatcher\Controller
 		$shipment->delete();
 		
 		/* Log */
-		$shipment->invoice->member->log( 'shipping', array( 'id' => $shipment->id, 'deleted' => TRUE ) );
+		try
+		{
+			$shipment->invoice->member->log( 'shipping', array( 'id' => $shipment->id, 'deleted' => TRUE ) );
+		}
+		catch ( \OutOfRangeException $e ) {}
 		
 		/* Redirect */
 		\IPS\Output::i()->redirect( \IPS\Http\Url::internal('app=nexus&module=payments&controller=shipping') );

applications/nexus/modules/admin/payments/shippingrates.php

@@ -53,14 +53,14 @@ class _shippingrates extends \IPS\Node\Controller
 	{
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global', 'core' )->decision( 'ship_rates_' . \IPS\Request::i()->type, array(
 			'ship_rates_go_back'		=> \IPS\Http\Url::internal( 'app=nexus&module=payments&controller=shippingrates&do=form&id=' . \IPS\Request::i()->id ),
-			'ship_rates_save_anyway'	=> \IPS\Http\Url::internal( $this->url ),
+			'ship_rates_save_anyway'	=> $this->url,
 		) );
 	}
 	
 	/**
 	 * Redirect after save
 	 *
-	 * @param	\IPS\Node\Model	$old			A clone of the node as it was before or NULL if this is a creation
+	 * @param	\IPS\Node\Model|NULL	$old			A clone of the node as it was before or NULL if this is a creation
 	 * @param	\IPS\Node\Model	$new			The node now
 	 * @param	string			$lastUsedTab	The tab last used in the form
 	 * @return	void