Discourse/discourse-subscriptions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toggle single payments allowed setting

Browse Source
This commit is contained in:
Rimian Perkins
2019-12-17 21:14:13 +11:00
parent a09abb4a29
commit 9176471551
9 changed files with 75 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/javascripts/discourse/components/donation-form.js.es6
-50
View File
@@ -1,50 +0,0 @@
import { default as computed } from "ember-addons/ember-computed-decorators";
export default Ember.Component.extend({
@computed("confirmation.card.last4")
last4() {
return this.get("confirmation.card.last4");
},
init() {
this._super(...arguments);
const settings = Discourse.SiteSettings;
const amounts = settings.discourse_patrons_amounts.split("|");
this.setProperties({
confirmation: false,
currency: settings.discourse_donations_currency,
amounts,
amount: amounts[0]
});
},
actions: {
closeModal() {
this.set("paymentError", false);
this.set("confirmation", false);
},
handleConfirmStripeCard(paymentMethod, receiptEmail) {
this.set("receiptEmail", receiptEmail);
this.set("confirmation", paymentMethod);
},
confirmStripeCard() {
const data = {
payment_method_id: this.confirmation.id,
amount: this.amount,
receipt_email: this.receiptEmail
};
this.stripePaymentHandler(data).then(paymentIntent => {
if (paymentIntent.error) {
this.set("paymentError", paymentIntent.error);
} else {
this.paymentSuccessHandler(paymentIntent.id);
}
});
}
}
});
assets/javascripts/discourse/components/stripe-card.js.es6
-77
View File
@@ -1,77 +0,0 @@
export default Ember.Component.extend({
init() {
this._super(...arguments);
const settings = Discourse.SiteSettings;
this.setProperties({
cardError: false,
color: jQuery("body").css("color"),
backgroundColor: jQuery("body").css("background-color"),
stripe: Stripe(settings.discourse_subscriptions_public_key)
});
},
didInsertElement() {
this._super(...arguments);
const color = this.get("color");
const style = {
base: {
color,
iconColor: color,
"::placeholder": { color }
}
};
const elements = this.stripe.elements();
const card = elements.create("card", { style, hidePostalCode: true });
card.mount("#card-element");
this.set("card", card);
card.on("change", result => {
this.set("cardError", false);
if (result.error) {
this.set("cardError", result.error.message);
}
});
},
validateBilling() {
const billing = this.get("billing");
const deleteEmpty = key => {
if (Ember.isEmpty(billing.get(key))) {
billing.set(key, undefined);
}
};
["name", "phone"].forEach(key => deleteEmpty(key));
},
actions: {
submitStripeCard() {
this.validateBilling();
const paymentOptions = { billing_details: this.get("billing") };
this.stripe.createPaymentMethod("card", this.card, paymentOptions).then(
result => {
if (result.error) {
this.set("cardError", result.error.message);
} else {
this.handleConfirmStripeCard(
result.paymentMethod,
this.get("billing.email")
);
}
},
() => {
this.set("cardError", "Unknown error.");
}
);
}
}
});
assets/javascripts/discourse/controllers/s-show.js.es6
+4
View File
@@ -18,6 +18,10 @@ export default Ember.Controller.extend({
init() {
this._super(...arguments);
this.set(
"paymentsAllowed",
Discourse.SiteSettings.discourse_subscriptions_allow_payments
);
this.set(
"stripe",
Stripe(Discourse.SiteSettings.discourse_subscriptions_public_key)
assets/javascripts/discourse/templates/components/payment-options.hbs
+20 -18
View File
@@ -1,23 +1,25 @@
<div class="subscribe-buttons">
{{#ds-button
id="discourse-subscriptions-payment-type-plan"
selected=planButtonSelected
action="selectPlans"
class="btn-discourse-subscriptions-payment-type"
}}
{{i18n "discourse_subscriptions.plans.purchase"}}
{{/ds-button}}
{{#if paymentsAllowed}}
<div class="subscribe-buttons">
{{#ds-button
id="discourse-subscriptions-payment-type-plan"
selected=planButtonSelected
action="selectPlans"
class="btn-discourse-subscriptions-payment-type"
}}
{{i18n "discourse_subscriptions.plans.purchase"}}
{{/ds-button}}
{{#ds-button
id="discourse-subscriptions-payment-type-payment"
selected=paymentButtonSelected
action="selectPayments"
class="btn-discourse-subscriptions-payment-type"
}}
{{i18n "discourse_subscriptions.payment.purchase"}}
{{/ds-button}}
</div>
{{#ds-button
id="discourse-subscriptions-payment-type-payment"
selected=paymentButtonSelected
action="selectPayments"
class="btn-discourse-subscriptions-payment-type"
}}
{{i18n "discourse_subscriptions.payment.purchase"}}
{{/ds-button}}
</div>
{{/if}}
<hr>
assets/javascripts/discourse/templates/components/stripe-card.hbs
-15
View File
@@ -1,15 +0,0 @@
<div id="stripe-elements">
<div id="card-element"></div>
<div id="card-action">
{{#d-button action="submitStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}}
{{i18n 'discourse_subscriptions.buttons.make_payment'}} {{format-curency amount}}
{{/d-button}}
{{#if cardError}}
<div class="popup-tip bad">
{{cardError}}
</div>
{{/if}}
</div>
</div>
assets/javascripts/discourse/templates/s/show.hbs
+6
View File
@@ -4,6 +4,9 @@
<h2>
{{model.product.name}}
</h2>
<hr>
<p>
{{model.product.description}}
</p>
@@ -14,8 +17,11 @@
{{i18n 'discourse_subscriptions.subscribe.card.title'}}
</h2>
<hr>
{{payment-options
plans=model.plans
paymentsAllowed=paymentsAllowed
planTypeIsSelected=planTypeIsSelected
}}