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

Fix issue with hipster design with quotes

Browse Source
This commit is contained in:
Hillel Coren 2016-09-19 14:08:21 +03:00
parent cb44f8e9a6
commit 73781e88d5
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Traits/PresentsInvoice.php
View File

@ -184,6 +184,7 @@ trait PresentsInvoice
'quote_to', 'quote_to',
'details', 'details',
'invoice_no', 'invoice_no',
'quote_no',
'valid_until', 'valid_until',
'client_name', 'client_name',
'address1', 'address1',

4
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

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

@ -210,7 +210,11 @@ NINJA.decodeJavascript = function(invoice, javascript)
if (invoice.partial > 0 && field == 'balance_due') { if (invoice.partial > 0 && field == 'balance_due') {
field = 'partial_due'; field = 'partial_due';
} else if (invoice.is_quote) { } else if (invoice.is_quote) {
field = field.replace('invoice', 'quote'); if (field == 'due_date') {
field = 'valid_until';
} else {
field = field.replace('invoice', 'quote');
}
} }
var label = invoiceLabels[field]; var label = invoiceLabels[field];
if (match.indexOf('UC') >= 0) { if (match.indexOf('UC') >= 0) {

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

@ -643,6 +643,7 @@ $LANG = array(
'custom' => 'Custom', 'custom' => 'Custom',
'invoice_to' => 'Invoice to', 'invoice_to' => 'Invoice to',
'invoice_no' => 'Invoice No.', 'invoice_no' => 'Invoice No.',
'quote_no' => 'Quote No.',
'recent_payments' => 'Recent Payments', 'recent_payments' => 'Recent Payments',
'outstanding' => 'Outstanding', 'outstanding' => 'Outstanding',
'manage_companies' => 'Manage Companies', 'manage_companies' => 'Manage Companies',