adding frontend support for payments

bubble-server/src/main/java/bubble/dao/cloud/CloudServiceDAO.java

@@ -29,4 +29,9 @@ public class CloudServiceDAO extends AccountOwnedTemplateDAO<CloudService> {
         return findByUniqueFields("account", accountUuid, "name", name);
     }
 
+    public CloudService findByAccountAndTypeAndId(String accountUuid, CloudServiceType csType, String id) {
+        final CloudService found = findByUniqueFields("account", accountUuid, "type", csType, "enabled", true, "uuid", id);
+        return found != null ? found : findByUniqueFields("account", accountUuid, "type", csType, "enabled", true, "name", id);
+    }
+
 }

bubble-server/src/main/java/bubble/model/cloud/CloudService.java

@@ -65,7 +65,7 @@ public class CloudService extends IdentifiableBaseParentEntity implements Accoun
     };
     @Override public ScrubbableField[] fieldsToScrub() { return SCRUB_FIELDS; }
 
-    public static final String[] UPDATE_FIELDS = {"description", "template", "enabled", "driverConfig"};
+    public static final String[] UPDATE_FIELDS = {"description", "template", "enabled", "driverConfig", "priority"};
     public static final String[] CREATE_FIELDS = ArrayUtil.append(UPDATE_FIELDS, "name", "type", "driverClass", "credentials");
 
     public CloudService(CloudService other) { copy(this, other, CREATE_FIELDS); }

bubble-server/src/main/java/bubble/model/cloud/PaymentService.java

@@ -0,0 +1,23 @@
+package bubble.model.cloud;
+
+import bubble.model.bill.PaymentMethodType;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Transient;
+
+@NoArgsConstructor @Accessors(chain=true)
+public class PaymentService extends CloudService {
+
+    public PaymentService (CloudService other, PaymentMethodType type) {
+        super(other);
+        setPaymentMethodType(type);
+    }
+
+    @Transient @Getter @Setter private transient PaymentMethodType paymentMethodType;
+
+    @Override public String getCredentialsJson() { return null; }
+
+}

bubble-server/src/main/java/bubble/resources/bill/AllPaymentMethodsResource.java

@@ -1,11 +1,11 @@
 package bubble.resources.bill;
 
 import bubble.cloud.CloudServiceType;
-import bubble.cloud.payment.PaymentServiceDriver;
 import bubble.dao.cloud.CloudServiceDAO;
 import bubble.model.account.Account;
 import bubble.model.bill.PaymentMethodType;
 import bubble.model.cloud.CloudService;
+import bubble.model.cloud.PaymentService;
 import bubble.server.BubbleConfiguration;
 import lombok.extern.slf4j.Slf4j;
 import org.glassfish.jersey.server.ContainerRequest;
@@ -15,14 +15,12 @@ import org.springframework.stereotype.Service;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static bubble.ApiConstants.PAYMENT_METHODS_ENDPOINT;
+import static org.cobbzilla.util.collection.HasPriority.SORT_PRIORITY;
 import static org.cobbzilla.util.http.HttpContentTypes.APPLICATION_JSON;
-import static org.cobbzilla.wizard.resources.ResourceUtil.ok;
-import static org.cobbzilla.wizard.resources.ResourceUtil.userPrincipal;
+import static org.cobbzilla.wizard.resources.ResourceUtil.*;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)
@@ -38,16 +36,27 @@ public class AllPaymentMethodsResource {
                                        @QueryParam("type") PaymentMethodType type) {
         final Account account = userPrincipal(ctx);
         final List<CloudService> allPaymentServices = cloudDAO.findByAccountAndType(account.getUuid(), CloudServiceType.payment);
-        final Map<PaymentMethodType, CloudService> paymentServices = new HashMap<>();
+        final Set<PaymentMethodType> typesFound = new HashSet<>();
+        final List<CloudService> paymentServices = new ArrayList<>();
         for (CloudService cloud : allPaymentServices) {
-            final PaymentServiceDriver paymentDriver = cloud.getPaymentDriver(configuration);
-            if (type != null && type != paymentDriver.getPaymentMethodType()) continue;
-            if (!paymentServices.containsKey(paymentDriver.getPaymentMethodType())) {
-                // set credentials to null, because ResultScrubber cannot scrub inside Maps
-                paymentServices.put(paymentDriver.getPaymentMethodType(), cloud.setCredentials(null));
+            final PaymentMethodType paymentMethodType = cloud.getPaymentDriver(configuration).getPaymentMethodType();
+            if (type != null && type != paymentMethodType) continue;
+            if (!typesFound.contains(paymentMethodType)) {
+                paymentServices.add(new PaymentService(cloud, paymentMethodType));
+                typesFound.add(paymentMethodType);
             }
         }
+        paymentServices.sort(SORT_PRIORITY);
         return ok(paymentServices);
     }
 
+    @GET @Path("/{id}")
+    public Response findPaymentMethod(@Context ContainerRequest ctx,
+                                      @PathParam("id") String id) {
+        final Account account = userPrincipal(ctx);
+        final CloudService cloud = cloudDAO.findByAccountAndTypeAndId(account.getUuid(), CloudServiceType.payment, id);
+        if (cloud == null) return notFound(id);
+        return ok(new PaymentService(cloud, cloud.getPaymentDriver(configuration).getPaymentMethodType()));
+    }
+
 }

bubble-server/src/main/java/bubble/server/BubbleConfiguration.java

@@ -53,6 +53,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
 
     public static final String TAG_SAGE_LAUNCHER = "sageLauncher";
     public static final String TAG_SAGE_UUID = "sageUuid";
+    public static final String TAG_PAYMENTS_ENABLED = "paymentsEnabled";
 
     public BubbleConfiguration (BubbleConfiguration other) { copy(this, other); }
 
@@ -152,7 +153,8 @@ public class BubbleConfiguration extends PgRestServerConfiguration
 
     @Getter(lazy=true) private final Map<String, Object> publicSystemConfigs = MapBuilder.build(new Object[][] {
             { TAG_ALLOW_REGISTRATION, getThisNetwork().getBooleanTag(TAG_ALLOW_REGISTRATION, false) },
-            { TAG_SAGE_LAUNCHER, isSageLauncher() }
+            { TAG_SAGE_LAUNCHER, isSageLauncher() },
+            { TAG_PAYMENTS_ENABLED, paymentsEnabled() }
     });
 
     @Getter @Setter private String[] disallowedCountries;

bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties

@@ -30,8 +30,8 @@ table_row_networks_action_view=View
 table_row_networks_action_start=Start
 table_row_networks_action_stop=Stop
 table_row_networks_action_delete=Delete
-empty_networks=No bubbles found
-button_label_new_network=Create a New Bubble
+empty_networks=Create your first Bubble!
+button_label_new_network=Create Bubble
 
 # New Network page
 form_label_title_new_network=New Bubble
@@ -40,6 +40,7 @@ field_label_locale=Language
 field_label_timezone=Time Zone
 field_label_plan=Plan
 field_label_footprint=Footprint
+field_label_paymentMethod=Payment
 button_label_create_new_network=Create New Bubble
 
 # Bubble Plans
@@ -64,7 +65,6 @@ locale_en_US=English (US)
 
 # Payment methods
 payment_description_credit=Pay using a Credit Card
-payment_description_paypal=Pay using PayPal
 payment_description_code=Use an Invitation Code
 payment_description_free=Enjoy Bubble for FREE!
 

bubble-server/src/main/resources/message_templates/server/en_US/pre_auth/ResourceMessages.properties

@@ -40,3 +40,4 @@ field_label_receivePromotionalMessages=Receive news about Bubble, including new
 button_label_login=Login
 button_label_register=Register
 button_label_cancel=Cancel
+alert_registration_success=Registration successful

bubble-server/src/main/resources/message_templates/server/en_US/timezones/ResourceMessages.properties

@@ -4,7 +4,7 @@
 # Timezone names
 tz_name_Africa/Abidjan=Africa/Abidjan
 tz_name_Africa/Accra=Africa/Accra
-tz_name_Africa/Addis_Ababa=Africa/Addis_Ababa
+tz_name_Africa/Addis_Ababa=Africa/Addis Ababa
 tz_name_Africa/Algiers=Africa/Algiers
 tz_name_Africa/Asmara=Africa/Asmara
 tz_name_Africa/Asmera=Africa/Asmera
@@ -20,10 +20,10 @@ tz_name_Africa/Casablanca=Africa/Casablanca
 tz_name_Africa/Ceuta=Africa/Ceuta
 tz_name_Africa/Conakry=Africa/Conakry
 tz_name_Africa/Dakar=Africa/Dakar
-tz_name_Africa/Dar_es_Salaam=Africa/Dar_es_Salaam
+tz_name_Africa/Dar_es_Salaam=Africa/Dar es Salaam
 tz_name_Africa/Djibouti=Africa/Djibouti
 tz_name_Africa/Douala=Africa/Douala
-tz_name_Africa/El_Aaiun=Africa/El_Aaiun
+tz_name_Africa/El_Aaiun=Africa/El Aaiun
 tz_name_Africa/Freetown=Africa/Freetown
 tz_name_Africa/Gaborone=Africa/Gaborone
 tz_name_Africa/Harare=Africa/Harare
@@ -51,7 +51,7 @@ tz_name_Africa/Niamey=Africa/Niamey
 tz_name_Africa/Nouakchott=Africa/Nouakchott
 tz_name_Africa/Ouagadougou=Africa/Ouagadougou
 tz_name_Africa/Porto-Novo=Africa/Porto-Novo
-tz_name_Africa/Sao_Tome=Africa/Sao_Tome
+tz_name_Africa/Sao_Tome=Africa/Sao Tome
 tz_name_Africa/Timbuktu=Africa/Timbuktu
 tz_name_Africa/Tripoli=Africa/Tripoli
 tz_name_Africa/Tunis=Africa/Tunis
@@ -61,17 +61,17 @@ tz_name_America/Anchorage=America/Anchorage
 tz_name_America/Anguilla=America/Anguilla
 tz_name_America/Antigua=America/Antigua
 tz_name_America/Araguaina=America/Araguaina
-tz_name_America/Argentina/Buenos_Aires=America/Argentina/Buenos_Aires
+tz_name_America/Argentina/Buenos_Aires=America/Argentina/Buenos Aires
 tz_name_America/Argentina/Catamarca=America/Argentina/Catamarca
 tz_name_America/Argentina/ComodRivadavia=America/Argentina/ComodRivadavia
 tz_name_America/Argentina/Cordoba=America/Argentina/Cordoba
 tz_name_America/Argentina/Jujuy=America/Argentina/Jujuy
-tz_name_America/Argentina/La_Rioja=America/Argentina/La_Rioja
+tz_name_America/Argentina/La_Rioja=America/Argentina/La Rioja
 tz_name_America/Argentina/Mendoza=America/Argentina/Mendoza
-tz_name_America/Argentina/Rio_Gallegos=America/Argentina/Rio_Gallegos
+tz_name_America/Argentina/Rio_Gallegos=America/Argentina/Rio Gallegos
 tz_name_America/Argentina/Salta=America/Argentina/Salta
-tz_name_America/Argentina/San_Juan=America/Argentina/San_Juan
-tz_name_America/Argentina/San_Luis=America/Argentina/San_Luis
+tz_name_America/Argentina/San_Juan=America/Argentina/San Juan
+tz_name_America/Argentina/San_Luis=America/Argentina/San Luis
 tz_name_America/Argentina/Tucuman=America/Argentina/Tucuman
 tz_name_America/Argentina/Ushuaia=America/Argentina/Ushuaia
 tz_name_America/Aruba=America/Aruba
@@ -79,17 +79,17 @@ tz_name_America/Asuncion=America/Asuncion
 tz_name_America/Atikokan=America/Atikokan
 tz_name_America/Atka=America/Atka
 tz_name_America/Bahia=America/Bahia
-tz_name_America/Bahia_Banderas=America/Bahia_Banderas
+tz_name_America/Bahia_Banderas=America/Bahia Banderas
 tz_name_America/Barbados=America/Barbados
 tz_name_America/Belem=America/Belem
 tz_name_America/Belize=America/Belize
 tz_name_America/Blanc-Sablon=America/Blanc-Sablon
-tz_name_America/Boa_Vista=America/Boa_Vista
+tz_name_America/Boa_Vista=America/Boa Vista
 tz_name_America/Bogota=America/Bogota
 tz_name_America/Boise=America/Boise
-tz_name_America/Buenos_Aires=America/Buenos_Aires
-tz_name_America/Cambridge_Bay=America/Cambridge_Bay
-tz_name_America/Campo_Grande=America/Campo_Grande
+tz_name_America/Buenos_Aires=America/Buenos Aires
+tz_name_America/Cambridge_Bay=America/Cambridge Bay
+tz_name_America/Campo_Grande=America/Campo Grande
 tz_name_America/Cancun=America/Cancun
 tz_name_America/Caracas=America/Caracas
 tz_name_America/Catamarca=America/Catamarca
@@ -97,29 +97,29 @@ tz_name_America/Cayenne=America/Cayenne
 tz_name_America/Cayman=America/Cayman
 tz_name_America/Chicago=America/Chicago
 tz_name_America/Chihuahua=America/Chihuahua
-tz_name_America/Coral_Harbour=America/Coral_Harbour
+tz_name_America/Coral_Harbour=America/Coral Harbour
 tz_name_America/Cordoba=America/Cordoba
-tz_name_America/Costa_Rica=America/Costa_Rica
+tz_name_America/Costa_Rica=America/Costa Rica
 tz_name_America/Creston=America/Creston
 tz_name_America/Cuiaba=America/Cuiaba
 tz_name_America/Curacao=America/Curacao
 tz_name_America/Danmarkshavn=America/Danmarkshavn
 tz_name_America/Dawson=America/Dawson
-tz_name_America/Dawson_Creek=America/Dawson_Creek
+tz_name_America/Dawson_Creek=America/Dawson Creek
 tz_name_America/Denver=America/Denver
 tz_name_America/Detroit=America/Detroit
 tz_name_America/Dominica=America/Dominica
 tz_name_America/Edmonton=America/Edmonton
 tz_name_America/Eirunepe=America/Eirunepe
-tz_name_America/El_Salvador=America/El_Salvador
+tz_name_America/El_Salvador=America/El Salvador
 tz_name_America/Ensenada=America/Ensenada
-tz_name_America/Fort_Nelson=America/Fort_Nelson
-tz_name_America/Fort_Wayne=America/Fort_Wayne
+tz_name_America/Fort_Nelson=America/Fort Nelson
+tz_name_America/Fort_Wayne=America/Fort Wayne
 tz_name_America/Fortaleza=America/Fortaleza
-tz_name_America/Glace_Bay=America/Glace_Bay
+tz_name_America/Glace_Bay=America/Glace Bay
 tz_name_America/Godthab=America/Godthab
-tz_name_America/Goose_Bay=America/Goose_Bay
-tz_name_America/Grand_Turk=America/Grand_Turk
+tz_name_America/Goose_Bay=America/Goose Bay
+tz_name_America/Grand_Turk=America/Grand Turk
 tz_name_America/Grenada=America/Grenada
 tz_name_America/Guadeloupe=America/Guadeloupe
 tz_name_America/Guatemala=America/Guatemala
@@ -132,7 +132,7 @@ tz_name_America/Indiana/Indianapolis=America/Indiana/Indianapolis
 tz_name_America/Indiana/Knox=America/Indiana/Knox
 tz_name_America/Indiana/Marengo=America/Indiana/Marengo
 tz_name_America/Indiana/Petersburg=America/Indiana/Petersburg
-tz_name_America/Indiana/Tell_City=America/Indiana/Tell_City
+tz_name_America/Indiana/Tell_City=America/Indiana/Tell City
 tz_name_America/Indiana/Vevay=America/Indiana/Vevay
 tz_name_America/Indiana/Vincennes=America/Indiana/Vincennes
 tz_name_America/Indiana/Winamac=America/Indiana/Winamac
@@ -144,13 +144,13 @@ tz_name_America/Jujuy=America/Jujuy
 tz_name_America/Juneau=America/Juneau
 tz_name_America/Kentucky/Louisville=America/Kentucky/Louisville
 tz_name_America/Kentucky/Monticello=America/Kentucky/Monticello
-tz_name_America/Knox_IN=America/Knox_IN
+tz_name_America/Knox_IN=America/Knox IN
 tz_name_America/Kralendijk=America/Kralendijk
-tz_name_America/La_Paz=America/La_Paz
+tz_name_America/La_Paz=America/La Paz
 tz_name_America/Lima=America/Lima
-tz_name_America/Los_Angeles=America/Los_Angeles
+tz_name_America/Los_Angeles=America/Los Angeles
 tz_name_America/Louisville=America/Louisville
-tz_name_America/Lower_Princes=America/Lower_Princes
+tz_name_America/Lower_Princes=America/Lower Princes
 tz_name_America/Maceio=America/Maceio
 tz_name_America/Managua=America/Managua
 tz_name_America/Manaus=America/Manaus
@@ -162,56 +162,56 @@ tz_name_America/Mendoza=America/Mendoza
 tz_name_America/Menominee=America/Menominee
 tz_name_America/Merida=America/Merida
 tz_name_America/Metlakatla=America/Metlakatla
-tz_name_America/Mexico_City=America/Mexico_City
+tz_name_America/Mexico_City=America/Mexico City
 tz_name_America/Miquelon=America/Miquelon
 tz_name_America/Moncton=America/Moncton
 tz_name_America/Monterrey=America/Monterrey
 tz_name_America/Montevideo=America/Montevideo
 tz_name_America/Montserrat=America/Montserrat
 tz_name_America/Nassau=America/Nassau
-tz_name_America/New_York=America/New_York
+tz_name_America/New_York=America/New York
 tz_name_America/Nipigon=America/Nipigon
 tz_name_America/Nome=America/Nome
 tz_name_America/Noronha=America/Noronha
-tz_name_America/North_Dakota/Beulah=America/North_Dakota/Beulah
-tz_name_America/North_Dakota/Center=America/North_Dakota/Center
-tz_name_America/North_Dakota/New_Salem=America/North_Dakota/New_Salem
+tz_name_America/North_Dakota/Beulah=America/North Dakota/Beulah
+tz_name_America/North_Dakota/Center=America/North Dakota/Center
+tz_name_America/North_Dakota/New_Salem=America/North Dakota/New Salem
 tz_name_America/Ojinaga=America/Ojinaga
 tz_name_America/Panama=America/Panama
 tz_name_America/Pangnirtung=America/Pangnirtung
 tz_name_America/Paramaribo=America/Paramaribo
 tz_name_America/Phoenix=America/Phoenix
 tz_name_America/Port-au-Prince=America/Port-au-Prince
-tz_name_America/Port_of_Spain=America/Port_of_Spain
-tz_name_America/Porto_Acre=America/Porto_Acre
-tz_name_America/Porto_Velho=America/Porto_Velho
-tz_name_America/Puerto_Rico=America/Puerto_Rico
-tz_name_America/Punta_Arenas=America/Punta_Arenas
-tz_name_America/Rainy_River=America/Rainy_River
-tz_name_America/Rankin_Inlet=America/Rankin_Inlet
+tz_name_America/Port_of_Spain=America/Port of Spain
+tz_name_America/Porto_Acre=America/Porto Acre
+tz_name_America/Porto_Velho=America/Porto Velho
+tz_name_America/Puerto_Rico=America/Puerto Rico
+tz_name_America/Punta_Arenas=America/Punta Arenas
+tz_name_America/Rainy_River=America/Rainy River
+tz_name_America/Rankin_Inlet=America/Rankin Inlet
 tz_name_America/Recife=America/Recife
 tz_name_America/Regina=America/Regina
 tz_name_America/Resolute=America/Resolute
-tz_name_America/Rio_Branco=America/Rio_Branco
+tz_name_America/Rio_Branco=America/Rio Branco
 tz_name_America/Rosario=America/Rosario
-tz_name_America/Santa_Isabel=America/Santa_Isabel
+tz_name_America/Santa_Isabel=America/Santa Isabel
 tz_name_America/Santarem=America/Santarem
 tz_name_America/Santiago=America/Santiago
-tz_name_America/Santo_Domingo=America/Santo_Domingo
-tz_name_America/Sao_Paulo=America/Sao_Paulo
+tz_name_America/Santo_Domingo=America/Santo Domingo
+tz_name_America/Sao_Paulo=America/Sao Paulo
 tz_name_America/Scoresbysund=America/Scoresbysund
 tz_name_America/Shiprock=America/Shiprock
 tz_name_America/Sitka=America/Sitka
-tz_name_America/St_Barthelemy=America/St_Barthelemy
-tz_name_America/St_Johns=America/St_Johns
-tz_name_America/St_Kitts=America/St_Kitts
-tz_name_America/St_Lucia=America/St_Lucia
-tz_name_America/St_Thomas=America/St_Thomas
-tz_name_America/St_Vincent=America/St_Vincent
-tz_name_America/Swift_Current=America/Swift_Current
+tz_name_America/St_Barthelemy=America/St Barthelemy
+tz_name_America/St_Johns=America/St Johns
+tz_name_America/St_Kitts=America/St Kitts
+tz_name_America/St_Lucia=America/St Lucia
+tz_name_America/St_Thomas=America/St Thomas
+tz_name_America/St_Vincent=America/St Vincent
+tz_name_America/Swift_Current=America/Swift Current
 tz_name_America/Tegucigalpa=America/Tegucigalpa
 tz_name_America/Thule=America/Thule
-tz_name_America/Thunder_Bay=America/Thunder_Bay
+tz_name_America/Thunder_Bay=America/Thunder Bay
 tz_name_America/Tijuana=America/Tijuana
 tz_name_America/Toronto=America/Toronto
 tz_name_America/Tortola=America/Tortola
@@ -229,7 +229,7 @@ tz_name_Antarctica/Mawson=Antarctica/Mawson
 tz_name_Antarctica/McMurdo=Antarctica/McMurdo
 tz_name_Antarctica/Palmer=Antarctica/Palmer
 tz_name_Antarctica/Rothera=Antarctica/Rothera
-tz_name_Antarctica/South_Pole=Antarctica/South_Pole
+tz_name_Antarctica/South_Pole=Antarctica/South Pole
 tz_name_Antarctica/Syowa=Antarctica/Syowa
 tz_name_Antarctica/Troll=Antarctica/Troll
 tz_name_Antarctica/Vostok=Antarctica/Vostok
@@ -267,8 +267,8 @@ tz_name_Asia/Famagusta=Asia/Famagusta
 tz_name_Asia/Gaza=Asia/Gaza
 tz_name_Asia/Harbin=Asia/Harbin
 tz_name_Asia/Hebron=Asia/Hebron
-tz_name_Asia/Ho_Chi_Minh=Asia/Ho_Chi_Minh
-tz_name_Asia/Hong_Kong=Asia/Hong_Kong
+tz_name_Asia/Ho_Chi_Minh=Asia/Ho Chi Minh
+tz_name_Asia/Hong_Kong=Asia/Hong Kong
 tz_name_Asia/Hovd=Asia/Hovd
 tz_name_Asia/Irkutsk=Asia/Irkutsk
 tz_name_Asia/Istanbul=Asia/Istanbul
@@ -284,7 +284,7 @@ tz_name_Asia/Katmandu=Asia/Katmandu
 tz_name_Asia/Khandyga=Asia/Khandyga
 tz_name_Asia/Kolkata=Asia/Kolkata
 tz_name_Asia/Krasnoyarsk=Asia/Krasnoyarsk
-tz_name_Asia/Kuala_Lumpur=Asia/Kuala_Lumpur
+tz_name_Asia/Kuala_Lumpur=Asia/Kuala Lumpur
 tz_name_Asia/Kuching=Asia/Kuching
 tz_name_Asia/Kuwait=Asia/Kuwait
 tz_name_Asia/Macao=Asia/Macao
@@ -298,7 +298,7 @@ tz_name_Asia/Novokuznetsk=Asia/Novokuznetsk
 tz_name_Asia/Novosibirsk=Asia/Novosibirsk
 tz_name_Asia/Omsk=Asia/Omsk
 tz_name_Asia/Oral=Asia/Oral
-tz_name_Asia/Phnom_Penh=Asia/Phnom_Penh
+tz_name_Asia/Phnom_Penh=Asia/Phnom Penh
 tz_name_Asia/Pontianak=Asia/Pontianak
 tz_name_Asia/Pyongyang=Asia/Pyongyang
 tz_name_Asia/Qatar=Asia/Qatar
@@ -317,14 +317,14 @@ tz_name_Asia/Taipei=Asia/Taipei
 tz_name_Asia/Tashkent=Asia/Tashkent
 tz_name_Asia/Tbilisi=Asia/Tbilisi
 tz_name_Asia/Tehran=Asia/Tehran
-tz_name_Asia/Tel_Aviv=Asia/Tel_Aviv
+tz_name_Asia/Tel_Aviv=Asia/Tel Aviv
 tz_name_Asia/Thimbu=Asia/Thimbu
 tz_name_Asia/Thimphu=Asia/Thimphu
 tz_name_Asia/Tokyo=Asia/Tokyo
 tz_name_Asia/Tomsk=Asia/Tomsk
-tz_name_Asia/Ujung_Pandang=Asia/Ujung_Pandang
+tz_name_Asia/Ujung_Pandang=Asia/Ujung Pandang
 tz_name_Asia/Ulaanbaatar=Asia/Ulaanbaatar
-tz_name_Asia/Ulan_Bator=Asia/Ulan_Bator
+tz_name_Asia/Ulan_Bator=Asia/Ulan Bator
 tz_name_Asia/Urumqi=Asia/Urumqi
 tz_name_Asia/Ust-Nera=Asia/Ust-Nera
 tz_name_Asia/Vientiane=Asia/Vientiane
@@ -336,19 +336,19 @@ tz_name_Asia/Yerevan=Asia/Yerevan
 tz_name_Atlantic/Azores=Atlantic/Azores
 tz_name_Atlantic/Bermuda=Atlantic/Bermuda
 tz_name_Atlantic/Canary=Atlantic/Canary
-tz_name_Atlantic/Cape_Verde=Atlantic/Cape_Verde
+tz_name_Atlantic/Cape_Verde=Atlantic/Cape Verde
 tz_name_Atlantic/Faeroe=Atlantic/Faeroe
 tz_name_Atlantic/Faroe=Atlantic/Faroe
-tz_name_Atlantic/Jan_Mayen=Atlantic/Jan_Mayen
+tz_name_Atlantic/Jan_Mayen=Atlantic/Jan Mayen
 tz_name_Atlantic/Madeira=Atlantic/Madeira
 tz_name_Atlantic/Reykjavik=Atlantic/Reykjavik
-tz_name_Atlantic/South_Georgia=Atlantic/South_Georgia
-tz_name_Atlantic/St_Helena=Atlantic/St_Helena
+tz_name_Atlantic/South_Georgia=Atlantic/South Georgia
+tz_name_Atlantic/St_Helena=Atlantic/St Helena
 tz_name_Atlantic/Stanley=Atlantic/Stanley
 tz_name_Australia/ACT=Australia/ACT
 tz_name_Australia/Adelaide=Australia/Adelaide
 tz_name_Australia/Brisbane=Australia/Brisbane
-tz_name_Australia/Broken_Hill=Australia/Broken_Hill
+tz_name_Australia/Broken_Hill=Australia/Broken Hill
 tz_name_Australia/Canberra=Australia/Canberra
 tz_name_Australia/Currie=Australia/Currie
 tz_name_Australia/Darwin=Australia/Darwin
@@ -356,7 +356,7 @@ tz_name_Australia/Eucla=Australia/Eucla
 tz_name_Australia/Hobart=Australia/Hobart
 tz_name_Australia/LHI=Australia/LHI
 tz_name_Australia/Lindeman=Australia/Lindeman
-tz_name_Australia/Lord_Howe=Australia/Lord_Howe
+tz_name_Australia/Lord_Howe=Australia/Lord Howe
 tz_name_Australia/Melbourne=Australia/Melbourne
 tz_name_Australia/NSW=Australia/NSW
 tz_name_Australia/North=Australia/North
@@ -443,7 +443,7 @@ tz_name_Europe/Dublin=Europe/Dublin
 tz_name_Europe/Gibraltar=Europe/Gibraltar
 tz_name_Europe/Guernsey=Europe/Guernsey
 tz_name_Europe/Helsinki=Europe/Helsinki
-tz_name_Europe/Isle_of_Man=Europe/Isle_of_Man
+tz_name_Europe/Isle_of_Man=Europe/Isle of Man
 tz_name_Europe/Istanbul=Europe/Istanbul
 tz_name_Europe/Jersey=Europe/Jersey
 tz_name_Europe/Kaliningrad=Europe/Kaliningrad
@@ -467,7 +467,7 @@ tz_name_Europe/Prague=Europe/Prague
 tz_name_Europe/Riga=Europe/Riga
 tz_name_Europe/Rome=Europe/Rome
 tz_name_Europe/Samara=Europe/Samara
-tz_name_Europe/San_Marino=Europe/San_Marino
+tz_name_Europe/San_Marino=Europe/San Marino
 tz_name_Europe/Sarajevo=Europe/Sarajevo
 tz_name_Europe/Saratov=Europe/Saratov
 tz_name_Europe/Simferopol=Europe/Simferopol
@@ -552,12 +552,12 @@ tz_name_Pacific/Nauru=Pacific/Nauru
 tz_name_Pacific/Niue=Pacific/Niue
 tz_name_Pacific/Norfolk=Pacific/Norfolk
 tz_name_Pacific/Noumea=Pacific/Noumea
-tz_name_Pacific/Pago_Pago=Pacific/Pago_Pago
+tz_name_Pacific/Pago_Pago=Pacific/Pago Pago
 tz_name_Pacific/Palau=Pacific/Palau
 tz_name_Pacific/Pitcairn=Pacific/Pitcairn
 tz_name_Pacific/Pohnpei=Pacific/Pohnpei
 tz_name_Pacific/Ponape=Pacific/Ponape
-tz_name_Pacific/Port_Moresby=Pacific/Port_Moresby
+tz_name_Pacific/Port_Moresby=Pacific/Port Moresby
 tz_name_Pacific/Rarotonga=Pacific/Rarotonga
 tz_name_Pacific/Saipan=Pacific/Saipan
 tz_name_Pacific/Samoa=Pacific/Samoa

bubble-server/src/test/resources/models/system/cloudService.json

@@ -142,6 +142,7 @@
     "_subst": true,
     "name": "InviteCode",
     "type": "payment",
+    "priority": 200,
     "driverClass": "bubble.cloud.payment.code.CodePaymentDriver",
     "driverConfig": {},
     "credentials": {},

bubble-server/src/test/resources/models/system/cloudService_live.json

@@ -3,6 +3,7 @@
     "_subst": true,
     "name": "StripePayments",
     "type": "payment",
+    "priority": 100,
     "driverClass": "bubble.cloud.payment.stripe.StripePaymentDriver",
     "driverConfig": {
       "publicApiKey": "{{STRIPE_PUBLIC_API_KEY}}"

bubble-web

@@ -1 +1 @@
-Subproject commit 006efbd8fd0a77a7dcf9e8307d73dce2f6b098a9
+Subproject commit b500db5e9c4a0e621833e788dc4e6cf5fae5e2ee