Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for client numbers

Browse Source
This commit is contained in:
Hillel Coren 2017-01-04 12:52:32 +02:00
parent 7a58108cd0
commit 521f2b5d0e
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Traits/GeneratesNumbers.php
View File

@ -128,8 +128,9 @@ trait GeneratesNumbers
$replace[] = str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT); $replace[] = str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT);
if (strstr($pattern, '{$userId}')) { if (strstr($pattern, '{$userId}')) {
$userId = $entity->user ? $entity->user->public_id : (Auth::check() ? Auth::user()->public_id : 0);
$search[] = '{$userId}'; $search[] = '{$userId}';
$replace[] = str_pad(($entity->user->public_id + 1), 2, '0', STR_PAD_LEFT); $replace[] = str_pad(($userId + 1), 2, '0', STR_PAD_LEFT);
} }
$matches = false; $matches = false;

63
resources/views/accounts/invoice_settings.blade.php
View File

@ -107,39 +107,37 @@
</div> </div>
<div role="tabpanel" class="tab-pane" id="client_number"> <div role="tabpanel" class="tab-pane" id="client_number">
<div class="panel-body"> <div class="panel-body">
@if ( ! $account->client_number_counter) {!! Former::checkbox('client_number_enabled')
{!! Former::checkbox('client_number_enabled') ->label('client_number')
->label('client_number') ->onchange('onClientNumberEnabled()')
->onchange('onClientNumberChange()') ->text('enable')
->text('enable')!!} ->check($account->client_number_counter > 0) !!}
<div id="clientNumberDiv" style="display:none">
@endif
{!! Former::inline_radios('client_number_type') <div id="clientNumberDiv" style="display:none">
->onchange('onClientNumberTypeChange()')
->label(trans('texts.type'))
->radios([
trans('texts.prefix') => ['value' => 'prefix', 'name' => 'client_number_type'],
trans('texts.pattern') => ['value' => 'pattern', 'name' => 'client_number_type'],
])->check($account->client_number_pattern ? 'pattern' : 'prefix') !!}
{!! Former::text('client_number_prefix') {!! Former::inline_radios('client_number_type')
->addGroupClass('client-prefix') ->onchange('onClientNumberTypeChange()')
->label(trans('texts.prefix')) !!} ->label(trans('texts.type'))
{!! Former::text('client_number_pattern') ->radios([
->appendIcon('question-sign') trans('texts.prefix') => ['value' => 'prefix', 'name' => 'client_number_type'],
->addGroupClass('client-pattern') trans('texts.pattern') => ['value' => 'pattern', 'name' => 'client_number_type'],
->addGroupClass('number-pattern') ])->check($account->client_number_pattern ? 'pattern' : 'prefix') !!}
->label(trans('texts.pattern')) !!}
{!! Former::text('client_number_counter')
->label(trans('texts.counter'))
->addGroupClass('pad-checkbox')
->help(trans('texts.client_number_help') . ' ' .
trans('texts.next_client_number', ['number' => $account->getNextNumber()])) !!}
@if ( ! $account->client_number_counter) {!! Former::text('client_number_prefix')
</div> ->addGroupClass('client-prefix')
@endif ->label(trans('texts.prefix')) !!}
{!! Former::text('client_number_pattern')
->appendIcon('question-sign')
->addGroupClass('client-pattern')
->addGroupClass('number-pattern')
->label(trans('texts.pattern')) !!}
{!! Former::text('client_number_counter')
->label(trans('texts.counter'))
->addGroupClass('pad-checkbox')
->help(trans('texts.client_number_help') . ' ' .
trans('texts.next_client_number', ['number' => $account->getNextNumber()])) !!}
</div>
</div> </div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="recurring_invoice_number"> <div role="tabpanel" class="tab-pane" id="recurring_invoice_number">
@ -390,11 +388,11 @@
} }
} }
function onClientNumberChange() { function onClientNumberEnabled() {
var enabled = $('#client_number_enabled').is(':checked'); var enabled = $('#client_number_enabled').is(':checked');
if (enabled) { if (enabled) {
$('#clientNumberDiv').show(); $('#clientNumberDiv').show();
$('#client_number_counter').val(1); $('#client_number_counter').val({{ $account->client_number_counter ?: 1 }});
} else { } else {
$('#clientNumberDiv').hide(); $('#clientNumberDiv').hide();
$('#client_number_counter').val(0); $('#client_number_counter').val(0);
@ -410,6 +408,7 @@
onInvoiceNumberTypeChange(); onInvoiceNumberTypeChange();
onQuoteNumberTypeChange(); onQuoteNumberTypeChange();
onClientNumberTypeChange(); onClientNumberTypeChange();
onClientNumberEnabled();
}); });
</script> </script>