Skip to content

Commit 5979194

Browse files
authored
fix: Change position of Paypal/Pay Now Button (#5621)
1 parent 5ae084a commit 5979194

File tree

1 file changed

+46
-52
lines changed

1 file changed

+46
-52
lines changed

app/templates/orders/pending.hbs

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -20,64 +20,58 @@
2020
@data={{this.model.order}}
2121
@event={{this.model.event}}
2222
@eventCurrency={{this.model.order.event.paymentCurrency}} />
23-
</div>
24-
<div class="mobile hidden seven wide column">
25-
<Orders::EventInfo
26-
@data={{this.model.order}} />
27-
</div>
28-
</div>
29-
<div class="row">
30-
<div class="nine wide right aligned column">
31-
{{#if this.isStripe}}
32-
<StripeCheckout
33-
@image="https://stripe.com/img/documentation/checkout/marketplace.png"
34-
@currency={{this.model.order.event.paymentCurrency}}
35-
@locale="auto"
36-
@name="Open Event"
37-
@class="ui right labeled icon blue button"
38-
@description={{this.paymentDescription}}
39-
@amount={{this.paymentAmount}}
40-
@key={{this.model.order.event.stripeAuthorization.stripePublishableKey}}
41-
@onToken={{action "processStripeToken"}}
42-
@onClosed={{action "checkoutClosed"}}
43-
@onOpened={{action "checkoutOpened"}}>
44-
{{t 'Pay Now'}}
45-
<i class="credit card icon"></i>
46-
</StripeCheckout>
47-
{{/if}}
48-
{{#if this.isPaypal}}
49-
<div class='paypal-button'>
50-
<PaypalButton
51-
@data={{this.model.order}}
52-
@paymentFor="order" />
53-
</div>
54-
{{/if}}
55-
{{#if this.isOmise}}
56-
<div>
57-
<form class="checkout-form" name="checkoutForm" method='POST' action={{this.omiseFormAction}}>
58-
<script type="text/javascript" src="https://cdn.omise.co/omise.js" data-key="{{this.publicKeyOmise}}" data-amount="{{this.paymentAmount}}" data-currency="{{this.model.order.event.paymentCurrency}}" data-default-payment-method="credit_card">
59-
</script>
60-
</form>
61-
</div>
62-
{{/if}}
63-
{{#if this.isPaytm}}
64-
<button class="ui button primary" {{action "openPaytmModal"}}>{{t 'Pay with PayTM'}}</button>
65-
{{/if}}
66-
{{#if this.isAliPay}}
67-
<button class="ui button primary"
68-
{{action "alipayCheckout" this.model.order.identifier}}>{{t 'Pay with AliPay'}}</button>
69-
{{/if}}
70-
</div>
71-
</div>
72-
73-
<div class="row">
74-
<div class="nine wide column">
23+
<br/>
7524
<Forms::Orders::AttendeeList
7625
@save="save"
7726
@data={{this.model.order}}
7827
@fields={{this.model.form}} />
7928
</div>
8029
<div class="seven wide column">
30+
<Orders::EventInfo
31+
@data={{this.model.order}} />
32+
<br/>
33+
<div>
34+
{{#if this.isStripe}}
35+
<StripeCheckout
36+
@image="https://stripe.com/img/documentation/checkout/marketplace.png"
37+
@currency={{this.model.order.event.paymentCurrency}}
38+
@locale="auto"
39+
@name="Open Event"
40+
@class="ui right labeled icon blue button"
41+
@description={{this.paymentDescription}}
42+
@amount={{this.paymentAmount}}
43+
@key={{this.model.order.event.stripeAuthorization.stripePublishableKey}}
44+
@onToken={{action "processStripeToken"}}
45+
@onClosed={{action "checkoutClosed"}}
46+
@onOpened={{action "checkoutOpened"}}>
47+
{{t 'Pay Now'}}
48+
<i class="credit card icon"></i>
49+
</StripeCheckout>
50+
{{/if}}
51+
{{#if this.isPaypal}}
52+
<div class='paypal-button ui fluid button'>
53+
<PaypalButton
54+
@data={{this.model.order}}
55+
@paymentFor="order" />
56+
</div>
57+
{{/if}}
58+
{{#if this.isOmise}}
59+
<div>
60+
<form class="checkout-form" name="checkoutForm" method='POST' action={{this.omiseFormAction}}>
61+
<script type="text/javascript" src="https://cdn.omise.co/omise.js" data-key="{{this.publicKeyOmise}}" data-amount="{{this.paymentAmount}}" data-currency="{{this.model.order.event.paymentCurrency}}" data-default-payment-method="credit_card">
62+
</script>
63+
</form>
64+
</div>
65+
{{/if}}
66+
{{#if this.isPaytm}}
67+
<button class="ui fluid button primary" {{action "openPaytmModal"}}>{{t 'Pay with PayTM'}}</button>
68+
{{/if}}
69+
{{#if this.isAliPay}}
70+
<button class="ui fluid button primary"
71+
{{action "alipayCheckout" this.model.order.identifier}}>{{t 'Pay with AliPay'}}</button>
72+
{{/if}}
73+
</div>
74+
<br/>
8175
<Orders::TicketHolder
8276
@data={{this.model.order}} />
8377
</div>

0 commit comments

Comments
 (0)