From 3695e7d075cb3ca955368cdaf608686febdf1c6c Mon Sep 17 00:00:00 2001 From: brijraj_04 Date: Tue, 2 Feb 2021 17:22:44 +0530 Subject: [PATCH 1/9] 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 @@

@lang('pdf_payment_amount_received_label')

- {!! format_money_pdf($payment->amount, $payment->user->currency) !!} + {!! format_money_pdf($payment->amount, $payment->user->currency) !!}
From 70bed01e7b4bbc4a353c591e3c28a2ea1691d8ac Mon Sep 17 00:00:00 2001 From: brijraj_04 Date: Wed, 3 Feb 2021 11:38:59 +0530 Subject: [PATCH 2/9] 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 Date: Wed, 3 Feb 2021 12:21:03 +0530 Subject: [PATCH 3/9] 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 @@ $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 Date: Wed, 3 Feb 2021 12:24:28 +0530 Subject: [PATCH 4/9] 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]); From cf5da7684b43d7003e5f74f3bc79188d6a8c6169 Mon Sep 17 00:00:00 2001 From: makakken Date: Thu, 4 Feb 2021 11:01:57 +0100 Subject: [PATCH 5/9] Update invoice1.blade.php fix box_sizing DOMPDF Bug --- resources/views/app/pdf/invoice/invoice1.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php index 0dd4bb1b..507b347a 100644 --- a/resources/views/app/pdf/invoice/invoice1.blade.php +++ b/resources/views/app/pdf/invoice/invoice1.blade.php @@ -215,7 +215,6 @@ .total-display-table { border-top: none; - box-sizing: border-box; page-break-inside: avoid; page-break-before: auto; page-break-after: auto; From 9b55e8472448c103bd025ad3b1ef6af3f445fde8 Mon Sep 17 00:00:00 2001 From: makakken Date: Thu, 4 Feb 2021 11:02:32 +0100 Subject: [PATCH 6/9] Update invoice2.blade.php Fix Exception: 'box_sizing' is not a recognized CSS property. --- resources/views/app/pdf/invoice/invoice2.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php index c19c4920..44771b61 100644 --- a/resources/views/app/pdf/invoice/invoice2.blade.php +++ b/resources/views/app/pdf/invoice/invoice2.blade.php @@ -256,7 +256,6 @@ } .total-display-table { - box-sizing: border-box; page-break-inside: avoid; page-break-before: auto; page-break-after: auto; From 6cb8d30915e220be978e9965312c6480478d31ef Mon Sep 17 00:00:00 2001 From: makakken Date: Thu, 4 Feb 2021 11:02:59 +0100 Subject: [PATCH 7/9] Update invoice3.blade.php Fix Exception: 'box_sizing' is not a recognized CSS property. --- resources/views/app/pdf/invoice/invoice3.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php index c06bae3e..d6298fa8 100644 --- a/resources/views/app/pdf/invoice/invoice3.blade.php +++ b/resources/views/app/pdf/invoice/invoice3.blade.php @@ -185,7 +185,6 @@ .total-display-table { - box-sizing: border-box; page-break-inside: avoid; page-break-before: auto; page-break-after: auto; From 375a59a5049d0a48070e5c8747ee3797808803c1 Mon Sep 17 00:00:00 2001 From: Sebastian Cretu Date: Mon, 8 Feb 2021 20:42:10 +0100 Subject: [PATCH 8/9] fix(payments): display the currency in receipts --- 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..c30f45a6 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 .amount { 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) !!}
From 340bf3be06936327254fb26583666df20e7b881e Mon Sep 17 00:00:00 2001 From: Renzo Castillo Date: Mon, 22 Feb 2021 11:34:25 -0500 Subject: [PATCH 9/9] added new currency: peruvian soles --- database/seeders/CurrenciesTableSeeder.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/database/seeders/CurrenciesTableSeeder.php b/database/seeders/CurrenciesTableSeeder.php index be1fe6e5..2abed043 100644 --- a/database/seeders/CurrenciesTableSeeder.php +++ b/database/seeders/CurrenciesTableSeeder.php @@ -550,6 +550,15 @@ class CurrenciesTableSeeder extends Seeder 'thousand_separator' => ',', 'decimal_separator' => '.' ], + [ + 'name' => 'Peruvian Soles', + 'code' => 'PEN', + 'symbol' => 'S/', + 'precision' => '2', + 'thousand_separator' => ',', + 'decimal_separator' => '.' + ], + ]; foreach ($currencies as $currency) {