aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2020-07-09 14:20:21 +0200
committerOla Aunrønning <olaa@verizonmedia.com>2020-07-09 14:20:21 +0200
commit62804fddb12715535c1671fa4ba66301665e63b4 (patch)
treead72c755b2b22d3074d9921779be3884be68aba9 /controller-server
parent9ba83e0d6bd5a5a0f30434aa343821c29abe8628 (diff)
Add instrument address
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index 8fad0db4368..915c5a71cd0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -19,8 +19,6 @@ import com.yahoo.slime.Slime;
import com.yahoo.slime.SlimeUtils;
import com.yahoo.vespa.hosted.controller.ApplicationController;
import com.yahoo.vespa.hosted.controller.Controller;
-import com.yahoo.vespa.hosted.controller.Instance;
-import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
import com.yahoo.vespa.hosted.controller.api.integration.billing.PaymentInstrument;
import com.yahoo.vespa.hosted.controller.api.integration.billing.Invoice;
import com.yahoo.vespa.hosted.controller.api.integration.billing.InstrumentOwner;
@@ -259,9 +257,20 @@ public class BillingApiHandler extends LoggingRequestHandler {
}
private void renderInstrument(Cursor cursor, PaymentInstrument instrument) {
+ cursor.setString("pi-id", instrument.getId());
cursor.setString("type", instrument.getType());
cursor.setString("brand", instrument.getBrand());
cursor.setString("endingWith", instrument.getEndingWith());
+ cursor.setString("expiryDate", instrument.getExpiryDate());
+ cursor.setString("displayText", instrument.getDisplayText());
+ cursor.setString("nameOnCard", instrument.getNameOnCard());
+ cursor.setString("addressLine1", instrument.getAddressLine1());
+ cursor.setString("addressLine2", instrument.getAddressLine2());
+ cursor.setString("zip", instrument.getZip());
+ cursor.setString("city", instrument.getCity());
+ cursor.setString("state", instrument.getState());
+ cursor.setString("country", instrument.getCountry());
+
}
private void renderCurrentUsage(Cursor cursor, Invoice currentUsage) {