[#69454150] removing initial payment when changing the periodicity

features/independent_payment_strategy.feature

@@ -73,15 +73,15 @@ Feature: Independent Payment Strategy
 
      Examples: changing the periodicity of product A from monthly to yearly
        | desired state            | action                                                                                   |
-       | A @ $99/yr, B @ $20/mo   | cancel [A @ $30/mo] now, add (A @ $99/yr) on 04/01/13 with initial payment set to $99.00 |
+       | A @ $99/yr, B @ $20/mo   | cancel [A @ $30/mo] now, add (A @ $99/yr) on 04/01/12 |
 
      Examples: 
       Adding a new product D, 
       Re-adding a cancelled product C, 
       Changing the periodicity of A product, 
       Removing product B
        | desired state                      | action                                                                                                                                                           |
-       | A @ $60/yr, C @ $50/yr, D @ $40/yr | cancel [A @ $30/mo] now, add (A @ $60/yr) on 04/01/13 with initial payment set to $60.00, cancel [B @ $20/mo] now, add (C @ $50/yr) on 04/25/12, add (D @ $40/yr) on 03/15/12 |
+       | A @ $60/yr, C @ $50/yr, D @ $40/yr | cancel [A @ $30/mo] now, add (A @ $60/yr) on 04/01/12, cancel [B @ $20/mo] now, add (C @ $50/yr) on 04/25/12, add (D @ $40/yr) on 03/15/12 |
 
        #  """
        #                                                                         cancel A @ $30 now, 

lib/billing_logic/strategies/base_strategy.rb

@@ -122,6 +122,7 @@ def group_by_date(new_products)
         elsif (previous_product = changed_product_subscription?(product))
           update_product_billing_cycle_and_payment!(product, previous_product)
           date = next_payment_date_from_product(product, previous_product)
+          puts "date #{date.inspect}"
         end
         date = (date.nil? || date < today) ? today : date
         group[date] ||= []
@@ -150,14 +151,13 @@ def next_payment_date_from_profile_with_product(product, opts = {:active => fals
 
     def update_product_billing_cycle_and_payment!(product, previous_product)
       if product.billing_cycle.periodicity > previous_product.billing_cycle.periodicity
-        product.initial_payment = product.price
         product.billing_cycle.anniversary = previous_product.billing_cycle.anniversary
       end
     end
 
     def next_payment_date_from_product(product, previous_product)
       if product.billing_cycle.periodicity > previous_product.billing_cycle.periodicity
-        product.billing_cycle.next_payment_date
+        product.billing_cycle.anniversary
       else
         product.billing_cycle.anniversary = next_payment_date_from_profile_with_product(product, :active => true)
       end