Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2017-03-19 18:31:24 +02:00
parent 01329e846f
commit 1c4a60f2be
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en/texts.php
View File

@ -2420,7 +2420,8 @@ $LANG = array(
'gateway' => 'Gateway', 'gateway' => 'Gateway',
'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.', 'gateway_fee_change_warning' => 'If there are unpaid invoices with fees they need to be removed to prevent duplicate fees from being charged.',
'fees_surcharge_help' => 'Customize surcharge :link.', 'fees_surcharge_help' => 'Customize surcharge :link.',
'label_and_taxes' => 'label and taxes' 'label_and_taxes' => 'label and taxes',
'billable' => 'Billable',
); );

4
resources/views/expenses/edit.blade.php
View File

@ -78,8 +78,8 @@
@if (!$expense || ($expense && !$expense->invoice_id && !$expense->client_id)) @if (!$expense || ($expense && !$expense->invoice_id && !$expense->client_id))
{!! Former::checkbox('should_be_invoiced') {!! Former::checkbox('should_be_invoiced')
->text(trans('texts.should_be_invoiced')) ->text(trans('texts.billable'))
->data_bind('checked: should_be_invoiced() || client_id(), enable: !client_id()') ->data_bind('checked: should_be_invoiced')
->label(' ') ->label(' ')
->value(1) !!} ->value(1) !!}
@endif @endif

2
tests/acceptance/TaxRatesCest.php
View File

@ -63,7 +63,7 @@ class TaxRatesCest
$I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle'); $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
$I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey); $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
$I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable'); $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
$I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . $invoiceTaxRate . '%'); $I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . floatval($invoiceTaxRate) . '%');
$I->wait(3); $I->wait(3);
// check total is right before saving // check total is right before saving