From 4703496c7c861322bf0f73a74d5e7f7142ba7dcd Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 4 May 2021 22:04:07 +1000
Subject: [PATCH] Fixes for PSR loading

---
 app/DataMapper/Analytics/Mail/EmailBounce.php                | 2 +-
 app/DataMapper/Analytics/Mail/EmailSpam.php                  | 2 +-
 app/Models/Client.php                                        | 5 +++--
 app/Models/Gateway.php                                       | 1 +
 .../migrations/2021_04_12_095424_stripe_connect_gateway.php  | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/DataMapper/Analytics/Mail/EmailBounce.php b/app/DataMapper/Analytics/Mail/EmailBounce.php
index bf86139a9dad..5a8aaf10af3d 100644
--- a/app/DataMapper/Analytics/Mail/EmailBounce.php
+++ b/app/DataMapper/Analytics/Mail/EmailBounce.php
@@ -9,7 +9,7 @@
  * @license https://opensource.org/licenses/AAL
  */
 
-namespace App\DataMapper\Analytics;
+namespace App\DataMapper\Analytics\Mail;
 
 class EmailBounce
 {
diff --git a/app/DataMapper/Analytics/Mail/EmailSpam.php b/app/DataMapper/Analytics/Mail/EmailSpam.php
index 75b9dc26b53b..c420327ddc78 100644
--- a/app/DataMapper/Analytics/Mail/EmailSpam.php
+++ b/app/DataMapper/Analytics/Mail/EmailSpam.php
@@ -9,7 +9,7 @@
  * @license https://opensource.org/licenses/AAL
  */
 
-namespace App\DataMapper\Analytics;
+namespace App\DataMapper\Analytics\Mail;
 
 class EmailSpam
 {
diff --git a/app/Models/Client.php b/app/Models/Client.php
index dbb2b12ba8af..1e1ef2232d42 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -79,8 +79,9 @@ class Client extends BaseModel implements HasLocalePreference
 
     protected $with = [
         'gateway_tokens',
-        'documents'
-        //'currency',
+        'documents',
+        'contacts.company',
+        // 'currency',
         // 'primary_contact',
         // 'country',
         // 'contacts',
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 5d470680aab5..c182f4e1d7ad 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -85,6 +85,7 @@ class Gateway extends StaticModel
                 return [GatewayType::PAYPAL => ['refund' => true, 'token_billing' => false]]; //Paypal
                 break;
             case 20:
+            case 56:
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
                     GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable']],
                     GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],
diff --git a/database/migrations/2021_04_12_095424_stripe_connect_gateway.php b/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
index 0f2a72242151..2d9fe819f7d3 100644
--- a/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
+++ b/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
@@ -30,8 +30,8 @@ class StripeConnectGateway extends Migration
         Gateway::create($gateway);
 
         if (Ninja::isNinja()) {
-            Gateway::where('id', 20)->update(['visible' => 0]);
-            Gateway::where('id', 56)->update(['visible' => 1]);
+            Gateway::whereIn('id', [20])->update(['visible' => 0]);
+            Gateway::whereIn('id', [56])->update(['visible' => 1]);
         }
     }