Fixed application fee for PaymentIntent

src/AbstractGateway.php

@@ -107,6 +107,7 @@ public function getDefaultParameters()
     {
         return array(
             'apiKey' => '',
+            'stripeVersion' => null
         );
     }
 
@@ -150,6 +151,24 @@ public function setApiKey($value)
         return $this->setParameter('apiKey', $value);
     }
 
+    /**
+     * @return string
+     */
+    public function getStripeVersion()
+    {
+        return $this->getParameter('stripeVersion');
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return Gateway
+     */
+    public function setStripeVersion($value)
+    {
+        return $this->setParameter('stripeVersion', $value);
+    }
+
     /**
      * Authorize Request.
      *
@@ -263,6 +282,21 @@ public function fetchBalanceTransaction(array $parameters = array())
         return $this->createRequest('\Omnipay\Stripe\Message\FetchBalanceTransactionRequest', $parameters);
     }
 
+    //
+    // Application Fees
+    // @link https://stripe.com/docs/api#application_fees
+    //
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Stripe\Message\FetchApplicationFeeRequest
+     */
+    public function fetchApplicationFee(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\FetchApplicationFeeRequest', $parameters);
+    }
+
     //
     // Transfers
     // @link https://stripe.com/docs/api#transfers

src/Gateway.php

@@ -233,6 +233,17 @@ public function cancelSubscription(array $parameters = array())
         return $this->createRequest('\Omnipay\Stripe\Message\CancelSubscriptionRequest', $parameters);
     }
 
+    /**
+     * Fetch Schedule Subscription
+     *
+     * @param array $parameters
+     * @return \Omnipay\Stripe\Message\FetchSubscriptionSchedulesRequest
+     */
+    public function fetchSubscriptionSchedules(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\FetchSubscriptionSchedulesRequest', $parameters);
+    }
+
     /**
      * Fetch Event
      *
@@ -321,13 +332,31 @@ public function createSource(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\Stripe\Message\CreateSourceRequest
+     * @return \Omnipay\Stripe\Message\AttachSourceRequest
      */
     public function attachSource(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\Stripe\Message\AttachSourceRequest', $parameters);
     }
 
+    /**
+     * @param array $parameters
+     * @return \Omnipay\Stripe\Message\FetchSourceRequest
+     */
+    public function detachSource(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\DetachSourceRequest', $parameters);
+    }
+
+    /**
+     * @param array $parameters
+     * @return \Omnipay\Stripe\Message\FetchSourceRequest
+     */
+    public function fetchSource(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\FetchSourceRequest', $parameters);
+    }
+
     /**
      * Create a completePurchase request.
      *
@@ -338,4 +367,54 @@ public function completePurchase(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\Stripe\Message\CompletePurchaseRequest', $parameters);
     }
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Common\Message\AbstractRequest
+     */
+    public function createCoupon(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\CreateCouponRequest', $parameters);
+    }
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Common\Message\AbstractRequest
+     */
+    public function fetchCoupon(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\FetchCouponRequest', $parameters);
+    }
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Common\Message\AbstractRequest
+     */
+    public function deleteCoupon(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\DeleteCouponRequest', $parameters);
+    }
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Common\Message\AbstractRequest
+     */
+    public function updateCoupon(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\UpdateCouponRequest', $parameters);
+    }
+
+    /**
+     * @param array $parameters
+     *
+     * @return \Omnipay\Common\Message\AbstractRequest
+     */
+    public function listCoupons(array $parameters = array())
+    {
+        return $this->createRequest('\Omnipay\Stripe\Message\ListCouponsRequest', $parameters);
+    }
 }

src/Message/AbstractRequest.php

@@ -174,6 +174,27 @@ public function setIdempotencyKeyHeader($value)
         return $this->setParameter('idempotencyKey', $value);
     }
 
+    /**
+     * @return array
+     */
+    public function getExpand()
+    {
+        return $this->getParameter('expand');
+    }
+
+    /**
+     * Specifies which object relations (IDs) in the response should be expanded to include the entire object.
+     *
+     * @see https://stripe.com/docs/api/expanding_objects
+     *
+     * @param array $value
+     * @return AbstractRequest
+     */
+    public function setExpand($value)
+    {
+        return $this->setParameter('expand', $value);
+    }
+
     abstract public function getEndpoint();
 
     /**
@@ -221,17 +242,42 @@ public function sendData($data)
         );
 
         $body = $data ? http_build_query($data, '', '&') : null;
-        $httpResponse = $this->httpClient->request($this->getHttpMethod(), $this->getEndpoint(), $headers, $body);
+        $httpResponse = $this->httpClient->request(
+            $this->getHttpMethod(),
+            $this->getExpandedEndpoint(),
+            $headers,
+            $body
+        );
 
         return $this->createResponse($httpResponse->getBody()->getContents(), $httpResponse->getHeaders());
     }
 
+    /**
+     * Appends the `expand` properties to the endpoint as a querystring.
+     *
+     * @return string
+     */
+    public function getExpandedEndpoint()
+    {
+        $endpoint = $this->getEndpoint();
+        $expand = $this->getExpand();
+        if (is_array($expand) && count($expand) > 0) {
+            $queryParams = [];
+            foreach ($expand as $key) {
+                $queryParams[] = 'expand[]=' . $key;
+            }
+            $queryString = join('&', $queryParams);
+            $endpoint .= '?' . $queryString;
+        }
+
+        return $endpoint;
+    }
 
     protected function createResponse($data, $headers = [])
     {
         return $this->response = new Response($this, $data, $headers);
     }
-    
+
     /**
      * @return mixed
      */
@@ -311,17 +357,30 @@ protected function getCardData()
 
         $data = array();
         $data['object'] = 'card';
+
+        // If track data is present, only return data relevant to a card present charge
+        $tracks = $card->getTracks();
+        $cvv = $card->getCvv();
+        $postcode = $card->getPostcode();
+        if (!empty($postcode)) {
+            $data['address_zip'] = $postcode;
+        }
+        if (!empty($cvv)) {
+            $data['cvc'] = $cvv;
+        }
+        if (!empty($tracks)) {
+            $data['swipe_data'] = $tracks;
+            return $data;
+        }
+
+        // If we got here, it's a card not present transaction, so include everything we have
         $data['number'] = $card->getNumber();
         $data['exp_month'] = $card->getExpiryMonth();
         $data['exp_year'] = $card->getExpiryYear();
-        if ($card->getCvv()) {
-            $data['cvc'] = $card->getCvv();
-        }
         $data['name'] = $card->getName();
         $data['address_line1'] = $card->getAddress1();
         $data['address_line2'] = $card->getAddress2();
         $data['address_city'] = $card->getCity();
-        $data['address_zip'] = $card->getPostcode();
         $data['address_state'] = $card->getState();
         $data['address_country'] = $card->getCountry();
         $data['email'] = $card->getEmail();

src/Message/AttachSourceRequest.php

@@ -7,7 +7,7 @@
 /**
  * Class CreateSourceRequest
  *
- * TODO : Add docblock
+ * @link https://stripe.com/docs/api/sources/attach
  */
 class AttachSourceRequest extends AbstractRequest
 {