3/9/2012 5:49:56 PM
into integration
Conflicts:
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
|
3/9/2012 5:10:01 PM
for demo using IM
|
3/9/2012 5:28:26 PM
debugging messages to payment mocks
|
|
|
3/9/2012 2:38:20 AM
into integration
Conflicts:
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultBillingEvent.java
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
|
|
|
3/8/2012 3:21:29 PM
into integration
|
|
|
3/9/2012 1:34:29 AM
when the invoice is created)
- changed custom field value to not required
|
3/8/2012 4:37:33 PM
and currency instead
- constrain target date for invoices to a configurable number of months in the future
|