From 2c10dcae4177f9cd4247038d394af557dcf8c915 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 28 Aug 2017 11:07:21 +0300 Subject: [PATCH] =?UTF-8?q?Clarify=20that=20inclusive=20can=E2=80=99t=20be?= =?UTF-8?q?=20used=20as=20defaults?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/lang/en/texts.php | 2 +- resources/views/accounts/tax_rate.blade.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 8d3fa1ee6725..1a330f9a62a4 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2181,7 +2181,7 @@ $LANG = array( 'created_new_company' => 'Successfully created new company', 'fees_disabled_for_gateway' => 'Fees are disabled for this gateway.', 'logout_and_delete' => 'Log Out/Delete Account', - 'tax_rate_type_help' => 'Inclusive taxes adjust the line item cost when selected.', + 'tax_rate_type_help' => 'Inclusive tax rates adjust the line item cost when selected.
Only exclusive tax rates can be used as a default.', 'invoice_footer_help' => 'Use $pageNumber and $pageCount to display the page information.', 'credit_note' => 'Credit Note', 'credit_issued_to' => 'Credit issued to', diff --git a/resources/views/accounts/tax_rate.blade.php b/resources/views/accounts/tax_rate.blade.php index 3311113fe070..27bb86db16c0 100644 --- a/resources/views/accounts/tax_rate.blade.php +++ b/resources/views/accounts/tax_rate.blade.php @@ -29,10 +29,9 @@ {!! Former::text('rate')->label('texts.rate')->append('%') !!} {!! Former::radios('is_inclusive')->radios([ - trans('texts.exclusive') => array('name' => 'is_inclusive', 'value' => 0), - trans('texts.inclusive') => array('name' => 'is_inclusive', 'value' => 1), - ])->inline() - ->check(0) + trans('texts.exclusive') . ': 100 + 10% = 100 + 10' => array('name' => 'is_inclusive', 'value' => 0), + trans('texts.inclusive') . ':  100 + 10% = 90.91 + 9.09' => array('name' => 'is_inclusive', 'value' => 1), + ])->check(0) ->label('type') ->help('tax_rate_type_help') !!}