Pfw 242

angelleye-includes/angelleye-utility.php

@@ -297,6 +297,14 @@ public function angelleye_woocommerce_order_actions($order_actions = array()) {
                     case 'braintree' : {
                         $this->total_Order = $order->get_total();
                         $this->total_DoCapture = self::get_total('DoCapture', 'submitted_for_settlement', $order_id);
+                        if( $this->total_DoCapture == 0 ) {
+                            $this->total_DoCapture = self::get_total('DoCapture', 'settling', $order_id);
+                        }
+                        $this->total_Order = self::get_total('Order', 'Pending', $order_id);
+                        $this->total_DoVoid = self::get_total('DoVoid', '', $order_id);
+                        $this->total_Pending_DoAuthorization = self::get_total('DoAuthorization', 'Pending', $order_id);
+                        $this->total_Completed_DoAuthorization = self::get_total('DoAuthorization', 'Completed', $order_id);
+                        $this->total_DoReauthorization = self::get_total('DoReauthorization', '', $order_id);
                         $paypal_payment_action = array();
                         $paypal_payment_action = array('DoCapture' => 'Capture');
                         if ($this->total_DoCapture >= ($order->get_total() - $order->get_total_refunded())) {

angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php

@@ -32,6 +32,7 @@ public function __construct($gateway) {
             $this->email_notify_order_cancellations = $this->gateway->get_option('email_notify_order_cancellations', 'no');
             $this->pending_authorization_order_status = $this->gateway->get_option('pending_authorization_order_status', 'On Hold');
             $this->enable_in_context_checkout_flow = $this->gateway->get_option('enable_in_context_checkout_flow', 'yes');
+            $this->id = 'paypal_express';
             if ($this->testmode == false) {
                 $this->testmode = AngellEYE_Utility::angelleye_paypal_for_woocommerce_is_set_sandbox_product();
             }

assets/css/braintree-checkout.css

@@ -0,0 +1,40 @@
+.woocommerce-checkout #payment div.payment_box .wc-credit-card-form div.hosted-field-braintree, .woocommerce #payment div.payment_box .wc-credit-card-form div.hosted-field-braintree {
+    height:2em;padding:7px;border:1px solid #ccc;border-radius:3px;transition:border-color .16s;-webkit-transition:border-color .16s;background-color:#fff;
+    border-color: #c7c1c6;
+    border-top-color: rgb(199, 193, 198);
+    border-top-color: #bbb3b9;
+}
+.angelleye-braintree-hidden {
+    display: none;
+}
+
+
+
+#modal-angelleye-braintree {
+
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0,0,0,.7);
+  z-index: 3000;
+  cursor: pointer;
+}
+#modal-angelleye-braintree iframe {
+    overflow: auto;
+  margin: auto;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: #fff;
+  padding: 1em;
+  box-sizing: content-box;
+  border-radius: 5px;
+}
+
+.woocommerce-checkout #payment div.payment_box #wc-braintree-cc-form.wc-credit-card-form div.form-row,  .woocommerce #payment div.payment_box #wc-braintree-cc-form.wc-credit-card-form div.form-row{
+    padding: 3px;
+}

assets/css/checkout.css

@@ -104,6 +104,10 @@ p.woocommerce-SavedPaymentMethods-saveNew {
 p.woocommerce-SavedPaymentMethods-saveNew label {
     vertical-align: middle;
 }
+
+
+
+
 @media only screen 
   and (min-device-width: 320px) 
   and (max-device-width: 480px) {