From 495de344221eb0ffba895a5859900fdc477e0b65 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@gmail.com>
Date: Thu, 4 Aug 2016 11:32:26 +0530
Subject: [PATCH] Braintree - MID Compatibility, ref #521

---
 classes/wc-gateway-braintree-angelleye.php | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/classes/wc-gateway-braintree-angelleye.php b/classes/wc-gateway-braintree-angelleye.php
index 6aed4fb86..67192eedd 100644
--- a/classes/wc-gateway-braintree-angelleye.php
+++ b/classes/wc-gateway-braintree-angelleye.php
@@ -31,6 +31,7 @@ function __construct() {
         $this->private_key = $this->sandbox == 'no' ? $this->get_option('private_key') : $this->get_option('sandbox_private_key');
         $this->public_key = $this->sandbox == 'no' ? $this->get_option('public_key') : $this->get_option('sandbox_public_key');
         $this->enable_braintree_drop_in = $this->get_option('enable_braintree_drop_in') === "yes" ? true : false;
+        $this->merchant_account_id = $this->sandbox == 'no' ? $this->get_option('merchant_account_id') : $this->get_option('sandbox_merchant_account_id');
         $this->debug = isset($this->settings['debug']) && $this->settings['debug'] == 'yes' ? true : false;
         add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
         $this->response = '';
@@ -51,8 +52,8 @@ public function admin_options() {
             <?php $this->generate_settings_html(); ?>
             <script type="text/javascript">
                 jQuery('#woocommerce_braintree_sandbox').change(function () {
-                    var sandbox = jQuery('#woocommerce_braintree_sandbox_public_key, #woocommerce_braintree_sandbox_private_key, #woocommerce_braintree_sandbox_merchant_id').closest('tr'),
-                            production = jQuery('#woocommerce_braintree_public_key, #woocommerce_braintree_private_key, #woocommerce_braintree_merchant_id').closest('tr');
+                    var sandbox = jQuery('#woocommerce_braintree_sandbox_public_key, #woocommerce_braintree_sandbox_private_key, #woocommerce_braintree_sandbox_merchant_id, #woocommerce_braintree_sandbox_merchant_account_id').closest('tr'),
+                            production = jQuery('#woocommerce_braintree_public_key, #woocommerce_braintree_private_key, #woocommerce_braintree_merchant_id, #woocommerce_braintree_merchant_account_id').closest('tr');
                     if (jQuery(this).is(':checked')) {
                         sandbox.show();
                         production.hide();
@@ -171,6 +172,14 @@ public function init_form_fields() {
                 'description' => __('Place the payment gateway in sandbox mode using sandbox API keys (real payments will not be taken).', 'paypal-for-woocommerce'),
                 'default' => 'yes'
             ),
+            'sandbox_merchant_account_id' => array (
+                'type' => 'text',
+                'default' => '',
+                'title' => __ ( 'Sandbox Merchant Account Id', 'paypal-for-woocommerce' ),
+                'tool_tip' => true,
+                'description' => __ ( 'NOTE: Not to be confused with the API key Merchant ID. The Merchant Account ID determines the currency that the payment is settled in. You can find your Merchant Account Id by logging into Braintree,
+                                and clicking Settings > Processing and scrolling to the bottom of the page.', 'paypal-for-woocommerce' ) 
+            ),
             'sandbox_merchant_id' => array(
                 'title' => __('Sandbox Merchant ID', 'paypal-for-woocommerce'),
                 'type' => 'password',
@@ -192,6 +201,14 @@ public function init_form_fields() {
                 'default' => '',
                 'desc_tip' => true
             ),
+            'merchant_account_id' => array (
+                'type' => 'text',
+                'default' => '',
+                'title' => __ ( 'Live Merchant Account Id', 'paypal-for-woocommerce' ),
+                'tool_tip' => true,
+                'description' => __ ( 'NOTE: Not to be confused with the API key Merchant ID. The Merchant Account ID determines the currency that the payment is settled in. You can find your Merchant Account Id by logging into Braintree,
+                                and clicking Settings > Processing and scrolling to the bottom of the page.', 'paypal-for-woocommerce' ) 
+            ),
             'merchant_id' => array(
                 'title' => __('Live Merchant ID', 'paypal-for-woocommerce'),
                 'type' => 'password',
@@ -388,6 +405,9 @@ public function angelleye_do_payment($order) {
                 'email' => $order->billing_email,
             );
             $request_data['amount'] = number_format($order->get_total(), 2, '.', '');
+            if( isset($this->merchant_account_id) && !empty($this->merchant_account_id)) {
+                $request_data['merchantAccountId'] = $this->merchant_account_id;
+            }
             $request_data['orderId'] = $order->get_order_number();
             $request_data['options'] = $this->get_braintree_options();
             $request_data['channel'] = 'AngellEYEPayPalforWoo_BT';