From 3cb45858806fc56bceea420bedf04c11a9a21781 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 12 Jan 2021 09:14:52 +1100
Subject: [PATCH] Fixes for migrations

---
 app/PaymentDrivers/Stripe/CreditCard.php                        | 2 +-
 .../migrations/2021_01_11_092056_fix_company_settings_url.php   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index f64e87e081e7..c575f7d03ebf 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -103,7 +103,7 @@ class CreditCard
         if ($server_response->status == 'succeeded') {
             $this->stripe->confirmGatewayFee($request);
 
-            $this->stripe->logSuccessfulGatewayResponse(['response' => $request->gateway_response, 'data' => $this->stripe->payment_has], SystemLog::TYPE_STRIPE);
+            $this->stripe->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe->payment_hash], SystemLog::TYPE_STRIPE);
 
             return $this->processSuccessfulPayment();
         }
diff --git a/database/migrations/2021_01_11_092056_fix_company_settings_url.php b/database/migrations/2021_01_11_092056_fix_company_settings_url.php
index a2ac1f1640c4..1df76cd65b9a 100644
--- a/database/migrations/2021_01_11_092056_fix_company_settings_url.php
+++ b/database/migrations/2021_01_11_092056_fix_company_settings_url.php
@@ -39,7 +39,6 @@ class FixCompanySettingsUrl extends Migration
         });
 
         Schema::table('expenses', function (Blueprint $table) {
-            $table->dropColumn('expense_amount_is_pretax');
             $table->dropColumn('amount_is_pretax');
             $table->boolean('calculate_tax_by_amount')->default(false);
         });