Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web

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]);
 

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'])
+        return $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.invoice', ['data', $this->data]);
     }

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]);
 

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>