Return invoice object when applicable

vrajroham · Jul 19, 2019 · f901041 · f901041
1 parent 5387b4b
commit f901041
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Billable.php b/src/Billable.php
@@ -95,7 +95,7 @@ public function tab($description, $amount, array $options = [])
      * @param  int  $amount
      * @param  array  $tabOptions
      * @param  array  $invoiceOptions
-     * @return \Stripe\Invoice|bool
+     * @return \Laravel\Cashier\Invoice|bool
      */
     public function invoiceFor($description, $amount, array $tabOptions = [], array $invoiceOptions = [])
     {
@@ -215,7 +215,7 @@ public function hasIncompletePayment()
      * Invoice the billable entity outside of the regular billing cycle.
      *
      * @param  array  $options
-     * @return \Stripe\Invoice|bool
+     * @return \Laravel\Cashier\Invoice|bool
      */
     public function invoice(array $options = [])
     {
@@ -225,15 +225,17 @@ public function invoice(array $options = [])
 
         try {
             /** @var \Stripe\Invoice $invoice */
-            $invoice = StripeInvoice::create($parameters, Cashier::stripeOptions());
+            $stripeInvoice = StripeInvoice::create($parameters, Cashier::stripeOptions());
 
-            return $invoice->pay();
+            $stripeInvoice = $stripeInvoice->pay();
+
+            return new Invoice($this, $stripeInvoice);
         } catch (StripeErrorInvalidRequest $e) {
             return false;
         } catch (StripeCardException $exception) {
             $payment = new Payment(
                 StripePaymentIntent::retrieve(
-                    ['id' => $invoice->refresh()->payment_intent, 'expand' => ['invoice.subscription']],
+                    ['id' => $stripeInvoice->refresh()->payment_intent, 'expand' => ['invoice.subscription']],
                     Cashier::stripeOptions()
                 )
             );

diff --git a/src/Subscription.php b/src/Subscription.php
@@ -581,11 +581,11 @@ public function resume()
      * Invoice the subscription outside of the regular billing cycle.
      *
      * @param  array  $options
-     * @return \Stripe\Invoice|bool
+     * @return \Laravel\Cashier\Invoice|bool
      *
      * @throws \Laravel\Cashier\Exceptions\IncompletePayment
      */
-    protected function invoice(array $options = [])
+    public function invoice(array $options = [])
     {
         try {
             return $this->user->invoice(array_merge($options, ['subscription' => $this->stripe_id]));

diff --git a/tests/Integration/InvoicesTest.php b/tests/Integration/InvoicesTest.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Cashier\Tests\Integration;
 
-use Stripe\Invoice;
+use Laravel\Cashier\Invoice;
 use Laravel\Cashier\Exceptions\InvalidStripeCustomer;
 
 class InvoicesTest extends IntegrationTestCase