fix: change button positions and take out repeating buttons (#3344)

* fix: change button positioning

* build fixes

Author: uds5501

app/templates/orders/pending.hbs

@@ -13,26 +13,6 @@
           {{model.order.event.locationName}}
         </div>
       </div>
-      {{#if isPaypal}}
-        <div class='paypal-button'>
-          {{paypal-button data=model.order}}
-        </div>
-      {{/if}}
-      {{#if isOmise}}
-        <div>
-          <form class="checkout-form" name="checkoutForm" method='POST' action={{omiseFormAction}}>
-            <script type="text/javascript" src="https://cdn.omise.co/omise.js"
-                    data-key="{{publicKeyOmise}}"
-                    data-amount="{{paymentAmount}}"
-                    data-currency="{{model.order.event.paymentCurrency}}"
-                    data-default-payment-method="credit_card">
-            </script>
-          </form>
-        </div>
-      {{/if}}
-      {{#if isAliPay}}
-        <button class="ui button primary" {{action alipayCheckout model.order.identifier}}>{{t 'Pay with AliPay'}}</button>          
-      {{/if}}
     </div>
     <div class="row">
       <div class="nine wide column">
@@ -69,6 +49,21 @@
             {{paypal-button data=model.order}}
           </div>
         {{/if}}
+        {{#if isOmise}}
+          <div>
+            <form class="checkout-form" name="checkoutForm" method='POST' action={{omiseFormAction}}>
+              <script type="text/javascript" src="https://cdn.omise.co/omise.js"
+                      data-key="{{publicKeyOmise}}"
+                      data-amount="{{paymentAmount}}"
+                      data-currency="{{model.order.event.paymentCurrency}}"
+                      data-default-payment-method="credit_card">
+              </script>
+            </form>
+          </div>
+        {{/if}}
+        {{#if isAliPay}}
+          <button class="ui button primary" {{action alipayCheckout model.order.identifier}}>{{t 'Pay with AliPay'}}</button>          
+        {{/if}}
       </div>
     </div>