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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-01 22:54:02 +03:00
parent 6912b04063
commit 0208ea1e75
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/Invoice.php
View File

@ -141,6 +141,11 @@ class Invoice extends EntityModel
return false; return false;
} }
if ($this->end_date && strtotime($this->end_date) < strtotime('now'))
{
return false;
}
$dayOfWeekToday = date('w'); $dayOfWeekToday = date('w');
$dayOfWeekStart = date('w', strtotime($this->start_date)); $dayOfWeekStart = date('w', strtotime($this->start_date));

2
app/views/invoices/edit.blade.php
View File

@ -504,7 +504,7 @@
refreshPDF(); refreshPDF();
}); //.trigger('change'); }); //.trigger('change');
$('#terms, #public_notes, #invoice_number, #invoice_date, #due_date, #po_number, #discount, #currency_id, #invoice_design_id').change(function() { $('#terms, #public_notes, #invoice_number, #invoice_date, #due_date, #po_number, #discount, #currency_id, #invoice_design_id, #recurring').change(function() {
refreshPDF(); refreshPDF();
}); });

2
public/built.js
View File

@ -37054,8 +37054,10 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) {
notes = processVariables(notes); notes = processVariables(notes);
productKey = processVariables(productKey); productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {

2
public/js/script.js
View File

@ -1587,8 +1587,10 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) {
notes = processVariables(notes); notes = processVariables(notes);
productKey = processVariables(productKey); productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {