combo box with amounts. use decimals

assets/javascripts/discourse/components/donation-form.js.es6

@@ -10,10 +10,13 @@ export default Ember.Component.extend({
     this._super(...arguments);
 
     const settings = Discourse.SiteSettings;
+    const amounts = Discourse.SiteSettings.discourse_patrons_amounts.split('|');
 
     this.setProperties({
       confirmation: false,
-      currency: settings.discourse_donations_currency
+      currency: settings.discourse_donations_currency,
+      amounts,
+      amount: amounts[0]
     });
   },
 

assets/javascripts/discourse/templates/components/donation-form.hbs

@@ -1,6 +1,6 @@
 
 {{#if confirmation}}
-  {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_donations.confirm")}}
+  {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_patrons.confirm")}}
     {{#d-modal-body}}
       <table class="discourse-donations-confirmation">
         <tr>
@@ -17,7 +17,7 @@
 
     <div class='modal-footer'>
       {{#d-button action="confirmStripeCard" class="btn btn-primary btn-payment"}}
-        {{i18n 'discourse_donations.submit'}} {{amount}}
+        {{i18n 'discourse_patrons.submit'}} {{amount}}
       {{/d-button}}
     </div>
 
@@ -32,14 +32,16 @@
 {{else}}
   <div class="discourse-patrons-section-columns">
     <div class="section-column">
-      <h3>Your information</h3>
+      <h3>{{i18n 'discourse_patrons.your_information'}}</h3>
 
       <div class="user-controls">
         <div class="display-row">
-          <div class="field">Payment Amount</div>
+          <div class="field">
+            {{i18n 'discourse_patrons.amount'}}
+            {{siteSettings.discourse_patrons_currency}}
+          </div>
           <div class="value">
-            {{input value=amount}}<br>
-            Enter {{currency}}
+            {{combo-box valueAttribute="value" content=amounts value=amount}}
           </div>
         </div>
       </div>

config/locales/client.en.yml

@@ -1,6 +1,6 @@
 en:
   site_settings:
-    discourse_patrons_enabled: "Enable the Discourse Donations plugin."
+    discourse_patrons_enabled: "Enable the Discourse Patrons plugin."
     discourse_patrons_secret_key: "Stripe Secret Key"
     discourse_patrons_public_key: "Stripe Public Key"
     discourse_patrons_description: "Description shown in Stripe Checkout form"
@@ -9,9 +9,9 @@ en:
     discourse_patrons_billing_address: "Collect billing address"
     discourse_patrons_reward_badge_name: "Grant this badge to user when a payment is successful"
     discourse_patrons_reward_group_name: "Add the user to this group when a payment is successful"
-    discourse_patrons_page_description: "Text to be added to /donate page. Markdown is supported."
+    discourse_patrons_page_description: "Text to be added to /patrons page. Markdown is supported."
     errors:
-      discourse_patrons_amount_must_be_number: "Amounts must be numbers"
+      discourse_patrons_amount_must_be_currency: "Currency amounts must be currencies (eg 1.50)"
 
   js:
     discourse_patrons:

config/settings.yml

@@ -10,6 +10,12 @@ plugins:
   discourse_patrons_description:
     client: true
     default: ''
+  discourse_patrons_amounts:
+    client: true
+    type: list
+    default: '1.00|2.00|5.00|10.00|20.00|50.00|100.00'
+    regex: "^([0-9]+.[0-9]{2}\\|)+[0-9]+.[0-9]{2}$"
+    regex_error: "site_settings.errors.discourse_patrons_amount_must_be_currency"
   discourse_patrons_currency:
     client: true
     default: "USD"
@@ -18,6 +24,5 @@ plugins:
       - AUD
       - CAD
       - EUR
-      - JPY
       - GBP
       - USD

test/javascripts/components/donation-form-test.es6

@@ -10,6 +10,7 @@ componentTest("Discourse Patrons donation form has content", {
       "component:stripe-card",
       Ember.Component.extend({ tagName: "dummy-component-tag" })
     );
+    Discourse.SiteSettings.discourse_patrons_amounts = "1.00|2.01";
   },
 
   async test(assert) {
@@ -29,6 +30,7 @@ componentTest("donation form has a confirmation", {
 
   beforeEach() {
     this.registry.register("component:stripe-card", Ember.Component.extend());
+    Discourse.SiteSettings.discourse_patrons_amounts = "1.00|2.01";
   },
 
   async test(assert) {