3/15/2016 5:45:32 PM
(and RepairSubscriptionInternalEvent definition)
|
3/15/2016 5:35:44 PM
a method 'getRecurringPrice(final DateTime effectiveDate)' and modify FixedAndRecurringInvoiceItemGenerator
to use that method to correctly set the rate for each period invoiced. This allows to correctly find the new recurrring price for catalog
entries which become effective in a later catalog through the use of the effectiveDateForExistingSubscriptons date.
|
3/15/2016 5:33:25 PM
or URLi
Also fix tests that did not pass from IDE because of URL string not computed the way from when tests are run from commandline versus IDE
(e.g: file:catalog/src/test/resources/versionedCatalog v.s file:/src/test/resources/versionedCatalog)
|
3/14/2016 9:47:25 PM
into work-for-release-0.17.0
|
|
|
3/14/2016 7:05:22 PM
into work-for-release-0.16.3
|
3/14/2016 7:04:53 PM
with same external key works as expected both from raw payment api or attempt level
|
3/14/2016 6:55:52 PM
transaction
|
3/11/2016 11:05:20 PM
into hierarchical-accounts
Conflicts:
account/pom.xml
account/src/main/java/org/killbill/billing/account/api/DefaultImmutableAccountData.java
account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountUserApi.java
account/src/test/java/org/killbill/billing/account/dao/MockAccountDao.java
api/pom.xml
beatrix/pom.xml
beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoice.java
catalog/pom.xml
currency/pom.xml
entitlement/pom.xml
invoice/pom.xml
invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java
invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
invoice/src/main/java/org/killbill/billing/invoice/model/DefaultInvoice.java
invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceNotificationQListener.java
invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java
jaxrs/pom.xml
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/CreditResource.java
jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/InvoiceResource.java
junction/pom.xml
overdue/pom.xml
payment/pom.xml
pom.xml
profiles/killbill/pom.xml
profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java
profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
profiles/killpay/pom.xml
profiles/pom.xml
subscription/pom.xml
tenant/pom.xml
usage/pom.xml
util/pom.xml
|
|
|