Version 4.3.0

applications/nexus/setup/upg_101000/upgrade.php

@@ -30,19 +30,11 @@ class _Upgrade
 	 */
 	public function step1()
 	{
-		foreach ( array(
+		\IPS\Settings::i()->changeValues( array(
 			'card_storage_gateways'	=> count( \IPS\nexus\Gateway::cardStorageGateways() ),
 			'donation_goals'		=> count( \IPS\nexus\Donation\Goal::roots() ),
 			'customer_fields'		=> count( \IPS\nexus\Customer\CustomField::roots() )
-		) as $k => $v )
-		{
-			\IPS\Db::i()->update( 'core_sys_conf_settings', array( 'conf_value' => $v ), array( 'conf_key=?', $k ) );
-			\IPS\Settings::i()->$k	= $v;
-		}
-								
-		unset( \IPS\Data\Store::i()->settings );
-
-
+		) );
 		return TRUE;
 	}
 	
@@ -188,8 +180,25 @@ class _Upgrade
 					{
 						if ( !isset( $value['min'] ) )
 						{
+							switch( $row['s_type'] )
+							{
+								// Number of items
+								default:
+								case 'q':
+									$min = (int) $value['value'];
+									break;
+								// Invoice subtotal
+								case 't':
+									$min = array( \IPS\Settings::i()->nexus_currency => floatval( $value['value'] ) );
+									break;
+								// Total weight of items
+								case 'w':
+									$min = floatval( $value['value'] );
+									break;
+							}
+
 							$decoded[ $k ] = array(
-								'min'	=> array( \IPS\Settings::i()->nexus_currency => floatval( $value['value'] ) ),
+								'min'	=> $min,
 								'max'	=> isset( $decoded[ $k + 1 ] ) ? array( \IPS\Settings::i()->nexus_currency => floatval( $decoded[ $k + 1 ]['value'] ) ) : '*',
 								'price'	=> array( \IPS\Settings::i()->nexus_currency => floatval( $value['cost'] ) )
 							);