Merge branch 'master' into stable

Merge in master for 116 release
paypal · Jul 23, 2014 · f23b27b · f23b27b
2 parents 22961c0 + c871fe3
commit f23b27b
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,20 @@
-###CHANGELOG
-#### Version 2.9.115 - June 20, 2014
-
-   - Updated stubs for 115 release. SoftDescriptor and SoftDescriptorCity for DoDirectPayment
-You can see source code of this release in github under https://github.com/paypal/merchant-sdk-php/tree/v2.8.115.
-
---------------------------------------------------------------------------------------------------
-
+###CHANGELOG
+#### Version 2.10.116 - July 23, 2014
+
+   - Updated stubs for 116 release. CartChangeTolerance, FinancingFeeAmount, FinancingTotalCost, ShipToStore added.
+
+You can see source code of this release in github under https://github.com/paypal/merchant-sdk-php/tree/v2.10.116.
+
+--------------------------------------------------------------------------------------------------
+
+####Version 2.9.115 - June 20, 2014
+
+   - Updated stubs for 115 release
+
+You can see source code of this release in github under https://github.com/paypal/merchant-sdk-php/tree/v2.8.115.
+
+--------------------------------------------------------------------------------------------------
+
 ####Version 2.8.114 - May 14, 2014
 
   - Updated stubs for 114 release, Idempotency for DoExpressCheckoutPaymentReq
@@ -165,4 +174,4 @@ You can see source code of this release in github under https://github.com/paypa
 
    - Initial release
 
---------------------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
diff --git a/lib/services/PayPalAPIInterfaceService/PayPalAPIInterfaceService.php b/lib/services/PayPalAPIInterfaceService/PayPalAPIInterfaceService.php
@@ -2741,10 +2741,11 @@ class FundingSourceDetailsType
 	public $AllowPushFunding;
 
 	/**
-	 * Allowable values: ELV, CreditCard, ChinaUnionPay, BML This
-	 * element could be used to specify the perered funding option
-	 * for a guest users. It has effect only if LandingPage element
-	 * is set to Billing. Otherwise it will be ignored. 
+	 * Allowable values: ELV, CreditCard, ChinaUnionPay, BML,
+	 * Finance This element could be used to specify the preferred
+	 * funding option for a guest users. It has effect only if
+	 * LandingPage element is set to Billing. Otherwise it will be
+	 * ignored. 
 	 * @access public
 	 
 	 * @namespace ebl
@@ -3127,6 +3128,33 @@ class GetExpressCheckoutDetailsResponseDetailsType
 	 */ 
 	public $RefreshTokenStatusDetails;
 
+	/**
+	 * Information about the transaction 
+     * @array
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var PaymentInfoType 	 
+	 */ 
+	public $PaymentInfo;
+
+	/**
+	 * Indicate the tolerance a cart can be changed. Possible
+	 * values are NONE = cart cannot be changed (since financing
+	 * was used and country is DE). FLEXIBLE = cart can be changed
+	 * If this parameter does not exist, then assume cart can be
+	 * modified. 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var string 	 
+	 */ 
+	public $CartChangeTolerance;
+
 
 }
 
@@ -5913,6 +5941,62 @@ class PaymentInfoType
 	 */ 
 	public $FeeAmount;
 
+	/**
+	 * Transaction financing fee associated with the payment. 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var BasicAmountType 	 
+	 */ 
+	public $FinancingFeeAmount;
+
+	/**
+	 * Total overall cost associated with this financing
+	 * transaction. 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var BasicAmountType 	 
+	 */ 
+	public $FinancingTotalCost;
+
+	/**
+	 * Monthly payment for this financing transaction. 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var BasicAmountType 	 
+	 */ 
+	public $FinancingMonthlyPayment;
+
+	/**
+	 * The length of this financing term, in months. 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var string 	 
+	 */ 
+	public $FinancingTerm;
+
+	/**
+	 * 
+	 * @access public
+	 
+	 * @namespace ebl
+	 
+	 	 	 	 
+	 * @var string 	 
+	 */ 
+	public $IsFinancing;
+
 	/**
 	 * Amount deposited into the account's primary balance after a
 	 * currency conversion from automatic conversion through your
@@ -19260,6 +19344,18 @@ class DoAuthorizationRequestType  extends AbstractRequestType
 	 */ 
 	public $IPAddress;
 
+	/**
+	 * A flag indicating that this transaction is a Ship to Store
+	 * transaction. Optional 
+	 * @access public
+	 
+	 * @namespace ns
+	 
+	 	 	 	 
+	 * @var string 	 
+	 */ 
+	public $ShipToStore;
+
 	/**
 	 * Constructor with arguments
 	 */
@@ -19412,6 +19508,18 @@ class UpdateAuthorizationRequestType  extends AbstractRequestType
 	 */ 
 	public $IPAddress;
 
+	/**
+	 * A flag indicating that this transaction is a Ship to Store
+	 * transaction. Optional 
+	 * @access public
+	 
+	 * @namespace ns
+	 
+	 	 	 	 
+	 * @var string 	 
+	 */ 
+	public $ShipToStore;
+
 	/**
 	 * Constructor with arguments
 	 */

diff --git a/lib/services/PayPalAPIInterfaceService/PayPalAPIInterfaceServiceService.php b/lib/services/PayPalAPIInterfaceService/PayPalAPIInterfaceServiceService.php
@@ -6,7 +6,7 @@
 class PayPalAPIInterfaceServiceService extends PPBaseService {
 
 	// Service Version
-	private static $SERVICE_VERSION = "115.0";
+	private static $SERVICE_VERSION = "116.0";
 
 	// Service Name
 	private static $SERVICE_NAME = "PayPalAPIInterfaceService";

diff --git a/samples/composer.json b/samples/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "php": ">=5.2.0",
         "ext-curl": "*",
-        "paypal/merchant-sdk-php":"v2.5.106",
+        "paypal/merchant-sdk-php":"v2.10.116",
         "paypal/permissions-sdk-php":"v2.5.106"
     }
 }