Merge branch 'master' into stable

lib/PayPal/Api/Address.php

@@ -11,13 +11,13 @@
  *
  * @property string phone
  */
-class Address extends BaseAddress 
+class Address extends BaseAddress
 {
     /**
      * Phone number in E.123 format.
      *
      * @param string $phone
-     * 
+     *
      * @return $this
      */
     public function setPhone($phone)

lib/PayPal/Api/AlternatePayment.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace PayPal\Api;
+
+use PayPal\Common\PayPalModel;
+
+/**
+ * Class AlternatePayment
+ *
+ * A resource representing a alternate payment account that can be used to fund a payment.
+ *
+ * @package PayPal\Api
+ *
+ * @property string alternate_payment_account_id
+ * @property string external_customer_id
+ * @property string alternate_payment_provider_id
+ */
+class AlternatePayment extends PayPalModel
+{
+    /**
+     * The unique identifier of the alternate payment account.
+     *
+     * @param string $alternate_payment_account_id
+     * 
+     * @return $this
+     */
+    public function setAlternatePaymentAccountId($alternate_payment_account_id)
+    {
+        $this->alternate_payment_account_id = $alternate_payment_account_id;
+        return $this;
+    }
+
+    /**
+     * The unique identifier of the alternate payment account.
+     *
+     * @return string
+     */
+    public function getAlternatePaymentAccountId()
+    {
+        return $this->alternate_payment_account_id;
+    }
+
+    /**
+     * The unique identifier of the payer
+     *
+     * @param string $external_customer_id
+     * 
+     * @return $this
+     */
+    public function setExternalCustomerId($external_customer_id)
+    {
+        $this->external_customer_id = $external_customer_id;
+        return $this;
+    }
+
+    /**
+     * The unique identifier of the payer
+     *
+     * @return string
+     */
+    public function getExternalCustomerId()
+    {
+        return $this->external_customer_id;
+    }
+
+    /**
+     * Alternate Payment provider id. This is an optional attribute needed only for certain alternate providers e.g Ideal
+     *
+     * @param string $alternate_payment_provider_id
+     * 
+     * @return $this
+     */
+    public function setAlternatePaymentProviderId($alternate_payment_provider_id)
+    {
+        $this->alternate_payment_provider_id = $alternate_payment_provider_id;
+        return $this;
+    }
+
+    /**
+     * Alternate Payment provider id. This is an optional attribute needed only for certain alternate providers e.g Ideal
+     *
+     * @return string
+     */
+    public function getAlternatePaymentProviderId()
+    {
+        return $this->alternate_payment_provider_id;
+    }
+
+}

lib/PayPal/Api/Amount.php

@@ -13,17 +13,17 @@
  *
  * @package PayPal\Api
  *
- * @property string currency
- * @property string total
+ * @property string              currency
+ * @property string              total
  * @property \PayPal\Api\Details details
  */
 class Amount extends PayPalModel
 {
     /**
-     * 3 letter currency code
+     * 3-letter [currency code](https://developer.paypal.com/docs/integration/direct/rest_api_payment_country_currency_support/). PayPal does not support all currencies.
      *
      * @param string $currency
-     * 
+     *
      * @return $this
      */
     public function setCurrency($currency)
@@ -33,7 +33,7 @@ public function setCurrency($currency)
     }
 
     /**
-     * 3 letter currency code
+     * 3-letter [currency code](https://developer.paypal.com/docs/integration/direct/rest_api_payment_country_currency_support/). PayPal does not support all currencies.
      *
      * @return string
      */
@@ -43,8 +43,7 @@ public function getCurrency()
     }
 
     /**
-     * Total amount charged as part of this payment.
-     *
+     * Total amount charged from the payer to the payee. In case of a refund, this is the refunded amount to the original payer from the payee. 10 characters max with support for 2 decimal places.
      *
      * @param string|double $total
      *
@@ -59,7 +58,7 @@ public function setTotal($total)
     }
 
     /**
-     * Total amount charged as part of this payment.
+     * Total amount charged from the payer to the payee. In case of a refund, this is the refunded amount to the original payer from the payee. 10 characters max with support for 2 decimal places.
      *
      * @return string
      */
@@ -72,7 +71,7 @@ public function getTotal()
      * Additional details of the payment amount.
      *
      * @param \PayPal\Api\Details $details
-     * 
+     *
      * @return $this
      */
     public function setDetails($details)