From 504db77a7a5ff61a7de86d2cd6f1508e4219f897 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sun, 7 Jun 2020 14:59:56 +0300 Subject: [PATCH 1/3] renamed PRIVIDER_DATA_FIELD to PROVIDER_DATA_FIELD in SendInvoice.java --- .../telegrambots/meta/api/methods/send/SendInvoice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java index 22dd87b1..8a137112 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java @@ -43,7 +43,7 @@ public class SendInvoice extends BotApiMethod { private static final String DISABLE_NOTIFICATION_FIELD = "disable_notification"; private static final String REPLY_TO_MESSAGE_ID_FIELD = "reply_to_message_id"; private static final String REPLY_MARKUP_FIELD = "reply_markup"; - private static final String PRIVIDER_DATA_FIELD = "provider_data"; + private static final String PROVIDER_DATA_FIELD = "provider_data"; @JsonProperty(CHATID_FIELD) private Integer chatId; ///< Unique identifier for the target private chat @@ -99,7 +99,7 @@ public class SendInvoice extends BotApiMethod { * * @note A detailed description of required fields should be provided by the payment provider. */ - @JsonProperty(PRIVIDER_DATA_FIELD) + @JsonProperty(PROVIDER_DATA_FIELD) private String providerData; From 03fdafd54f7d0e3174bd50fedfe22ec882d51daf Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sun, 7 Jun 2020 15:28:55 +0300 Subject: [PATCH 2/3] added SEND_PHONE_NUMBER_TO_PROVIDER and SEND_EMAIL_TO_PROVIDER fields and methods for them --- .../meta/api/methods/send/SendInvoice.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java index 8a137112..873b9854 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java @@ -39,6 +39,8 @@ public class SendInvoice extends BotApiMethod { private static final String NEED_PHONE_NUMBER_FIELD = "need_phone_number"; private static final String NEED_EMAIL_FIELD = "need_email"; private static final String NEED_SHIPPING_ADDRESS_FIELD = "need_shipping_address"; + private static final String SEND_PHONE_NUMBER_TO_PROVIDER_FIELD = "send_phone_number_to_provider"; + private static final String SEND_EMAIL_TO_PROVIDER_FIELD = "send_email_to_provider"; private static final String IS_FLEXIBLE_FIELD = "is_flexible"; private static final String DISABLE_NOTIFICATION_FIELD = "disable_notification"; private static final String REPLY_TO_MESSAGE_ID_FIELD = "reply_to_message_id"; @@ -87,6 +89,11 @@ public class SendInvoice extends BotApiMethod { private Boolean disableNotification; ///< Optional. Sends the message silently. Users will receive a notification with no sound. @JsonProperty(REPLY_TO_MESSAGE_ID_FIELD) private Integer replyToMessageId; ///< Optional. If the message is a reply, ID of the original message + + @JsonProperty(SEND_PHONE_NUMBER_TO_PROVIDER_FIELD) + private boolean sendPhoneNumberToProvider; ///< Optional. Pass True, if user's phone number should be sent to provider + @JsonProperty(SEND_EMAIL_TO_PROVIDER_FIELD) + private boolean sendEmailToProvider; ///< Optional. Pass True, if user's email address should be sent to provider /** * Optional. A JSON-serialized object for an inline keyboard. * @@ -102,8 +109,7 @@ public class SendInvoice extends BotApiMethod { @JsonProperty(PROVIDER_DATA_FIELD) private String providerData; - - /** + /** * Build an empty SendInvoice object */ public SendInvoice() { @@ -277,6 +283,20 @@ public class SendInvoice extends BotApiMethod { return this; } + public Boolean getSendPhoneNumberToProvider() { return sendPhoneNumberToProvider; } + + public SendInvoice setSendPhoneNumberToProvider(Boolean sendPhoneNumberToProvider) { + this.sendPhoneNumberToProvider = sendPhoneNumberToProvider; + return this; + } + + public Boolean getSendEmailToProvider() { return sendEmailToProvider; } + + public SendInvoice setSendEmailToProvider(Boolean sendEmailToProvider) { + this.sendEmailToProvider = sendEmailToProvider; + return this; + } + public Boolean getFlexible() { return isFlexible; } @@ -396,6 +416,8 @@ public class SendInvoice extends BotApiMethod { ", needPhoneNumber=" + needPhoneNumber + ", needEmail=" + needEmail + ", needShippingAddress=" + needShippingAddress + + ", sendPhoneNumberToProvider=" + sendPhoneNumberToProvider + + ", sendEmailToProvider=" + sendEmailToProvider + ", isFlexible=" + isFlexible + ", disableNotification=" + disableNotification + ", replyToMessageId=" + replyToMessageId + From 223c6cccc07b4b2d4ebcb7faeeec34bd63504176 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 9 Jun 2020 12:48:25 +0300 Subject: [PATCH 3/3] added SEND_PHONE_NUMBER_TO_PROVIDER and SEND_EMAIL_TO_PROVIDER fields and methods for them --- .../telegrambots/meta/api/methods/send/SendInvoice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java index 873b9854..5fa8debf 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java @@ -91,9 +91,9 @@ public class SendInvoice extends BotApiMethod { private Integer replyToMessageId; ///< Optional. If the message is a reply, ID of the original message @JsonProperty(SEND_PHONE_NUMBER_TO_PROVIDER_FIELD) - private boolean sendPhoneNumberToProvider; ///< Optional. Pass True, if user's phone number should be sent to provider + private Boolean sendPhoneNumberToProvider; ///< Optional. Pass True, if user's phone number should be sent to provider @JsonProperty(SEND_EMAIL_TO_PROVIDER_FIELD) - private boolean sendEmailToProvider; ///< Optional. Pass True, if user's email address should be sent to provider + private Boolean sendEmailToProvider; ///< Optional. Pass True, if user's email address should be sent to provider /** * Optional. A JSON-serialized object for an inline keyboard. *