mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
bug fixes
This commit is contained in:
parent
7ef27d5a96
commit
df95dc213d
@ -58,10 +58,35 @@ class ConstantsSeeder extends Seeder
|
||||
Frequency::create(array('name' => 'Six months'));
|
||||
Frequency::create(array('name' => 'Annually'));
|
||||
|
||||
ClientIndustry::create(array('name' => 'Accounting'));
|
||||
ClientIndustry::create(array('name' => 'Travel'));
|
||||
ClientIndustry::create(array('name' => 'Engineering'));
|
||||
ClientIndustry::create(array('name' => 'Accounting & Legal'));
|
||||
ClientIndustry::create(array('name' => 'Advertising'));
|
||||
ClientIndustry::create(array('name' => 'Aerospace'));
|
||||
ClientIndustry::create(array('name' => 'Agriculture'));
|
||||
ClientIndustry::create(array('name' => 'Automotive'));
|
||||
ClientIndustry::create(array('name' => 'Banking & Finance'));
|
||||
ClientIndustry::create(array('name' => 'Biotechnology'));
|
||||
ClientIndustry::create(array('name' => 'Broadcasting'));
|
||||
ClientIndustry::create(array('name' => 'Business Services'));
|
||||
ClientIndustry::create(array('name' => 'Commodities & Chemicals'));
|
||||
ClientIndustry::create(array('name' => 'Communications'));
|
||||
ClientIndustry::create(array('name' => 'Computers & Hightech'));
|
||||
ClientIndustry::create(array('name' => 'Defense'));
|
||||
ClientIndustry::create(array('name' => 'Energy'));
|
||||
ClientIndustry::create(array('name' => 'Entertainment'));
|
||||
ClientIndustry::create(array('name' => 'Government'));
|
||||
ClientIndustry::create(array('name' => 'Healthcare & Life Sciences'));
|
||||
ClientIndustry::create(array('name' => 'Insurance'));
|
||||
ClientIndustry::create(array('name' => 'Manufacturing'));
|
||||
ClientIndustry::create(array('name' => 'Marketing'));
|
||||
ClientIndustry::create(array('name' => 'Media'));
|
||||
ClientIndustry::create(array('name' => 'Nonprofit & Higher Ed'));
|
||||
ClientIndustry::create(array('name' => 'Pharmaceuticals'));
|
||||
ClientIndustry::create(array('name' => 'Professional Services & Consulting'));
|
||||
ClientIndustry::create(array('name' => 'Real Estate'));
|
||||
ClientIndustry::create(array('name' => 'Retail & Wholesale'));
|
||||
ClientIndustry::create(array('name' => 'Sports'));
|
||||
ClientIndustry::create(array('name' => 'Transportation'));
|
||||
ClientIndustry::create(array('name' => 'Travel & Luxury'));
|
||||
|
||||
ClientSize::create(array('name' => '1 - 10'));
|
||||
ClientSize::create(array('name' => '11 - 50'));
|
||||
|
@ -96,7 +96,7 @@
|
||||
|
||||
<div class="navbar-form navbar-right">
|
||||
@if (!Auth::check() || !Auth::user()->registered)
|
||||
{{ Button::sm_success_primary('Sign up', array('data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }}
|
||||
{{ Button::sm_success_primary('Sign up', array('data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }}
|
||||
@endif
|
||||
|
||||
<div class="btn-group">
|
||||
|
@ -8,7 +8,9 @@ var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
|
||||
function generatePDF(invoice) {
|
||||
var currencyId = invoice.currency_id;
|
||||
var invoiceNumber = invoice.invoice_number;
|
||||
var issuedOn = invoice.invoice_date ? invoice.invoice_date : '';
|
||||
var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
|
||||
var dueDate = invoice.due_date ? invoice.due_date : '';
|
||||
console.log("DueDate: %s", dueDate);
|
||||
var amount = '$0.00';
|
||||
|
||||
var marginLeft = 90;
|
||||
@ -64,10 +66,14 @@ function generatePDF(invoice) {
|
||||
if (invoice.po_number) {
|
||||
y1 += rowHeight;
|
||||
}
|
||||
if (dueDate) {
|
||||
y1 += rowHeight;
|
||||
}
|
||||
doc.rect(x1, y1, x2, y2, 'FD');
|
||||
|
||||
var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber) * doc.internal.getFontSize());
|
||||
var issuedOnX = headerRight - (doc.getStringUnitWidth(issuedOn) * doc.internal.getFontSize());
|
||||
var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize());
|
||||
var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize());
|
||||
var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize());
|
||||
|
||||
doc.setFontType("normal");
|
||||
@ -102,15 +108,13 @@ function generatePDF(invoice) {
|
||||
|
||||
headerY += rowHeight;
|
||||
doc.text(headerLeft, headerY, 'Invoice Date');
|
||||
doc.text(issuedOnX, headerY, issuedOn);
|
||||
doc.text(invoiceDateX, headerY, invoiceDate);
|
||||
|
||||
/*
|
||||
if (invoice.due_date) {
|
||||
if (dueDate) {
|
||||
headerY += rowHeight;
|
||||
doc.text(headerLeft, headerY, 'Due Date');
|
||||
doc.text(poNumberX, headerY, invoice.po_number);
|
||||
doc.text(dueDateX, headerY, dueDate);
|
||||
}
|
||||
*/
|
||||
|
||||
headerY += rowHeight;
|
||||
doc.setFontType("bold");
|
||||
@ -677,12 +681,14 @@ ko.bindingHandlers.datePicker = {
|
||||
init: function (element, valueAccessor, allBindingsAccessor) {
|
||||
var value = ko.utils.unwrapObservable(valueAccessor());
|
||||
if (value) $(element).datepicker('update', value);
|
||||
//console.log("datePicker-init: %s", value);
|
||||
$(element).change(function() {
|
||||
var value = valueAccessor();
|
||||
value($(element).val());
|
||||
})
|
||||
},
|
||||
update: function (element, valueAccessor) {
|
||||
var value = ko.utils.unwrapObservable(valueAccessor());
|
||||
if (value) $(element).datepicker('update', value);
|
||||
//console.log("datePicker-init: %s", value);
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user