killbill-aplcache

Merge branch 'inv-ent-integration' of github.com:ning/killbill

2/7/2012 11:09:41 PM

Details

diff --git a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
index 06e16e6..6d00162 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/DefaultPlanPhase.java
@@ -136,7 +136,7 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
 			errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
 					catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
 		}
-		
+	
 		//Validation: if there is a recurring price there must be a billing period
 		if((recurringPrice != null) && (billingPeriod == null || billingPeriod == BillingPeriod.NO_BILLING_PERIOD)) {
 			errors.add(new ValidationError(String.format("Phase %s of plan %s has a recurring price but no billing period", type.toString(), plan.getName()),
@@ -156,7 +156,7 @@ public class DefaultPlanPhase extends ValidatingConfig<StandaloneCatalog> implem
 					type.toString(), plan.getName()), 
 					catalog.getCatalogURI(), DefaultPlanPhase.class, type.toString()));
 		}
-
+		//TODO : if there BP is set to NO_BILLING_PERIOD there must be a recurring price
         return errors;
 	}