From 9552916494ff532f627c172df25bc0f2ab97df33 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 7 Aug 2021 08:28:02 +1000
Subject: [PATCH 1/2] Force stripe email

---
 app/Jobs/Util/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 416847cac797..26b961df7f4f 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1398,7 +1398,7 @@ class Import implements ShouldQueue
                 $nmo->company = $this->company;
                 $nmo->settings = $this->company->settings;
                 $nmo->to_user = $this->user;
-                NinjaMailerJob::dispatch($nmo);
+                NinjaMailerJob::dispatch($nmo, true);
 
                 $modified['gateway_key'] = 'd14dd26a47cecc30fdd65700bfb67b34';
                 

From b32d852a00852df0f843316bdcf1525f00736165 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 7 Aug 2021 13:43:34 +1000
Subject: [PATCH 2/2] Fixes for payment variables

---
 app/Mail/Engine/PaymentEmailEngine.php | 23 ++++++++++++++++++++++-
 app/Models/Payment.php                 |  4 +++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 904052d9b8c8..598e7a47af52 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -194,12 +194,14 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         $data['$view_link'] = ['value' => '<a class="button" href="'.$this->payment->getLink().'">'.ctrans('texts.view_payment').'</a>', 'label' => ctrans('texts.view_payment')];
         $data['$paymentLink'] = &$data['$view_link'];
-        $data['$portalButton'] = &$data['$view_link'];
+        $data['$portalButton'] = ['value' => "<a href='{$this->payment->getPortalLink()}'>".ctrans('texts.login')."</a>", 'label' =>''];
+        $data['$portal_url'] = &$data['$portalButton'];
 
         $data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
         $data['$signature'] = ['value' => $this->settings->email_signature ?: '&nbsp;', 'label' => ''];
 
         $data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
+        $data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')];
 
         return $data;
     }
@@ -215,6 +217,25 @@ class PaymentEmailEngine extends BaseEmailEngine
         return $invoice_list;
     }
 
+    private function formatInvoiceReferences()
+    {
+
+        $invoice_list = '<br><br>';
+
+        foreach ($this->payment->invoices as $invoice) {
+            
+            $invoice_list .= ctrans('texts.po_number'). " {$invoice->po_number} <br>";
+            $invoice_list .= ctrans('texts.invoice_number_short') . " {$invoice->number} <br>";
+            $invoice_list .= ctrans('texts.invoice_amount') ." ". Number::formatMoney($invoice->pivot->amount, $this->client) . "<br>";
+            $invoice_list .= ctrans('texts.invoice_balance') ." ". Number::formatMoney($invoice->fresh()->balance, $this->client) . "<br>";
+            $invoice_list .= "-----<br>";
+
+        }
+
+        return $invoice_list;
+
+    }
+
     public function makeValues() :array
     {
         $data = [];
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 531c1f0eb8f2..8416c35e4335 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -16,6 +16,7 @@ use App\Services\Ledger\LedgerService;
 use App\Services\Payment\PaymentService;
 use App\Utils\Ninja;
 use App\Utils\Number;
+use App\Utils\Traits\Inviteable;
 use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\Payment\Refundable;
@@ -28,7 +29,8 @@ class Payment extends BaseModel
     use MakesDates;
     use SoftDeletes;
     use Refundable;
-
+    use Inviteable;
+    
     const STATUS_PENDING = 1;
     const STATUS_CANCELLED = 2;
     const STATUS_FAILED = 3;