From 3695e7d075cb3ca955368cdaf608686febdf1c6c Mon Sep 17 00:00:00 2001
From: brijraj_04 <bhattbrijraj568@gmail.com>
Date: Tue, 2 Feb 2021 17:22:44 +0530
Subject: [PATCH 1/4] fix payment currency issue

---
 resources/views/app/pdf/payment/payment.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/app/pdf/payment/payment.blade.php b/resources/views/app/pdf/payment/payment.blade.php
index f5dd5729..74bee072 100644
--- a/resources/views/app/pdf/payment/payment.blade.php
+++ b/resources/views/app/pdf/payment/payment.blade.php
@@ -258,7 +258,7 @@
             color: #595959;
         }
 
-        .total-display-box span {
+        .total-display-box .total-color {
             float: right;
             font-weight: bold;
             font-size: 14px;
@@ -336,7 +336,7 @@
     </div>
     <div class="total-display-box">
         <p class="total-display-label">@lang('pdf_payment_amount_received_label')</p>
-        <span>{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
+        <span class="total-color">{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
     </div>
 </body>
 </html>

From 70bed01e7b4bbc4a353c591e3c28a2ea1691d8ac Mon Sep 17 00:00:00 2001
From: brijraj_04 <bhattbrijraj568@gmail.com>
Date: Wed, 3 Feb 2021 11:38:59 +0530
Subject: [PATCH 2/4] invoice mail name issue fix

---
 app/Mail/SendInvoiceMail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Mail/SendInvoiceMail.php b/app/Mail/SendInvoiceMail.php
index 5e479f52..c0934185 100644
--- a/app/Mail/SendInvoiceMail.php
+++ b/app/Mail/SendInvoiceMail.php
@@ -40,7 +40,7 @@ class SendInvoiceMail extends Mailable
             'mailable_id' => $this->data['invoice']['id']
         ]);
 
-        return $this->from($this->data['from'])
+        return $this->from($this->data['from'], env('MAIL_FROM_NAME'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.invoice', ['data', $this->data]);
     }

From baebfedf37d2778c487778840257bfd372634cc2 Mon Sep 17 00:00:00 2001
From: brijraj_04 <bhattbrijraj568@gmail.com>
Date: Wed, 3 Feb 2021 12:21:03 +0530
Subject: [PATCH 3/4] invoice and estimate from mail name issue

---
 app/Mail/SendEstimateMail.php | 2 +-
 app/Mail/SendInvoiceMail.php  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Mail/SendEstimateMail.php b/app/Mail/SendEstimateMail.php
index 888176f6..b3681330 100644
--- a/app/Mail/SendEstimateMail.php
+++ b/app/Mail/SendEstimateMail.php
@@ -40,7 +40,7 @@ class SendEstimateMail extends Mailable
             'mailable_id' => $this->data['estimate']['id']
         ]);
 
-        return $this->from($this->data['from'])
+        return $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.estimate', ['data', $this->data]);
 
diff --git a/app/Mail/SendInvoiceMail.php b/app/Mail/SendInvoiceMail.php
index c0934185..c60c50e0 100644
--- a/app/Mail/SendInvoiceMail.php
+++ b/app/Mail/SendInvoiceMail.php
@@ -1,6 +1,7 @@
 <?php
 namespace Crater\Mail;
 
+use Config;
 use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
 use Illuminate\Bus\Queueable;
@@ -40,7 +41,7 @@ class SendInvoiceMail extends Mailable
             'mailable_id' => $this->data['invoice']['id']
         ]);
 
-        return $this->from($this->data['from'], env('MAIL_FROM_NAME'))
+        return $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.invoice', ['data', $this->data]);
     }

From 8fbc257b23f8abda42dbdbae459b62db6e03fdb8 Mon Sep 17 00:00:00 2001
From: brijraj_04 <bhattbrijraj568@gmail.com>
Date: Wed, 3 Feb 2021 12:24:28 +0530
Subject: [PATCH 4/4] payment from mail name

---
 app/Mail/SendPaymentMail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Mail/SendPaymentMail.php b/app/Mail/SendPaymentMail.php
index edcbe372..b0845e47 100644
--- a/app/Mail/SendPaymentMail.php
+++ b/app/Mail/SendPaymentMail.php
@@ -41,7 +41,7 @@ class SendPaymentMail extends Mailable
             'mailable_id' => $this->data['payment']['id']
         ]);
 
-        return $this->from($this->data['from'])
+        return $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.payment', ['data', $this->data]);