Merge branch 'release' into PPL-167

angelleye · Feb 2, 2020 · ba624cf · ba624cf
2 parents 9150162 + c9113af
commit ba624cf
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/samples/rest/invoice/ListInvoice.php b/samples/rest/invoice/ListInvoice.php
@@ -16,7 +16,7 @@
 $parameters = array(
     'page'                  => '0',                // A zero-relative index of the list of merchant invoices.
     'page_size'             => '4',                // The number of invoices to list beginning with the specified page.
-    'total_count_required ' => 'true',             // Indicates whether the total count appears in the response. Default is false.
+    'total_count_required' => 'true'             // Indicates whether the total count appears in the response. Default is false.
 );
 
 $returnArray = $PayPal->ListInvoice($parameters);

diff --git a/src/angelleye/PayPal/PayPal.php b/src/angelleye/PayPal/PayPal.php
@@ -24,7 +24,7 @@
  * @link			https://github.com/angelleye/paypal-php-library/
  * @website			http://www.angelleye.com
  * @support         http://www.angelleye.com/product/premium-support/
- * @version			v3.0.2
+ * @version			v3.0.4
  * @filesource
 */
 

diff --git a/src/angelleye/PayPal/RestClass.php b/src/angelleye/PayPal/RestClass.php
@@ -63,7 +63,9 @@ public function __construct($configArray){
         $this->_api_context = new \PayPal\Rest\ApiContext(
             new \PayPal\Auth\OAuthTokenCredential($configArray['ClientID'], $configArray['ClientSecret'])
         );
-
+
+        //$this->set_partner_attribution_id('');
+
         $path = '';
         if (isset($configArray['LogPath'])){
             $path = $configArray['LogPath'].'/PayPal.log';
@@ -84,7 +86,7 @@ public function __construct($configArray){
                   'mode' => $mode,
                   'log.LogEnabled' => isset($configArray['LogResults']) ? $configArray['LogResults'] : false,
                   'log.FileName' => $path,
-                  'log.LogLevel' => isset($configArray['LogLevel']) ? $configArray['LogPath'] : 'INFO'
+                  'log.LogLevel' => isset($configArray['LogLevel']) ? $configArray['LogLevel'] : 'INFO'
                 )
         );
     }
@@ -100,7 +102,7 @@ public function get_api_context(){
     }
 
     /**
-     * Set BN code/value with the 
+     * Set PayPal Partner BN code/value with the 
      * set_partner_attribution_id function 
      * by passing the source value to it.
      * 
@@ -288,4 +290,4 @@ public function isJson($string) {
         json_decode($string);
         return (json_last_error() == JSON_ERROR_NONE);
     }
-}
+}
diff --git a/src/angelleye/PayPal/rest/invoice/InvoiceAPI.php b/src/angelleye/PayPal/rest/invoice/InvoiceAPI.php
@@ -295,7 +295,7 @@ public function ListInvoice($params,$third_party=false,$refesh_token=''){
             if($third_party === true  && !empty($refesh_token)){
                 $apiContext->getCredential()->updateAccessToken($apiContext->getConfig(), $refesh_token);
             }
-            $invoices = Invoice::getAll(array_filter($params), $this->_api_context);
+            $invoices = Invoice::getAll($params, $this->_api_context);            
             $returnArray['RESULT'] = 'Success';
             $returnArray['INVOICES'] = $invoices->toArray();
             return $returnArray;

diff --git a/src/angelleye/PayPal/rest/notifications/NotificationsAPI.php b/src/angelleye/PayPal/rest/notifications/NotificationsAPI.php
@@ -100,6 +100,9 @@ public function CreateWebhook($requestData){
             $returnArray['RAWRESPONSE']=$output->toJSON();
             return $returnArray;
         }
+        catch (Exception $ex) {
+            return $this->createErrorResponse($ex);
+        }
         catch (\PayPal\Exception\PayPalConnectionException $ex) {
            return $this->createErrorResponse($ex);
         }        
@@ -121,6 +124,8 @@ public function ListWebhooks($requestData){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException $ex) {
+           return $this->createErrorResponse($ex);
         }                
     }    
 
@@ -140,6 +145,8 @@ public function GetWebhook($webhook_id){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException $ex) {
+           return $this->createErrorResponse($ex);
         }
     }
 
@@ -161,6 +168,8 @@ public function DeleteWebhook($webhook_id){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException $ex) {
+           return $this->createErrorResponse($ex);
         }
     }
 
@@ -212,6 +221,8 @@ public function UpdateWebhook($webhook_id,$requestData){
             }
         } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
             return $this->createErrorResponse($ex);
+        } catch (Exception $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -232,6 +243,8 @@ public function SearchWebhookEvents($params){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -251,6 +264,8 @@ public function EventNotificationDetails($event_id){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -272,6 +287,8 @@ public function ResendEventNotification($event_id){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -291,6 +308,8 @@ public function WebhooksEventTypes(){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -311,6 +330,8 @@ public function WebhooksEventTypesById($webhook_id){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -342,6 +363,8 @@ public function VerifyWebhookSignature($headers,$webhook_id,$request_body){
         }
         catch (Exception $ex){
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 
@@ -363,6 +386,8 @@ public function SimulateEvent($params){
             return $returnArray;
         } catch (Exception $ex) {
             return $this->createErrorResponse($ex);
+        } catch (\PayPal\Exception\PayPalConnectionException  $ex) {
+            return $this->createErrorResponse($ex);
         }
     }
 

diff --git a/templates/classic/DoDirectPayment.php b/templates/classic/DoDirectPayment.php
@@ -96,12 +96,15 @@
 
 array_push($OrderItems, $Item);
 
+/**
+ * Important note : 3-D Secure Request Fields (UK Merchants Only)
+ */
 $Secure3D = array(
-				  'authstatus3d' => '', 
-				  'mpivendor3ds' => '', 
-				  'cavv' => '', 
-				  'eci3ds' => '', 
-				  'xid' => ''
+				  'authstatus3ds' => '', 					     // (Optional) A value returned by CardinalCommerce. If the cmpi_lookup request returns Y for Enrolled, set this field to the PAResStatus value returned by cmpi_authenticate. Otherwise, set this field to blank.
+				  'mpivendor3ds' => '', 						 // (Optional) A value returned by CardinalCommerce. Set this field to the Enrolled value returned by cmpi_lookup.
+				  'cavv' => '', 								 // (Optional) A value returned by CardinalCommerce. If the cmpi_lookup request returns Y for Enrolled, set this field to the Cavv value returned by cmpi_authenticate. Otherwise, set this field to blank.	
+				  'eci3ds' => '',								 // (Optional) A value returned by CardinalCommerce. If the cmpi_lookup request returns Y for Enrolled, set this field to the EciFlag value returned by cmpi_authenticate. Otherwise, set this field to the EciFlag value returned by cmpi_lookup.
+				  'xid' => ''									 // (Optional) A value returned by CardinalCommerce. If the cmpi_lookup request returns Y for Enrolled, set this field to the Xid value returned by cmpi_authenticate. Otherwise, set this field to blank.	
 				  );
 
 $PayPalRequestData = array(
@@ -111,7 +114,8 @@
 						   'BillingAddress' => $BillingAddress, 
 						   'ShippingAddress' => $ShippingAddress, 
 						   'PaymentDetails' => $PaymentDetails, 
-						   'OrderItems' => $OrderItems
+						   'OrderItems' => $OrderItems,
+						   'Secure3D' => $Secure3D,
 						   );
 
 // Pass data into class for processing with PayPal and load the response array into $PayPalResult

diff --git a/templates/rest/referenced_payouts/create_referenced_batch_payout.php b/templates/rest/referenced_payouts/create_referenced_batch_payout.php
@@ -26,9 +26,6 @@
 $Prefer = '';
 $PayPal_Request_Id = '';          // The server stores keys for three days. For more information about PayPal-Request-Id, see https://developer.paypal.com/docs/api/overview/#paypal-request-id
 
-if(!empty($PayPal_Partner_Attribution_Id)) {
-    $PayPal->set_partner_attribution_id($PayPal_Partner_Attribution_Id);
-}
 if(!empty($Prefer)) {
     $PayPal->set_prefer($Prefer);
 }