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

Fix for expense documents

Browse Source
This commit is contained in:
Hillel Coren 2017-07-21 17:27:43 +03:00
parent c9070aadb0
commit 1f6a76fdbe
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,8 +193,8 @@
</div>
<div class="col-md-6">
{!! Former::textarea('public_notes')->rows($isRecurring ? 10 : 6) !!}
{!! Former::textarea('private_notes')->rows($isRecurring ? 10 : 6) !!}
{!! Former::textarea('private_notes')->rows(! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!}
{!! Former::textarea('public_notes')->rows(! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS) ? 6 : 10) !!}
@if (! $isRecurring && $account->hasFeature(FEATURE_DOCUMENTS))
<div class="form-group">
@ -390,12 +390,7 @@
$('.end_date .input-group-addon').click(function() {
toggleDatePicker('end_date');
});
@elseif (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
$('.main-form').submit(function(){
if($('#document-upload .fallback input').val())$(this).attr('enctype', 'multipart/form-data')
else $(this).removeAttr('enctype')
})
@else
$('#payment_type_id').combobox();
$('#mark_paid').click(function(event) {
if ($('#mark_paid').is(':checked')) {
@ -417,6 +412,11 @@
toggleDatePicker('payment_date');
});
@if (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
$('.main-form').submit(function(){
if($('#document-upload .fallback input').val())$(this).attr('enctype', 'multipart/form-data')
else $(this).removeAttr('enctype')
})
// Initialize document upload
dropzone = new Dropzone('#document-upload', {
url:{!! json_encode(url('documents')) !!},
@ -463,6 +463,7 @@
}
}
@endif
@endif
});
var ViewModel = function(data) {