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

Support setting label for VAT and Id

Browse Source
This commit is contained in:
Hillel Coren 2017-07-09 20:06:34 +03:00
parent 62ba6e7e14
commit b239b7cebb
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Account.php
View File

@ -228,6 +228,7 @@ class Account extends Eloquent
'discount', 'discount',
'due_date', 'due_date',
'hours', 'hours',
'id_number',
'item', 'item',
'line_total', 'line_total',
'paid_to_date', 'paid_to_date',
@ -240,6 +241,7 @@ class Account extends Eloquent
'tax', 'tax',
'terms', 'terms',
'unit_cost', 'unit_cost',
'vat_number',
]; ];
/** /**

2
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

12
resources/assets/js/pdf.pdfmake.js
View File

@ -830,8 +830,14 @@ NINJA.renderField = function(invoice, field, twoColumn) {
value = (contact.first_name || contact.last_name) ? contact.first_name + ' ' + contact.last_name : false; value = (contact.first_name || contact.last_name) ? contact.first_name + ' ' + contact.last_name : false;
} else if (field == 'client.id_number') { } else if (field == 'client.id_number') {
value = client.id_number; value = client.id_number;
if (invoiceLabels.id_number_orig) {
label = invoiceLabels.id_number;
}
} else if (field == 'client.vat_number') { } else if (field == 'client.vat_number') {
value = client.vat_number; value = client.vat_number;
if (invoiceLabels.vat_number_orig) {
label = invoiceLabels.vat_number;
}
} else if (field == 'client.address1') { } else if (field == 'client.address1') {
value = client.address1; value = client.address1;
} else if (field == 'client.address2') { } else if (field == 'client.address2') {
@ -879,8 +885,14 @@ NINJA.renderField = function(invoice, field, twoColumn) {
value = account.name; value = account.name;
} else if (field == 'account.id_number') { } else if (field == 'account.id_number') {
value = account.id_number; value = account.id_number;
if (invoiceLabels.id_number_orig) {
label = invoiceLabels.id_number;
}
} else if (field == 'account.vat_number') { } else if (field == 'account.vat_number') {
value = account.vat_number; value = account.vat_number;
if (invoiceLabels.vat_number_orig) {
label = invoiceLabels.vat_number;
}
} else if (field == 'account.website') { } else if (field == 'account.website') {
value = account.website; value = account.website;
} else if (field == 'account.email') { } else if (field == 'account.email') {

22
resources/views/accounts/invoice_design.blade.php
View File

@ -230,23 +230,11 @@
->options(array_combine(App\Models\Account::$customLabels, Utils::trans(App\Models\Account::$customLabels))) !!} ->options(array_combine(App\Models\Account::$customLabels, Utils::trans(App\Models\Account::$customLabels))) !!}
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
{!! Former::text('labels_balance_due')->label('balance_due')->addGroupClass('balance_due-label-group label-group') !!} @foreach (App\Models\Account::$customLabels as $field)
{!! Former::text('labels_description')->label('description')->addGroupClass('description-label-group label-group') !!} {!! Former::text('labels_' . $field)
{!! Former::text('labels_discount')->label('discount')->addGroupClass('discount-label-group label-group') !!} ->label($field)
{!! Former::text('labels_due_date')->label('due_date')->addGroupClass('due_date-label-group label-group') !!} ->addGroupClass($field . '-label-group label-group') !!}
{!! Former::text('labels_hours')->label('hours')->addGroupClass('hours-label-group label-group') !!} @endforeach
{!! Former::text('labels_item')->label('item')->addGroupClass('item-label-group label-group') !!}
{!! Former::text('labels_line_total')->label('line_total')->addGroupClass('line_total-label-group label-group') !!}
{!! Former::text('labels_paid_to_date')->label('paid_to_date')->addGroupClass('paid_to_date-label-group label-group') !!}
{!! Former::text('labels_partial_due')->label('partial_due')->addGroupClass('partial_due-label-group label-group') !!}
{!! Former::text('labels_po_number')->label('po_number')->addGroupClass('po_number-label-group label-group') !!}
{!! Former::text('labels_quantity')->label('quantity')->addGroupClass('quantity-label-group label-group') !!}
{!! Former::text('labels_rate')->label('rate')->addGroupClass('rate-label-group label-group') !!}
{!! Former::text('labels_service')->label('service')->addGroupClass('service-label-group label-group') !!}
{!! Former::text('labels_subtotal')->label('subtotal')->addGroupClass('subtotal-label-group label-group') !!}
{!! Former::text('labels_tax')->label('tax')->addGroupClass('tax-label-group label-group') !!}
{!! Former::text('labels_terms')->label('terms')->addGroupClass('terms-label-group label-group') !!}
{!! Former::text('labels_unit_cost')->label('unit_cost')->addGroupClass('unit_cost-label-group label-group') !!}
</div> </div>
</div> </div>