Merge branch '12.x'

# Conflicts: # CHANGELOG.md # src/Cashier.php
wuvatec · Jun 4, 2021 · c57b384 · c57b384
2 parents ea0bda3 + 5936a17
commit c57b384
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/cashier/compare/v12.14.0...master)
+## [Unreleased](https://github.com/laravel/cashier/compare/v12.14.1...master)
 
 ### Added
 - Support more payment method types ([#1074](https://github.com/laravel/cashier-stripe/pull/1074))
@@ -32,6 +32,12 @@
 - Remove legacy sources support ([#1077](https://github.com/laravel/cashier-stripe/pull/1077))
 
 
+## [v12.14.1 (2021-06-01)](https://github.com/laravel/cashier/compare/v12.14.0...v12.14.1)
+
+### Fixed
+- Fix broken `unit_amount` with `tab` ([9246063](https://github.com/laravel/cashier-stripe/commit/9246063882a09c29521e61a86e84f34cb86098c1))
+
+
 ## [v12.14.0 (2021-05-25)](https://github.com/laravel/cashier/compare/v12.13.1...v12.14.0)
 
 ### Added

diff --git a/src/Concerns/ManagesInvoices.php b/src/Concerns/ManagesInvoices.php
@@ -33,7 +33,7 @@ public function tab($description, $amount, array $options = [])
         ], $options);
 
         if (array_key_exists('quantity', $options)) {
-            $options['unit_amount'] = $amount;
+            $options['unit_amount'] = $options['unit_amount'] ?? $amount;
         } else {
             $options['amount'] = $amount;
         }

diff --git a/tests/Feature/InvoicesTest.php b/tests/Feature/InvoicesTest.php
@@ -5,6 +5,7 @@
 use Laravel\Cashier\Exceptions\InvalidCustomer;
 use Laravel\Cashier\Exceptions\InvalidInvoice;
 use Laravel\Cashier\Invoice;
+use Stripe\InvoiceItem as StripeInvoiceItem;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class InvoicesTest extends FeatureTestCase
@@ -95,5 +96,14 @@ public function test_customer_can_be_invoiced_with_quantity()
 
         $this->assertInstanceOf(Invoice::class, $response);
         $this->assertEquals(5000, $response->total);
+
+        $response = $user->tab('Laracon', null, [
+            'unit_amount' => 1000,
+            'quantity' => 2,
+        ]);
+
+        $this->assertInstanceOf(StripeInvoiceItem::class, $response);
+        $this->assertEquals(1000, $response->unit_amount);
+        $this->assertEquals(2, $response->quantity);
     }
 }