From bc63c2c50308f517edb41db565b6108f448b1d24 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 4 Dec 2017 23:30:04 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20allow=20both=20types=20of=20inc?= =?UTF-8?q?lusive=20tax=20rates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AccountController.php | 1 + app/Ninja/Datatables/TaxRateDatatable.php | 2 +- resources/lang/en/texts.php | 1 - resources/views/accounts/tax_rates.blade.php | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 003b55e6c0da..ffdb3094af77 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -495,6 +495,7 @@ class AccountController extends BaseController 'title' => trans('texts.tax_rates'), 'taxRates' => TaxRate::scope()->whereIsInclusive(false)->get(), 'countInvoices' => Invoice::scope()->withTrashed()->count(), + 'hasInclusiveTaxRates' => TaxRate::scope()->whereIsInclusive(true)->count() ? true : false, ]; return View::make('accounts.tax_rates', $data); diff --git a/app/Ninja/Datatables/TaxRateDatatable.php b/app/Ninja/Datatables/TaxRateDatatable.php index 3af273a52fca..e42308b0b5de 100644 --- a/app/Ninja/Datatables/TaxRateDatatable.php +++ b/app/Ninja/Datatables/TaxRateDatatable.php @@ -27,7 +27,7 @@ class TaxRateDatatable extends EntityDatatable 'type', function ($model) { if (auth()->user()->account->inclusive_taxes) { - return trans('texts.standard'); + return trans('texts.inclusive'); } else { return $model->is_inclusive ? trans('texts.inclusive') : trans('texts.exclusive'); } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 1f2d8fd5277a..105197d63c18 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2606,7 +2606,6 @@ $LANG = array( 'edit_times' => 'Edit Times', 'inclusive_taxes_help' => 'Include taxes in the cost', 'inclusive_taxes_warning' => 'Warning: existing invoices will need to be resaved', - 'standard' => 'Standard', ); diff --git a/resources/views/accounts/tax_rates.blade.php b/resources/views/accounts/tax_rates.blade.php index d624663997c4..60ca3531c2ad 100644 --- a/resources/views/accounts/tax_rates.blade.php +++ b/resources/views/accounts/tax_rates.blade.php @@ -35,7 +35,7 @@ ->label(' ') ->value(1) !!} - @if ($account->inclusive_taxes || $countInvoices <= 10) + @if (! $hasInclusiveTaxRates && ($account->inclusive_taxes || $countInvoices <= 10)) {!! Former::checkbox('inclusive_taxes') ->text(trans('texts.inclusive_taxes_help')) ->label(' ')