Fixes for payment failure mailer

2025-05-24 02:14:21 -04:00 · 2021-02-18 10:51:56 +11:00 · 2021-02-18 10:51:56 +11:00 · 64afdc20fa
commit 64afdc20fa
parent 06bc49b0d6
12 changed files with 36 additions and 32 deletions
--- 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;

--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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());
    }

--- 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
 */