Skip to content

fix: Stripe working on test & development mode #3753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2020
Merged

fix: Stripe working on test & development mode #3753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/components/forms/wizard/basic-details-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import FormMixin from 'open-event-frontend/mixins/form';
import { inject as service } from '@ember/service';
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
import ENV from 'open-event-frontend/config/environment';

export default Component.extend(FormMixin, EventWizardMixin, {

Expand Down Expand Up @@ -366,7 +367,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
.then(authorization => {
this.set('data.event.stripeAuthorization', this.store.createRecord('stripe-authorization', {
stripeAuthCode : authorization.authorizationCode,
stripePublishableKey : this.settings.stripePublishableKey
stripePublishableKey : ENV.environment === 'development' || ENV.environment === 'test' ? this.settings.stripeTestPublishableKey : this.settings.stripePublishableKey
}));
})
.catch(error => {
Expand Down
2 changes: 1 addition & 1 deletion app/templates/public/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="ui segment">
<h3 class="ui header">{{t 'Tickets'}}</h3>
</div>
<div class="ui segment x-scrollable">
<div class="ui segment">
{{public/ticket-list eventCurrency=model.event.paymentCurrency
ticketUrl=model.event.ticketUrl
data=model.tickets
Expand Down
3 changes: 2 additions & 1 deletion app/torii-providers/stripe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import stripeConnect from 'torii/providers/stripe-connect';
import { alias } from '@ember/object/computed';
import { inject } from '@ember/service';
import { configurable } from 'torii/configuration';
import ENV from 'open-event-frontend/config/environment';

export default stripeConnect.extend({
settings: inject(),

clientId: alias('settings.stripeClientId'),
clientId: ENV.environment === 'development' || ENV.environment === 'test' ? alias('settings.stripeTestClientId') : alias('settings.stripeClientId'),

redirectUri: configurable('redirectUri', function() {
return `${window.location.origin}/torii/redirect.html`;
Expand Down