From ca1b8d67fee4bf3918d64949007a09f332e5f74a Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:46:20 -0600 Subject: [PATCH 1/4] feat: adds surcharges property and model to Rate object --- CHANGELOG.md | 1 + src/main/java/com/easypost/model/Rate.java | 2 ++ src/main/java/com/easypost/model/Surcharge.java | 13 +++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 src/main/java/com/easypost/model/Surcharge.java diff --git a/CHANGELOG.md b/CHANGELOG.md index d39070a8b..882708daa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next Release +- Adds `surcharges` property and model to `Rate` object - Removes the deprecated, unusable `addCreditCardToUser` function - Stripe has disabled the ability to pass plain credit card details over the wire and now requires using [Stripe.js/Elements/Checkout](https://support.stripe.com/questions/card-tokenization-restrictions-using-publishable-keys). Follow the [Decentralized (EasyPost-Manage Billing) Guide](https://docs.easypost.com/guides/get-started-with-forge/easypost-managed-billing-guide#referralcustomer-billing-management) for more details on the new flow to use. - Makes `referralCustomer.retrieveEasypostStripeApiKey` public to help facilitate adding credit cards using Stripe.js diff --git a/src/main/java/com/easypost/model/Rate.java b/src/main/java/com/easypost/model/Rate.java index ca069612a..62603f6f9 100644 --- a/src/main/java/com/easypost/model/Rate.java +++ b/src/main/java/com/easypost/model/Rate.java @@ -1,5 +1,6 @@ package com.easypost.model; +import java.util.List; import java.util.Map; import lombok.Getter; @@ -22,4 +23,5 @@ public class Rate extends EasyPostResource { private String carrierAccountId; private String billingType; private Map details; + private List surcharges; } diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java new file mode 100644 index 000000000..4619f436a --- /dev/null +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -0,0 +1,13 @@ +package com.easypost.model; + +import lombok.Getter; + +@Getter +public final class Surcharge extends EasyPostResource { + private String object; + private String type; + private String amount; + private String list_amount; + private String retail_amount; + private String currency; +} From 6be3401aefa6d18d0c907c78f7c6128740c4a602 Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:51:35 -0600 Subject: [PATCH 2/4] fix: don't extend EasyPostResrouce on Surcharge --- src/main/java/com/easypost/model/Surcharge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java index 4619f436a..9f3e45e61 100644 --- a/src/main/java/com/easypost/model/Surcharge.java +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -3,7 +3,7 @@ import lombok.Getter; @Getter -public final class Surcharge extends EasyPostResource { +public final class Surcharge { private String object; private String type; private String amount; From 6c462343e69219face48a61c56695d22787a02d1 Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:52:15 -0600 Subject: [PATCH 3/4] fix: camelCase Surcharge properties --- src/main/java/com/easypost/model/Surcharge.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java index 9f3e45e61..3fe9eeef5 100644 --- a/src/main/java/com/easypost/model/Surcharge.java +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -7,7 +7,7 @@ public final class Surcharge { private String object; private String type; private String amount; - private String list_amount; - private String retail_amount; + private String listAmount; + private String retailAmount; private String currency; } From 5cefc5d1d5904c84d3afd50b944957e511b143ac Mon Sep 17 00:00:00 2001 From: Justintime50 <39606064+Justintime50@users.noreply.github.com> Date: Thu, 1 Oct 2026 10:00:36 -0600 Subject: [PATCH 4/4] feat: add category to Surcharge --- src/main/java/com/easypost/model/Surcharge.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/easypost/model/Surcharge.java b/src/main/java/com/easypost/model/Surcharge.java index 3fe9eeef5..47f2a55a8 100644 --- a/src/main/java/com/easypost/model/Surcharge.java +++ b/src/main/java/com/easypost/model/Surcharge.java @@ -6,6 +6,7 @@ public final class Surcharge { private String object; private String type; + private String category; private String amount; private String listAmount; private String retailAmount;