[13.x] Create invoices separately

src/Concerns/ManagesInvoices.php

@@ -9,7 +9,6 @@
 use LogicException;
 use Stripe\Exception\CardException as StripeCardException;
 use Stripe\Exception\InvalidRequestException as StripeInvalidRequestException;
-use Stripe\Invoice as StripeInvoice;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -118,30 +117,18 @@ public function invoicePrice($price, $quantity = 1, array $tabOptions = [], arra
      */
     public function invoice(array $options = [])
     {
-        $this->assertCustomerExists();
-
-        $parameters = array_merge([
-            'automatic_tax' => $this->automaticTaxPayload(),
-            'customer' => $this->stripe_id,
-        ], $options);
-
         try {
-            /** @var \Stripe\Invoice $invoice */
-            $stripeInvoice = $this->stripe()->invoices->create($parameters);
+            $invoice = $this->createInvoice(array_merge($options, [
+                'pending_invoice_items_behavior' => 'include_and_require',
+            ]));
 
-            if ($stripeInvoice->collection_method === StripeInvoice::COLLECTION_METHOD_CHARGE_AUTOMATICALLY) {
-                $stripeInvoice = $stripeInvoice->pay();
-            } else {
-                $stripeInvoice = $stripeInvoice->sendInvoice();
-            }
-
-            return new Invoice($this, $stripeInvoice);
+            return $invoice->chargesAutomatically() ? $invoice->pay() : $invoice->send();
         } catch (StripeInvalidRequestException $exception) {
             return false;
         } catch (StripeCardException $exception) {
             $payment = new Payment(
                 $this->stripe()->paymentIntents->retrieve(
-                    $stripeInvoice->refresh()->payment_intent,
+                    $invoice->asStripeInvoice()->refresh()->payment_intent,
                     ['expand' => ['invoice.subscription']]
                 )
             );
@@ -150,6 +137,27 @@ public function invoice(array $options = [])
         }
     }
 
+    /**
+     * Create an invoice within Stripe.
+     *
+     * @param  array  $options
+     * @return \Laravel\Cashier\Invoice
+     */
+    public function createInvoice(array $options = [])
+    {
+        $this->assertCustomerExists();
+
+        $parameters = array_merge([
+            'automatic_tax' => $this->automaticTaxPayload(),
+            'customer' => $this->stripe_id,
+            'pending_invoice_items_behavior' => 'exclude',
+        ], $options);
+
+        $stripeInvoice = $this->stripe()->invoices->create($parameters);
+
+        return new Invoice($this, $stripeInvoice);
+    }
+
     /**
      * Get the customer's upcoming invoice.
      *

src/Invoice.php

@@ -434,6 +434,26 @@ public function reverseChargeApplies()
         return $this->invoice->customer_tax_exempt === StripeCustomer::TAX_EXEMPT_REVERSE;
     }
 
+    /**
+     * Determine if the invoice will be charged automatically.
+     *
+     * @return bool
+     */
+    public function chargesAutomatically()
+    {
+        return $this->invoice->collection_method === StripeInvoice::COLLECTION_METHOD_CHARGE_AUTOMATICALLY;
+    }
+
+    /**
+     * Determine if the invoice will be be sent by email.
+     *
+     * @return bool
+     */
+    public function sendsInvoice()
+    {
+        return $this->invoice->collection_method === StripeInvoice::COLLECTION_METHOD_SEND_INVOICE;
+    }
+
     /**
      * Get all of the "invoice item" line items.
      *
@@ -477,6 +497,52 @@ public function invoiceLineItems()
             })->all();
     }
 
+    /**
+     * Add an invoice item to this invoice.
+     *
+     * @param  string  $description
+     * @param  int  $amount
+     * @param  array  $options
+     * @return \Stripe\InvoiceItem
+     */
+    public function tab($description, $amount, array $options = [])
+    {
+        $item = $this->owner()->tab($description, $amount, array_merge($options, ['invoice' => $this->invoice->id]));
+
+        $this->refresh();
+
+        return $item;
+    }
+
+    /**
+     * Add an invoice item for a specific Price ID to this invoice.
+     *
+     * @param  string  $price
+     * @param  int  $quantity
+     * @param  array  $options
+     * @return \Stripe\InvoiceItem
+     */
+    public function tabPrice($price, $quantity = 1, array $options = [])
+    {
+        $item = $this->owner()->tabPrice($price, $quantity, array_merge($options, ['invoice' => $this->invoice->id]));
+
+        $this->refresh();
+
+        return $item;
+    }
+
+    /**
+     * Refresh the invoice.
+     *
+     * @return $this
+     */
+    public function refresh()
+    {
+        $this->invoice = $this->invoice->refresh();
+
+        return $this;
+    }
+
     /**
      * Refresh the invoice with expanded objects.
      *

tests/Feature/InvoicesTest.php

@@ -30,6 +30,21 @@ public function test_invoicing_fails_with_nothing_to_invoice()
         $this->assertFalse($response);
     }
 
+    public function test_invoices_can_be_created()
+    {
+        $user = $this->createCustomer('invoices_can_be_created');
+        $user->createAsStripeCustomer();
+
+        $invoice = $user->createInvoice();
+
+        $this->assertInstanceOf(Invoice::class, $invoice);
+        $this->assertEquals(0, $invoice->rawTotal());
+
+        $invoice->tab('Laracon', 49900);
+
+        $this->assertEquals(49900, $invoice->rawTotal());
+    }
+
     public function test_customer_can_be_invoiced()
     {
         $user = $this->createCustomer('customer_can_be_invoiced');