From b3ccb0f8612fc37597d0fffe4e171ca69704469f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 28 Apr 2021 11:27:44 +1000
Subject: [PATCH] v5.1.55:

---
 CHANGELOG.md                         | 1 +
 VERSION.txt                          | 2 +-
 app/PaymentDrivers/Stripe/Charge.php | 8 ++++++--
 config/ninja.php                     | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18d6c02534ce..c15329c62e88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop)
 ## Fixed:
 - Fix User created/updated/deleted Actvity display format
+- Fix for Stripe autobill / token regression
 
 ## Added:
 - Invoice / Quote / Credit created notifications
diff --git a/VERSION.txt b/VERSION.txt
index ba7bd4ce9210..fe757942e66b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.1.54
\ No newline at end of file
+5.1.55
\ No newline at end of file
diff --git a/app/PaymentDrivers/Stripe/Charge.php b/app/PaymentDrivers/Stripe/Charge.php
index 917aeeaab2db..cdf9857fc5f2 100644
--- a/app/PaymentDrivers/Stripe/Charge.php
+++ b/app/PaymentDrivers/Stripe/Charge.php
@@ -69,14 +69,18 @@ class Charge
         $response = null;
 
         try {
-            $response = $local_stripe->paymentIntents->create([
+
+            $data = [
               'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision),
               'currency' => $this->stripe->client->getCurrencyCode(),
               'payment_method' => $cgt->token,
               'customer' => $cgt->gateway_customer_reference,
               'confirm' => true,
               'description' => $description,
-            ]);
+            ];
+
+            $response = $this->stripe->createPaymentIntent($data);
+            // $response = $local_stripe->paymentIntents->create($data);
 
             SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->stripe->client);
         } catch (\Exception $e) {
diff --git a/config/ninja.php b/config/ninja.php
index 68f0ac42094a..222f7f1348b1 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.54',
-    'app_tag' => '5.1.54-release',
+    'app_version' => '5.1.55',
+    'app_tag' => '5.1.55-release',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),