From 8a33c0b804c54db5d7acecc1f4afc6fabb1a4d0e Mon Sep 17 00:00:00 2001
From: Kcppdevelopers <kcppdevelopers@gmail.com>
Date: Mon, 22 May 2017 16:38:40 +0530
Subject: [PATCH] Express Checkout - Review Screen Button Aligntment, ref #748

---
 ...gateway-paypal-express-helper-angelleye.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
index 5ebc4adc1..38e4d85c6 100644
--- a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
+++ b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
@@ -246,13 +246,6 @@ public function ec_display_checkout_fields($checkout_fields) {
                             $checkout_fields['billing']['billing_' . $field]['class'][] = 'hidden';
                         }
                     }
-//                    if (isset($checkout_fields['shipping']) && isset($checkout_fields['shipping']['billing_' . $field])) {
-//                        $required = isset($checkout_fields['billing']['billing_' . $field]['required']) && $checkout_fields['billing']['billing_' . $field]['required'];
-//                        if (!$required || $required && $value) {
-//                            $checkout_fields['billing']['billing_' . $field]['class'][] = 'express-provided';
-//                            $checkout_fields['billing']['billing_' . $field]['class'][] = 'hidden';
-//                        }
-//                    }
                 }
             }
             return $checkout_fields;
@@ -408,7 +401,6 @@ public function top_cart_button() {
     
      public function mini_cart_button() {
           if (AngellEYE_Utility::is_express_checkout_credentials_is_set()) {
-             $this->woocommerce_before_cart();
              $mini_cart_button_html = '';
              $mini_cart_button_html .= $this->woocommerce_paypal_express_checkout_button_angelleye($return = true);
              $mini_cart_button_html .= "<div class='clear'></div>";
@@ -573,16 +565,16 @@ public function woocommerce_before_cart() {
                     $checkout_button_display_text = $this->show_on_cart == 'yes' ? __('Pay with Credit Card', 'paypal-for-woocommerce') : __('Proceed to Checkout','paypal-for-woocommerce');
                     echo '<script type="text/javascript">
                                 jQuery(document).ready(function(){
-                                    if (jQuery(".checkout-button, .button.checkout.wc-forward").is("input")) {
-                                        jQuery(".checkout-button, .button.checkout.wc-forward").val("' . $checkout_button_display_text . '");
+                                    if (jQuery(".checkout-button").is("input")) {
+                                        jQuery(".checkout-button").val("' . $checkout_button_display_text . '");
                                     } else {
-                                        jQuery(".checkout-button, .button.checkout.wc-forward").html("<span>' . $checkout_button_display_text . '</span>");
+                                        jQuery(".checkout-button").html("<span>' . $checkout_button_display_text . '</span>");
                                     }
                                 });
                               </script>';
                 } elseif ($this->show_on_cart == 'yes') {
                     echo '<style> input.checkout-button,
-                                 a.checkout-button, .button.checkout.wc-forward {
+                                 a.checkout-button {
                                     display: none !important;
                                 }</style>';
                 }
@@ -594,7 +586,7 @@ public function angelleye_woocommerce_order_button_html($order_button_hrml) {
         if($this->function_helper->ec_is_express_checkout()) {
             $order_button_text = __('Cancel order', 'paypal-for-woocommerce');
             $cancel_order_url = add_query_arg('pp_action', 'cancel_order', WC()->api_request_url('WC_Gateway_PayPal_Express_AngellEYE'));
-            $order_button_hrml .= apply_filters( 'angelleye_review_order_cance_button_html', '<a class="button alt angelleye_cancel" name="woocommerce_checkout_place_order" href="' . esc_attr( $cancel_order_url ) . '" >' .$order_button_text. '</a>' );
+            $order_button_hrml = apply_filters( 'angelleye_review_order_cance_button_html', '<a class="button alt angelleye_cancel" name="woocommerce_checkout_place_order" href="' . esc_attr( $cancel_order_url ) . '" >' .$order_button_text. '</a>'. $order_button_hrml );
         }
         return $order_button_hrml;
     }