Conditionally set PAYPAL_PARTNER_ATTRIBUTION_ID in API configurations for improved flexibility

Author: deepakmaurya

angelleye-includes/paypal-rest-api-utility.php

@@ -367,7 +367,13 @@ public function set_payment() {
     public function getAuth() {
         $this->mode = $this->testmode == true ? 'SANDBOX' : 'LIVE';
         $auth = new ApiContext(new OAuthTokenCredential($this->rest_client_id, $this->rest_secret_id));
-        $auth->setConfig(array('mode' => $this->mode, 'http.headers.PayPal-Partner-Attribution-Id' => PAYPAL_PARTNER_ATTRIBUTION_ID, 'log.LogEnabled' => $this->debug, 'log.LogLevel' => ($this->mode == 'SANDBOX') ? 'DEBUG' : 'INFO', 'log.FileName' => angelleye_get_log_path('paypal_credit_card_rest')));
+        $config = [
+            'mode' => $this->mode, 'log.LogEnabled' => $this->debug, 'log.LogLevel' => ($this->mode == 'SANDBOX') ? 'DEBUG' : 'INFO', 'log.FileName' => angelleye_get_log_path('paypal_credit_card_rest')
+        ];
+        if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+            $config['http.headers.PayPal-Partner-Attribution-Id'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        }
+        $auth->setConfig($config);
         return $auth;
     }
 

classes/wc-gateway-braintree-angelleye.php

@@ -1411,7 +1411,9 @@ public function angelleye_do_payment($order) {
             }
             $request_data['orderId'] = $order->get_order_number();
             $request_data['options'] = $this->get_braintree_options();
-            $request_data['channel'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+            if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+                $request_data['channel'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+            }
             if (!empty($this->softdescriptor)) {
                 $request_data['descriptor'] = array('name' => $this->softdescriptor);
             }
@@ -2413,7 +2415,9 @@ public function process_subscription_payment($order, $amount, $payment_token = n
         }
         $request_data['orderId'] = $order->get_order_number();
         $request_data['options'] = $this->get_braintree_options();
-        $request_data['channel'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+            $request_data['channel'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        }
         if ($this->debug) {
             $this->add_log('Begin Transaction::sale() request');
             $this->add_log('Order: ' . print_r($order->get_order_number(), true));

classes/wc-gateway-paypal-advanced-angelleye.php

@@ -200,10 +200,12 @@ public function inquiry_transaction($order, $order_id) {
             'PWD[' . strlen($this->password) . ']' => $this->password,
             'ORIGID' => wc_clean($_POST['PNREF']),
             'TENDER' => 'C',
-            'TRXTYPE' => 'I',
-            'BUTTONSOURCE' => PAYPAL_PARTNER_ATTRIBUTION_ID
+            'TRXTYPE' => 'I'
         );
 
+        if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+            $paypal_args['BUTTONSOURCE'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        }
         $postData = ''; //stores the post data string
         foreach ($paypal_args as $key => $val) {
             $postData .= '&' . $key . '=' . $val;
@@ -509,9 +511,11 @@ public function get_secure_token($order) {
             'PAGEBUTTONBGCOLOR' => ltrim($this->page_button_bgcolor, '#'),
             'PAGEBUTTONTEXTCOLOR' => ltrim($this->page_button_textcolor, '#'),
             'LABELTEXTCOLOR' => ltrim($this->settings['label_textcolor'], '#'),
-            'MERCHDESCR' => $this->softdescriptor,
-            'BUTTONSOURCE' => PAYPAL_PARTNER_ATTRIBUTION_ID
+            'MERCHDESCR' => $this->softdescriptor
         );
+        if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+            $paypal_args['BUTTONSOURCE'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        }
         if (empty($shipping_state)) {
             $paypal_args['SHIPTOSTATE[' . strlen($shipping_city) . ']'] = $shipping_city;
         } else {
@@ -1200,9 +1204,11 @@ public function create_reference_transaction($token, $order) {
             'SHIPTOCITY[' . strlen($shipping_city) . ']' => $shipping_city,
             'SHIPTOZIP' => $shipping_postcode,
             'SHIPTOCOUNTRY[' . strlen($shipping_country) . ']' => $shipping_country,
-            'MERCHDESCR' => $this->softdescriptor,
-            'BUTTONSOURCE' => PAYPAL_PARTNER_ATTRIBUTION_ID
+            'MERCHDESCR' => $this->softdescriptor
         );
+        if (defined('PAYPAL_PARTNER_ATTRIBUTION_ID') && !empty(PAYPAL_PARTNER_ATTRIBUTION_ID)) {
+            $paypal_args['BUTTONSOURCE'] = PAYPAL_PARTNER_ATTRIBUTION_ID;
+        }
         if ($this->is_subscription($order_id)) {
             $paypal_args['origid'] = $order->get_meta( '_payment_tokens_id', true);
         }