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 5e479f52..c60c50e0 100644 --- a/app/Mail/SendInvoiceMail.php +++ b/app/Mail/SendInvoiceMail.php @@ -1,6 +1,7 @@ $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]); } 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]); 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 @@

@lang('pdf_payment_amount_received_label')

- {!! format_money_pdf($payment->amount, $payment->user->currency) !!} + {!! format_money_pdf($payment->amount, $payment->user->currency) !!}