diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-09 15:44:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-09 15:44:25 +0200 |
commit | f1c12318a448818db6604c4fc1d32eca471b85be (patch) | |
tree | d0e86113f01f336ae4994b1808f2c4f618a1f6ec /controller-server | |
parent | d948fd34ba3f893dc908167f78a83f11da6135f6 (diff) | |
parent | 62804fddb12715535c1671fa4ba66301665e63b4 (diff) |
Merge pull request #13851 from vespa-engine/olaa/instrument-address
Add instrument address
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java | 13 |
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) { |