From e0261c602d6d110d06ed153b01968326e3242c47 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 1 May 2023 08:07:41 +1000
Subject: [PATCH] Minor fixes for CSV imports

---
 app/Import/Definitions/BankTransactionMap.php             | 6 +++---
 app/Import/Definitions/ExpenseMap.php                     | 6 +++---
 app/Import/Definitions/VendorMap.php                      | 6 +++---
 app/Import/Providers/BaseImport.php                       | 3 ++-
 app/Import/Transformer/Bank/BankTransformer.php           | 6 +++---
 app/Import/Transformer/Csv/ClientTransformer.php          | 6 +++---
 app/Import/Transformer/Csv/ExpenseTransformer.php         | 6 +++---
 app/Import/Transformer/Csv/InvoiceTransformer.php         | 6 +++---
 app/Import/Transformer/Csv/PaymentTransformer.php         | 6 +++---
 app/Import/Transformer/Csv/QuoteTransformer.php           | 6 +++---
 .../Transformer/Csv/RecurringInvoiceTransformer.php       | 6 +++---
 app/Import/Transformer/Csv/VendorTransformer.php          | 6 +++---
 app/Import/Transformer/Freshbooks/ClientTransformer.php   | 4 ++--
 app/Import/Transformer/Freshbooks/InvoiceTransformer.php  | 6 +++---
 app/Import/Transformer/Invoice2Go/InvoiceTransformer.php  | 6 +++---
 app/Import/Transformer/Invoicely/ClientTransformer.php    | 4 ++--
 app/Import/Transformer/Invoicely/InvoiceTransformer.php   | 6 +++---
 app/Import/Transformer/Wave/ClientTransformer.php         | 4 ++--
 app/Import/Transformer/Wave/ExpenseTransformer.php        | 6 +++---
 app/Import/Transformer/Wave/InvoiceTransformer.php        | 2 +-
 app/Import/Transformer/Wave/VendorTransformer.php         | 4 ++--
 app/Import/Transformer/Zoho/ClientTransformer.php         | 4 ++--
 app/Import/Transformer/Zoho/InvoiceTransformer.php        | 6 +++---
 app/Mail/Client/ClientStatement.php                       | 1 -
 app/Services/Client/Statement.php                         | 8 ++++----
 25 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/app/Import/Definitions/BankTransactionMap.php b/app/Import/Definitions/BankTransactionMap.php
index b6482926ee8c..fb30efd891f0 100644
--- a/app/Import/Definitions/BankTransactionMap.php
+++ b/app/Import/Definitions/BankTransactionMap.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Definitions/ExpenseMap.php b/app/Import/Definitions/ExpenseMap.php
index e9075e5d7c72..a12dd6a86f10 100644
--- a/app/Import/Definitions/ExpenseMap.php
+++ b/app/Import/Definitions/ExpenseMap.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Definitions/VendorMap.php b/app/Import/Definitions/VendorMap.php
index ca2ec64786fd..4e5cbd37524d 100644
--- a/app/Import/Definitions/VendorMap.php
+++ b/app/Import/Definitions/VendorMap.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 07255a979465..41cfc3094d8e 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -428,7 +428,8 @@ class BaseImport
         foreach ($invoices as $raw_invoice) {
             try {
                 $invoice_data = $invoice_transformer->transform($raw_invoice);
-
+                $invoice_data['user_id'] = $this->company->owner()->id;
+                
                 $invoice_data['line_items'] = $this->cleanItems(
                     $invoice_data['line_items'] ?? []
                 );
diff --git a/app/Import/Transformer/Bank/BankTransformer.php b/app/Import/Transformer/Bank/BankTransformer.php
index bff66a30e895..d9377edc09de 100644
--- a/app/Import/Transformer/Bank/BankTransformer.php
+++ b/app/Import/Transformer/Bank/BankTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/ClientTransformer.php b/app/Import/Transformer/Csv/ClientTransformer.php
index 543ad1cd205a..252b912c6911 100644
--- a/app/Import/Transformer/Csv/ClientTransformer.php
+++ b/app/Import/Transformer/Csv/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/ExpenseTransformer.php b/app/Import/Transformer/Csv/ExpenseTransformer.php
index 2aee2e7dda45..5f32f49bd44a 100644
--- a/app/Import/Transformer/Csv/ExpenseTransformer.php
+++ b/app/Import/Transformer/Csv/ExpenseTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/InvoiceTransformer.php b/app/Import/Transformer/Csv/InvoiceTransformer.php
index 76447deb7f71..60cc71b07aaf 100644
--- a/app/Import/Transformer/Csv/InvoiceTransformer.php
+++ b/app/Import/Transformer/Csv/InvoiceTransformer.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * client Ninja (https://clientninja.com).
+ * client Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. client Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/PaymentTransformer.php b/app/Import/Transformer/Csv/PaymentTransformer.php
index 9b8d17e9d6a3..3ea61e845d47 100644
--- a/app/Import/Transformer/Csv/PaymentTransformer.php
+++ b/app/Import/Transformer/Csv/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/QuoteTransformer.php b/app/Import/Transformer/Csv/QuoteTransformer.php
index dab125073a1f..a61014e3a22d 100644
--- a/app/Import/Transformer/Csv/QuoteTransformer.php
+++ b/app/Import/Transformer/Csv/QuoteTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/RecurringInvoiceTransformer.php b/app/Import/Transformer/Csv/RecurringInvoiceTransformer.php
index 5f9e15393840..e19331d36151 100644
--- a/app/Import/Transformer/Csv/RecurringInvoiceTransformer.php
+++ b/app/Import/Transformer/Csv/RecurringInvoiceTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Csv/VendorTransformer.php b/app/Import/Transformer/Csv/VendorTransformer.php
index fde473da01d7..c4b015d2b46e 100644
--- a/app/Import/Transformer/Csv/VendorTransformer.php
+++ b/app/Import/Transformer/Csv/VendorTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Freshbooks/ClientTransformer.php b/app/Import/Transformer/Freshbooks/ClientTransformer.php
index ff02b3bc8903..e2d3fcd93360 100644
--- a/app/Import/Transformer/Freshbooks/ClientTransformer.php
+++ b/app/Import/Transformer/Freshbooks/ClientTransformer.php
@@ -2,9 +2,9 @@
 /**
  * Invoice Ninja (https://clientninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Freshbooks/InvoiceTransformer.php b/app/Import/Transformer/Freshbooks/InvoiceTransformer.php
index e072206e9c2f..429d681f1056 100644
--- a/app/Import/Transformer/Freshbooks/InvoiceTransformer.php
+++ b/app/Import/Transformer/Freshbooks/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php b/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
index 86b9d22d8e17..ce790aa25497 100644
--- a/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
+++ b/app/Import/Transformer/Invoice2Go/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Invoicely/ClientTransformer.php b/app/Import/Transformer/Invoicely/ClientTransformer.php
index 4ec5b711f0e7..9fc3976c4555 100644
--- a/app/Import/Transformer/Invoicely/ClientTransformer.php
+++ b/app/Import/Transformer/Invoicely/ClientTransformer.php
@@ -2,9 +2,9 @@
 /**
  * Invoice Ninja (https://clientninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Invoicely/InvoiceTransformer.php b/app/Import/Transformer/Invoicely/InvoiceTransformer.php
index 857a349e1f68..04a4d9f083ff 100644
--- a/app/Import/Transformer/Invoicely/InvoiceTransformer.php
+++ b/app/Import/Transformer/Invoicely/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Wave/ClientTransformer.php b/app/Import/Transformer/Wave/ClientTransformer.php
index 28d6439d12ac..d18739b88a47 100644
--- a/app/Import/Transformer/Wave/ClientTransformer.php
+++ b/app/Import/Transformer/Wave/ClientTransformer.php
@@ -2,9 +2,9 @@
 /**
  * Invoice Ninja (https://clientninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Wave/ExpenseTransformer.php b/app/Import/Transformer/Wave/ExpenseTransformer.php
index 497d214bc6d6..ef5ff1dc6cdc 100644
--- a/app/Import/Transformer/Wave/ExpenseTransformer.php
+++ b/app/Import/Transformer/Wave/ExpenseTransformer.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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Wave/InvoiceTransformer.php b/app/Import/Transformer/Wave/InvoiceTransformer.php
index f91265f8511d..9677a2c529df 100644
--- a/app/Import/Transformer/Wave/InvoiceTransformer.php
+++ b/app/Import/Transformer/Wave/InvoiceTransformer.php
@@ -2,7 +2,7 @@
 /**
  * Invoice Ninja (https://invoiceninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://clientninja.com)
  *
diff --git a/app/Import/Transformer/Wave/VendorTransformer.php b/app/Import/Transformer/Wave/VendorTransformer.php
index 8f9d07013400..32dea13f2ed9 100644
--- a/app/Import/Transformer/Wave/VendorTransformer.php
+++ b/app/Import/Transformer/Wave/VendorTransformer.php
@@ -2,9 +2,9 @@
 /**
  * Invoice Ninja (https://clientninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Zoho/ClientTransformer.php b/app/Import/Transformer/Zoho/ClientTransformer.php
index ef423e54fd53..b5014960c4d7 100644
--- a/app/Import/Transformer/Zoho/ClientTransformer.php
+++ b/app/Import/Transformer/Zoho/ClientTransformer.php
@@ -2,9 +2,9 @@
 /**
  * Invoice Ninja (https://clientninja.com).
  *
- * @link https://github.com/clientninja/clientninja source repository
+ * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Import/Transformer/Zoho/InvoiceTransformer.php b/app/Import/Transformer/Zoho/InvoiceTransformer.php
index 56f26bd3c75a..1ec99eca3520 100644
--- a/app/Import/Transformer/Zoho/InvoiceTransformer.php
+++ b/app/Import/Transformer/Zoho/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) 2022. client Ninja LLC (https://clientninja.com)
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
diff --git a/app/Mail/Client/ClientStatement.php b/app/Mail/Client/ClientStatement.php
index ec34f05d77c0..b715840083ed 100644
--- a/app/Mail/Client/ClientStatement.php
+++ b/app/Mail/Client/ClientStatement.php
@@ -57,7 +57,6 @@ class ClientStatement extends Mailable
             with: [
                 'text_body' => $this->data['body'],
                 'body' => $this->data['body'],
-                'whitelabel' => $this->data['whitelabel'],
                 'settings' => $this->data['settings'],
                 'whitelabel' => $this->data['whitelabel'],
                 'logo' => $this->data['logo'],
diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php
index db1fcb0cd899..e315b5e7d464 100644
--- a/app/Services/Client/Statement.php
+++ b/app/Services/Client/Statement.php
@@ -245,17 +245,17 @@ class Statement
         switch ($status) {
             case 'all':
                 return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID];
-                break;
+                
             case 'paid':
                 return [Invoice::STATUS_PAID];
-                break;
+                
             case 'unpaid':
                 return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL];
-                break;
+                
 
             default:
                 return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID];
-                break;
+                
         }
     }