From 64afdc20faed29bcc38d53239e2c69a3948c0083 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 18 Feb 2021 10:51:56 +1100
Subject: [PATCH] Fixes for payment failure mailer

---
 app/Events/Payment/PaymentWasEmailedAndFailed.php  | 4 ++--
 app/Import/Definitions/ClientMap.php               | 6 +++---
 app/Import/Definitions/PaymentMap.php              | 6 +++---
 app/Import/Definitions/ProductMap.php              | 6 +++---
 app/Import/Transformers/BaseTransformer.php        | 6 +++---
 app/Import/Transformers/ClientTransformer.php      | 6 +++---
 app/Import/Transformers/InvoiceItemTransformer.php | 6 +++---
 app/Import/Transformers/InvoiceTransformer.php     | 6 +++---
 app/Import/Transformers/PaymentTransformer.php     | 6 +++---
 app/Import/Transformers/ProductTransformer.php     | 6 +++---
 app/Jobs/Import/CSVImport.php                      | 4 ++++
 app/Services/Client/ClientService.php              | 6 +++---
 12 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/app/Events/Payment/PaymentWasEmailedAndFailed.php b/app/Events/Payment/PaymentWasEmailedAndFailed.php
index 8cf8782db02f..6270bb1328fe 100644
--- a/app/Events/Payment/PaymentWasEmailedAndFailed.php
+++ b/app/Events/Payment/PaymentWasEmailedAndFailed.php
@@ -39,10 +39,10 @@ class PaymentWasEmailedAndFailed
      * PaymentWasEmailedAndFailed constructor.
      * @param Payment $payment
      * @param $company
-     * @param array $errors
+     * @param string $errors
      * @param array $event_vars
      */
-    public function __construct(Payment $payment, Company $company, array $errors, array $event_vars)
+    public function __construct(Payment $payment, Company $company, string $errors, array $event_vars)
     {
         $this->payment = $payment;
 
diff --git a/app/Import/Definitions/ClientMap.php b/app/Import/Definitions/ClientMap.php
index 912f1c415347..27c0873352c6 100644
--- a/app/Import/Definitions/ClientMap.php
+++ b/app/Import/Definitions/ClientMap.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Definitions/PaymentMap.php b/app/Import/Definitions/PaymentMap.php
index 5ecdd8db2a12..10bbe61f5475 100644
--- a/app/Import/Definitions/PaymentMap.php
+++ b/app/Import/Definitions/PaymentMap.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Definitions/ProductMap.php b/app/Import/Definitions/ProductMap.php
index 467cff04fa94..4670d26502dc 100644
--- a/app/Import/Definitions/ProductMap.php
+++ b/app/Import/Definitions/ProductMap.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/BaseTransformer.php b/app/Import/Transformers/BaseTransformer.php
index 1429b3e02444..36f8376fbba2 100644
--- a/app/Import/Transformers/BaseTransformer.php
+++ b/app/Import/Transformers/BaseTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/ClientTransformer.php b/app/Import/Transformers/ClientTransformer.php
index c12ed0ef840a..94f684a2603a 100644
--- a/app/Import/Transformers/ClientTransformer.php
+++ b/app/Import/Transformers/ClientTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/InvoiceItemTransformer.php b/app/Import/Transformers/InvoiceItemTransformer.php
index dfddfe6b46c8..a43b1704f653 100644
--- a/app/Import/Transformers/InvoiceItemTransformer.php
+++ b/app/Import/Transformers/InvoiceItemTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/InvoiceTransformer.php b/app/Import/Transformers/InvoiceTransformer.php
index 022388b99d7e..bea2a3caa3ed 100644
--- a/app/Import/Transformers/InvoiceTransformer.php
+++ b/app/Import/Transformers/InvoiceTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/PaymentTransformer.php b/app/Import/Transformers/PaymentTransformer.php
index 126a01a6f3a8..c2476ce685a3 100644
--- a/app/Import/Transformers/PaymentTransformer.php
+++ b/app/Import/Transformers/PaymentTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Import/Transformers/ProductTransformer.php b/app/Import/Transformers/ProductTransformer.php
index b9cdee93a10b..e2d93cfba73e 100644
--- a/app/Import/Transformers/ProductTransformer.php
+++ b/app/Import/Transformers/ProductTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */
diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php
index d333bde1653e..e15c06fb59d8 100644
--- a/app/Jobs/Import/CSVImport.php
+++ b/app/Jobs/Import/CSVImport.php
@@ -88,6 +88,8 @@ class CSVImport implements ShouldQueue
      */
     public function handle()
     {
+        nlog("starting import");
+
         MultiDB::setDb($this->company->db);
 
         $this->company->owner()->setCompany($this->company);
@@ -112,6 +114,8 @@ class CSVImport implements ShouldQueue
 
         //nlog(print_r($data, 1));
 
+        nlog("finished import - firing mailer");
+        
         MailRouter::dispatch(new ImportCompleted($data), $this->company, auth()->user());
     }
 
diff --git a/app/Services/Client/ClientService.php b/app/Services/Client/ClientService.php
index 9023f3aa53c7..f144c591f4f4 100644
--- a/app/Services/Client/ClientService.php
+++ b/app/Services/Client/ClientService.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2021. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://opensource.org/licenses/AAL
  */