Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Working on default documents

Browse Source
This commit is contained in:
Hillel Coren 2017-07-20 22:45:10 +03:00
parent df46330d5f
commit 25699f43c7
7 changed files with 81 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Account.php
View File

@ -332,6 +332,14 @@ class Account extends Eloquent
return $this->hasMany('App\Models\Product');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function defaultDocuments()
{
return $this->hasMany('App\Models\Document')->whereIsDefault(true);
}
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/

1
app/Models/Document.php
View File

@ -24,6 +24,7 @@ class Document extends EntityModel
protected $fillable = [
'invoice_id',
'expense_id',
'is_default',
];
/**

8
database/migrations/2017_07_18_124150_add_late_fees.php
View File

@ -20,6 +20,10 @@ class AddLateFees extends Migration
$table->decimal('late_fee3_amount', 13, 2)->nullable();
$table->decimal('late_fee3_percent', 13, 3)->nullable();
});
Schema::table('documents', function ($table) {
$table->boolean('is_default')->default(false)->nullable();
});
}
/**
@ -37,5 +41,9 @@ class AddLateFees extends Migration
$table->dropColumn('late_fee3_amount');
$table->dropColumn('late_fee3_percent');
});
Schema::table('documents', function ($table) {
$table->dropColumn('is_default');
});
}
}

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

@ -1043,7 +1043,7 @@ $LANG = array(
'invoice_item_fields' => 'Invoice Item Fields',
'custom_invoice_item_fields_help' => 'Add a field when creating an invoice item and display the label and value on the PDF.',
'recurring_invoice_number' => 'Recurring Number',
'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.',
'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices.',
// Client Passwords
'enable_portal_password' => 'Password Protect Invoices',
@ -2316,6 +2316,7 @@ $LANG = array(
'downloaded_invoices' => 'An email will be sent with the invoice PDFs',
'downloaded_quotes' => 'An email will be sent with the quote PDFs',
'clone_expense' => 'Clone Expense',
'default_documents' => 'Default Documents',
);

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

@ -328,7 +328,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('texts.default_messages') !!}</h3>
<h3 class="panel-title">{!! trans('texts.defaults') !!}</h3>
</div>
<div class="panel-body form-padding-right">
@ -337,6 +337,9 @@
<li role="presentation" class="active"><a href="#invoice_terms" aria-controls="invoice_terms" role="tab" data-toggle="tab">{{ trans('texts.invoice_terms') }}</a></li>
<li role="presentation"><a href="#invoice_footer" aria-controls="invoice_footer" role="tab" data-toggle="tab">{{ trans('texts.invoice_footer') }}</a></li>
<li role="presentation"><a href="#quote_terms" aria-controls="quote_terms" role="tab" data-toggle="tab">{{ trans('texts.quote_terms') }}</a></li>
@if ($account->hasFeature(FEATURE_DOCUMENTS))
<li role="presentation"><a href="#documents" aria-controls="documents" role="tab" data-toggle="tab">{{ trans('texts.documents') }}</a></li>
@endif
</ul>
</div>
<div class="tab-content">
@ -362,6 +365,30 @@
->rows(4) !!}
</div>
</div>
@if ($account->hasFeature(FEATURE_DOCUMENTS))
<div role="tabpanel" class="tab-pane" id="documents">
<div class="panel-body">
<div class="form-group">
<label for="public_notes" class="control-label col-lg-4 col-sm-4">
{{trans('texts.default_documents')}}
</label>
<div class="col-lg-8 col-sm-8">
<div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9">
<div id="document-upload">
<div class="dropzone">
<!--
<div data-bind="foreach: documents">
<input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
</div>
-->
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endif
</div>
</div>
</div>
@ -484,6 +511,8 @@
});
var defaultDocuments = {!! $account->defaultDocuments()->get() !!};
$(function() {
setQuoteNumberEnabled();
onNumberTypeChange('invoice');
@ -499,6 +528,9 @@
toggleDatePicker('reset_counter_date');
});
@if ($account->hasFeature(FEATURE_DOCUMENTS))
@include('partials.dropzone', ['documentSource' => 'defaultDocuments', 'isDefault' => true])
@endif
});
</script>

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

@ -203,9 +203,11 @@
</label>
<div class="col-lg-8 col-sm-8">
<div role="tabpanel" class="tab-pane" id="attached-documents" style="position:relative;z-index:9">
<div id="document-upload" class="dropzone">
<div data-bind="foreach: documents">
<input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
<div id="document-upload">
<div class="dropzone">
<div data-bind="foreach: documents">
<input type="hidden" name="document_ids[]" data-bind="value: public_id"/>
</div>
</div>
</div>
</div>
@ -254,8 +256,6 @@
{!! Former::close() !!}
<script type="text/javascript">
Dropzone.autoDiscover = false;
var vendors = {!! $vendors !!};
var clients = {!! $clients !!};
var categories = {!! $categories !!};
@ -417,51 +417,8 @@
toggleDatePicker('payment_date');
});
// Initialize document upload
dropzone = new Dropzone('#document-upload', {
url:{!! json_encode(url('documents')) !!},
params:{
_token:"{{ Session::getToken() }}"
},
acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
addRemoveLinks:true,
dictRemoveFileConfirmation:"{{trans('texts.are_you_sure')}}",
@foreach(['default_message', 'fallback_message', 'fallback_text', 'file_too_big', 'invalid_file_type', 'response_error', 'cancel_upload', 'cancel_upload_confirmation', 'remove_file'] as $key)
"dict{{ Utils::toClassCase($key) }}" : "{!! strip_tags(addslashes(trans('texts.dropzone_'.$key))) !!}",
@endforeach
maxFilesize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
});
if(dropzone instanceof Dropzone){
dropzone.on("addedfile",handleDocumentAdded);
dropzone.on("removedfile",handleDocumentRemoved);
dropzone.on("success",handleDocumentUploaded);
dropzone.on("canceled",handleDocumentCanceled);
dropzone.on("error",handleDocumentError);
for (var i=0; i<model.documents().length; i++) {
var document = model.documents()[i];
var mockFile = {
name:document.name(),
size:document.size(),
type:document.type(),
public_id:document.public_id(),
status:Dropzone.SUCCESS,
accepted:true,
url:document.url(),
mock:true,
index:i
};
@include('partials.dropzone', ['documentSource' => 'model.documents()'])
dropzone.emit('addedfile', mockFile);
dropzone.emit('complete', mockFile);
if(document.preview_url()){
dropzone.emit('thumbnail', mockFile, document.preview_url()||document.url());
}
else if(document.type()=='jpeg' || document.type()=='png' || document.type()=='svg'){
dropzone.emit('thumbnail', mockFile, document.url());
}
dropzone.files.push(mockFile);
}
}
@endif
});
@ -575,51 +532,20 @@
}
}
window.countUploadingDocuments = 0;
function handleDocumentAdded(file){
// open document when clicked
if (file.url) {
file.previewElement.addEventListener("click", function() {
window.open(file.url, '_blank');
});
}
if(file.mock)return;
function addDocument(file) {
file.index = model.documents().length;
model.addDocument({name:file.name, size:file.size, type:file.type});
window.countUploadingDocuments++;
}
}
function handleDocumentRemoved(file){
model.removeDocument(file.public_id);
$.ajax({
url: '{{ '/documents/' }}' + file.public_id,
type: 'DELETE',
success: function(result) {
// Do something with the result
}
});
}
function handleDocumentUploaded(file, response){
window.countUploadingDocuments--;
file.public_id = response.document.public_id
function addedDocument(file, response) {
model.documents()[file.index].update(response.document);
if(response.document.preview_url){
dropzone.emit('thumbnail', file, response.document.preview_url);
}
}
}
function handleDocumentCanceled() {
window.countUploadingDocuments--;
}
function deleteDocument(file) {
model.removeDocument(file.public_id);
}
function handleDocumentError() {
window.countUploadingDocuments--;
}
function onInvoiceDocumentsChange()
{
function onInvoiceDocumentsChange() {
if (isStorageSupported()) {
var checked = $('#invoice_documents').is(':checked');
localStorage.setItem('last:invoice_documents', checked || '');

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

@ -1041,51 +1041,8 @@
return;
}
window.dropzone = new Dropzone('#document-upload .dropzone', {
url:{!! json_encode(url('documents')) !!},
params:{
_token:"{{ Session::getToken() }}"
},
acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
addRemoveLinks:true,
dictRemoveFileConfirmation:"{{trans('texts.are_you_sure')}}",
@foreach(['default_message', 'fallback_message', 'fallback_text', 'file_too_big', 'invalid_file_type', 'response_error', 'cancel_upload', 'cancel_upload_confirmation', 'remove_file'] as $key)
"dict{{ Utils::toClassCase($key) }}" : "{!! strip_tags(addslashes(trans('texts.dropzone_'.$key))) !!}",
@endforeach
maxFilesize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
parallelUploads:1,
});
if(dropzone instanceof Dropzone){
dropzone.on("addedfile",handleDocumentAdded);
dropzone.on("removedfile",handleDocumentRemoved);
dropzone.on("success",handleDocumentUploaded);
dropzone.on("canceled",handleDocumentCanceled);
dropzone.on("error",handleDocumentError);
for (var i=0; i<model.invoice().documents().length; i++) {
var document = model.invoice().documents()[i];
var mockFile = {
name:document.name(),
size:document.size(),
type:document.type(),
public_id:document.public_id(),
status:Dropzone.SUCCESS,
accepted:true,
url:document.url(),
mock:true,
index:i
};
@include('partials.dropzone', ['documentSource' => 'model.invoice().documents()'])
dropzone.emit('addedfile', mockFile);
dropzone.emit('complete', mockFile);
if(document.preview_url()){
dropzone.emit('thumbnail', mockFile, document.preview_url());
}
else if(document.type()=='jpeg' || document.type()=='png' || document.type()=='svg'){
dropzone.emit('thumbnail', mockFile, document.url());
}
dropzone.files.push(mockFile);
}
}
});
@endif
});
@ -1637,54 +1594,22 @@
model.invoice().invoice_number(number);
}
window.countUploadingDocuments = 0;
function addDocument(file) {
file.index = model.invoice().documents().length;
model.invoice().addDocument({name:file.name, size:file.size, type:file.type});
}
function handleDocumentAdded(file){
// open document when clicked
if (file.url) {
file.previewElement.addEventListener("click", function() {
window.open(file.url, '_blank');
});
}
if(file.mock)return;
file.index = model.invoice().documents().length;
model.invoice().addDocument({name:file.name, size:file.size, type:file.type});
window.countUploadingDocuments++;
}
function addedDocument(file, response) {
model.invoice().documents()[file.index].update(response.document);
@if ($account->invoice_embed_documents)
refreshPDF(true);
@endif
}
function handleDocumentRemoved(file){
model.invoice().removeDocument(file.public_id);
refreshPDF(true);
$.ajax({
url: '{{ '/documents/' }}' + file.public_id,
type: 'DELETE',
success: function(result) {
// Do something with the result
}
});
}
function handleDocumentUploaded(file, response){
window.countUploadingDocuments--;
file.public_id = response.document.public_id
model.invoice().documents()[file.index].update(response.document);
@if ($account->invoice_embed_documents)
refreshPDF(true);
@endif
if(response.document.preview_url){
dropzone.emit('thumbnail', file, response.document.preview_url);
}
}
function handleDocumentCanceled() {
window.countUploadingDocuments--;
}
function handleDocumentError(file) {
dropzone.removeFile(file);
window.countUploadingDocuments--;
swal("{!! trans('texts.error_refresh_page') !!}");
}
function deleteDocument(file) {
model.invoice().removeDocument(file.public_id);
refreshPDF(true);
}
</script>
@if ($account->hasFeature(FEATURE_DOCUMENTS) && $account->invoice_embed_documents)