From 249c0e8b2b1ad47aade1652f8211a7d30aebc020 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 13 Jan 2021 12:15:04 +1100 Subject: [PATCH] fix for presenting company logo in portal --- app/Helpers/Invoice/InvoiceItemSum.php | 8 +- app/Models/Presenters/CompanyPresenter.php | 2 +- resources/views/email/template/dark.blade.php | 2 +- .../views/email/template/light.blade.php | 2 +- resources/views/header.blade.php | 137 ------------------ .../general/sidebar/desktop.blade.php | 2 +- .../general/sidebar/mobile.blade.php | 2 +- resources/views/sidebar.blade.php | 68 --------- 8 files changed, 10 insertions(+), 213 deletions(-) delete mode 100644 resources/views/header.blade.php delete mode 100644 resources/views/sidebar.blade.php diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index 96d1e6157937..12b9878b4775 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -88,9 +88,11 @@ class InvoiceItemSum return $this; } + /* Don't round the cost x qty - will allow us to use higher precision costs */ private function sumLineItem() { //todo need to support quantities less than the precision amount - $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision)); + // $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision)); + $this->setLineTotal($this->item->cost * $this->item->quantity); return $this; } @@ -112,8 +114,8 @@ class InvoiceItemSum { $item_tax = 0; - // info(print_r($this->item,1)); - // info(print_r($this->invoice,1)); + // nlog(print_r($this->item,1)); + // nlog(print_r($this->invoice,1)); $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100)); $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount); diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index ed58bf40b35b..6cf7a76bf449 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -36,7 +36,7 @@ class CompanyPresenter extends EntityPresenter $settings = $this->entity->settings; } - return (strlen($settings->company_logo) > 0) ? url($settings->company_logo) : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'; + return (strlen($settings->company_logo) > 0) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'; } public function address($settings = null) diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php index 5ebfe46d5a35..1ffda38a1533 100644 --- a/resources/views/email/template/dark.blade.php +++ b/resources/views/email/template/dark.blade.php @@ -1,7 +1,7 @@ @component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel]) @slot('header') - @component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) + @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) @if(isset($title)) {{$title}} diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php index a95799e9e282..963b2b4a57a0 100644 --- a/resources/views/email/template/light.blade.php +++ b/resources/views/email/template/light.blade.php @@ -1,7 +1,7 @@ @component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel]) @slot('header') - @component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) + @component('email.components.header', ['p' => $body, (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) @if(isset($title)) {{$title}} diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php deleted file mode 100644 index f584d1bee202..000000000000 --- a/resources/views/header.blade.php +++ /dev/null @@ -1,137 +0,0 @@ - -
- - - Invoice Ninja Logo - Invoice Ninja Logo - - - - - - -
-
\ No newline at end of file diff --git a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php index cd8b6854ae24..acb371424aaf 100644 --- a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php +++ b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php @@ -2,7 +2,7 @@
- {{ config('app.name') }} + {{ config('app.name') }}
- {{ config('app.name') }} + {{ config('app.name') }}