From 9682944d8040a6c0ed8e3c476ce4bc8a5622dcfb Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 8 Jan 2020 01:22:08 -0500 Subject: [PATCH] fixes for payment/region support in ui --- bubble-server/src/main/java/bubble/cloud/CloudRegion.java | 4 ++++ .../en_US/server/post_auth/ResourceMessages.properties | 5 +++++ bubble-web | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/cloud/CloudRegion.java b/bubble-server/src/main/java/bubble/cloud/CloudRegion.java index 45f98472..dde13c88 100644 --- a/bubble-server/src/main/java/bubble/cloud/CloudRegion.java +++ b/bubble-server/src/main/java/bubble/cloud/CloudRegion.java @@ -5,9 +5,13 @@ import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import static java.util.UUID.randomUUID; + @Accessors(chain=true) public class CloudRegion { + @Getter @Setter private String uuid = randomUUID().toString(); + @Getter @Setter private String cloud; @Getter @Setter private String name; diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties index cd728845..14d02e93 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties +++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties @@ -197,12 +197,17 @@ footprint_description_Worldwide=Your Bubble can run anywhere in the world payment_description_credit=Credit or Debit Card payment_description_code=Invitation Code payment_description_free=FREE! +message_payment_not_supported=This system is not configured to handle payments of this type # Invite code payment fields field_payment_invite_code=Invitation Code button_label_submit_invite_code=Use Invite Code message_verified_invite_code=Invite Code Successfully Verified +# Free payment fields +button_label_submit_free_pay=Click here to use the FREE payment method +message_verified_free_pay=Free Payment Successfully Applied + # Credit payment fields field_payment_card_number=Credit or Debit Card button_label_submit_card=Verify Card diff --git a/bubble-web b/bubble-web index d88048fc..883a464f 160000 --- a/bubble-web +++ b/bubble-web @@ -1 +1 @@ -Subproject commit d88048fcfec07cc1a92ba8c598b5fbd88b8d5eb6 +Subproject commit 883a464f426e317dbefab18daf0a0812f42c8f71