Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hide draft invoices from the client portal

Browse Source
This commit is contained in:
Hillel Coren 2016-12-05 10:32:18 +02:00
parent 78a2a66729
commit 455e4ac936
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/built.public.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.public.css.map
View File

File diff suppressed because one or more lines are too long

8
resources/assets/css/public.style.css vendored
View File

@ -185,5 +185,13 @@ table td {
border-top-left-radius: 3px; border-top-left-radius: 3px;
} }
.dt-right,
.dt-left {
margin-top: 16px;
}
.pagination>ul {
margin: 0px;
}
/* hide table sorting indicators */ /* hide table sorting indicators */
table.data-table thead .sorting { background: url('') no-repeat center right; } table.data-table thead .sorting { background: url('') no-repeat center right; }

2
resources/views/invited/dashboard.blade.php
View File

@ -184,6 +184,8 @@
->render('datatable') !!} ->render('datatable') !!}
</div> </div>
<p>&nbsp;</p>
</div> </div>
@stop @stop

9
resources/views/invoices/edit.blade.php
View File

@ -557,7 +557,7 @@
@if ($invoice->isSent()) @if ($invoice->isSent())
{!! Button::success(trans("texts.save_{$entityType}"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!} {!! Button::success(trans("texts.save_{$entityType}"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!}
@else @else
{!! Button::normal(trans("texts.save_draft"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveDraftClick()'))->appendIcon(Icon::create('floppy-disk')) !!} {!! Button::normal(trans("texts.save_draft"))->withAttributes(array('id' => 'draftButton', 'onclick' => 'onSaveDraftClick()'))->appendIcon(Icon::create('floppy-disk')) !!}
{!! Button::success(trans("texts.mark_sent"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onMarkSentClick()'))->appendIcon(Icon::create('globe')) !!} {!! Button::success(trans("texts.mark_sent"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onMarkSentClick()'))->appendIcon(Icon::create('globe')) !!}
@endif @endif
{!! Button::info(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'emailButton', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!} {!! Button::info(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'emailButton', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!}
@ -1306,6 +1306,9 @@
submitAction(''); submitAction('');
}, text, title); }, text, title);
return; return;
} else {
model.invoice().is_public(true);
onSaveClick();
} }
} }
@ -1400,13 +1403,13 @@
if ($('#saveButton').is(':disabled')) { if ($('#saveButton').is(':disabled')) {
return false; return false;
} }
$('#saveButton, #emailButton').attr('disabled', true); $('#saveButton, #emailButton, #draftButton').attr('disabled', true);
// if save fails ensure user can try again // if save fails ensure user can try again
$.post('{{ url($url) }}', $('.main-form').serialize(), function(data) { $.post('{{ url($url) }}', $('.main-form').serialize(), function(data) {
NINJA.formIsChanged = false; NINJA.formIsChanged = false;
location.href = data; location.href = data;
}).fail(function(data) { }).fail(function(data) {
$('#saveButton, #emailButton').attr('disabled', false); $('#saveButton, #emailButton, #draftButton').attr('disabled', false);
var error = firstJSONError(data.responseJSON) || data.statusText; var error = firstJSONError(data.responseJSON) || data.statusText;
swal("{!! trans('texts.invoice_save_error') !!}", error); swal("{!! trans('texts.invoice_save_error') !!}", error);
}); });

1
resources/views/public_list.blade.php
View File

@ -47,7 +47,6 @@
->setUrl(route('api.client.' . $entityType . 's')) ->setUrl(route('api.client.' . $entityType . 's'))
->setOptions('sPaginationType', 'bootstrap') ->setOptions('sPaginationType', 'bootstrap')
->render('datatable') !!} ->render('datatable') !!}
</div> </div>
@if($entityType == ENTITY_RECURRING_INVOICE) @if($entityType == ENTITY_RECURRING_INVOICE)