From 43941903f0ae0d7018868eca29ca2597235773c0 Mon Sep 17 00:00:00 2001 From: Becca Gaspard Date: Wed, 9 Aug 2017 11:24:14 -0400 Subject: [PATCH] =?UTF-8?q?Updated=20ExternalChargeInvoiceItem=20to=20exte?= =?UTF-8?q?nd=20InvoiceItemCatalogBase.=C2=A0=20Invoice=20plugin=20api=20a?= =?UTF-8?q?llows=20you=20to=20add=20planName,=20linkedInvoiceId,=20etc=20t?= =?UTF-8?q?o=20external=20charge=20and=20they=20will=20be=20stored=20in=20?= =?UTF-8?q?the=20db,=20but=20not=20retrieved=20via=20API=20or=20populated?= =?UTF-8?q?=20in=20analytics=20table=20-=20this=20fixes=20the=20issue.?= =?UTF-8?q?=C2=A0=20External=20charges=20w/o=20the=20additional=20fields?= =?UTF-8?q?=20will=20continue=20to=20work=20the=20same.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice/model/ExternalChargeInvoiceItem.java | 10 ++++++++-- .../billing/invoice/model/InvoiceItemFactory.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java index 779701844f..e2dc4a5df2 100644 --- a/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java +++ b/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java @@ -27,7 +27,7 @@ import org.killbill.billing.invoice.api.InvoiceItemType; import org.killbill.billing.util.UUIDs; -public class ExternalChargeInvoiceItem extends InvoiceItemBase { +public class ExternalChargeInvoiceItem extends InvoiceItemCatalogBase { public ExternalChargeInvoiceItem(final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId, @Nullable final String description, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency) { @@ -41,7 +41,13 @@ public ExternalChargeInvoiceItem(final UUID id, final UUID invoiceId, final UUID public ExternalChargeInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId, @Nullable final String description, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency) { - super(id, createdDate, invoiceId, accountId, bundleId, null, description, startDate, endDate, amount, null, currency, null); + super(id, createdDate, invoiceId, accountId, bundleId, null, description, null, null, null, startDate, endDate, amount, null, currency, null); + } + + public ExternalChargeInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId, + final String planName, final String phaseName, final String prettyPlanName, final String prettyPhaseName, @Nullable final String description, final LocalDate startDate, final LocalDate endDate, + final BigDecimal amount, final BigDecimal rate, final Currency currency, @Nullable final UUID linkedItemId) { + super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, description, planName, phaseName, null, prettyPlanName, prettyPhaseName, null, startDate, endDate, amount, rate, currency, linkedItemId); } @Override diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java index 07b8974221..e8eef207b1 100644 --- a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java +++ b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java @@ -80,7 +80,7 @@ public static InvoiceItem fromModelDaoWithCatalog(final InvoiceItemModelDao invo final InvoiceItem item; switch (type) { case EXTERNAL_CHARGE: - item = new ExternalChargeInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, description, startDate, endDate, amount, currency); + item = new ExternalChargeInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, prettyPlanName, prettyPlanPhaseName, description, startDate, endDate, amount, rate, currency, linkedItemId); break; case FIXED: item = new FixedPriceInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, prettyPlanName, prettyPlanPhaseName, description, startDate, amount, currency);