Ben Hayward · @benhayward.ben · 5f801ecc
--- a/Spec/Core/Wire/Delegates/PlusSpec.php
+++ b/Spec/Core/Wire/Delegates/PlusSpec.php
+ 
+ $this->calculatePlusExpires("+1 year", $wireTimestamp, $previousTimestamp) 
+ ->shouldEqualApproximately(strtotime('+1 year', time()), 1.0e-9); 
+ } 
+ 
+ function it_should_return_expiry_time_for_existing_1_year_plus_a_new_month() 
+ { 
+ $wireTimestamp = time(); 
+ $previousTimestamp = strtotime('+11 months', time()); //already subbed for the next 11 momths 
+ 
+ $this->calculatePlusExpires("+1 month", $wireTimestamp, $previousTimestamp) 
+ ->shouldEqualApproximately(strtotime('+1 year', time()), 1.0e-9); 
+ } 
+ 
+ function it_should_return_expiry_time_for_existing_monthly_subscription_upgrade_to_year()  
+ { 
--- a/Controllers/api/v1/wire.php
+++ b/Controllers/api/v1/wire.php
 } 
 
 $manager = Core\Di\Di::_()->get('Wire\Manager'); 
+  
+ $tier = $_POST['tier'] ?? ''; 
--- a/Core/Wire/Delegates/Plus.php
+++ b/Core/Wire/Delegates/Plus.php
 return $wire; 
 } 
 
- $user->setPlusExpires(strtotime('+30 days', $wire->getTimestamp())); 
+ // check the users tier if passed in. If not, it's a standard monthly subscription. 
+ switch ($tier) { 
+ case 'lifetime': 
+ $user->setPlusExpires(9999999999); //life 
+ break; 
--- a/Core/Wire/Delegates/Plus.php
+++ b/Core/Wire/Delegates/Plus.php
 
 //$wire->setSender($user); 
 return $wire; 
 } 
 
+ /** 
+ * Calculates a user's plus expirey date - factoring in upgrades to existing subscriptions.  
+ * 
+ * @param [String] $timespan - first param of strtotime(). 
+ * @param [Integer] $wireTimestamp - the unix timestamp on the wire transaction.  
+ * @param [Integer] $previousTimestamp - the users previous subscription unix timestamp. 
+ * @return [Integer] the new unix expiry date.  
+ */ 
+ public function calculatePlusExpires($timespan, $wireTimestamp, $previousTimestamp = null)  
+ { 
+ if ($previousTimestamp === 9999999999) { 
--- a/Core/Wire/Manager.php
+++ b/Core/Wire/Manager.php
 
 return $this; 
 } 
+  
+ public function setTier($tier = '') 
+ {