From 0208ea1e7587287e0e17257e87dc260063758b54 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 1 May 2014 22:54:02 +0300
Subject: [PATCH] Bug fixes

---
 app/models/Invoice.php            | 5 +++++
 app/views/invoices/edit.blade.php | 2 +-
 public/built.js                   | 8 +++++---
 public/js/script.js               | 8 +++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index bfe482bdb02e..2e382b46b3f6 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -141,6 +141,11 @@ class Invoice extends EntityModel
 			return false;
 		}
 
+		if ($this->end_date && strtotime($this->end_date) < strtotime('now'))
+		{
+			return false;
+		}
+
 		$dayOfWeekToday = date('w');
 		$dayOfWeekStart = date('w', strtotime($this->start_date));
 
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 9c5ba7359896..9f2db4ec9626 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -504,7 +504,7 @@
 			refreshPDF();
 		}); //.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();
 		});
 
diff --git a/public/built.js b/public/built.js
index 9b34bbb25595..4e91914cb5f1 100644
--- a/public/built.js
+++ b/public/built.js
@@ -37054,9 +37054,11 @@ function displayInvoiceItems(doc, invoice, layout) {
     shownItem = true;
 
     // process date variables
-    notes = processVariables(notes);
-    productKey = processVariables(productKey);
-
+    if (invoice.is_recurring) {
+      notes = processVariables(notes);
+      productKey = processVariables(productKey);
+    }
+    
     var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
     if (tax) {
       lineTotal += lineTotal * tax / 100;
diff --git a/public/js/script.js b/public/js/script.js
index 26b50374f8e3..03015294c8e7 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1587,9 +1587,11 @@ function displayInvoiceItems(doc, invoice, layout) {
     shownItem = true;
 
     // process date variables
-    notes = processVariables(notes);
-    productKey = processVariables(productKey);
-
+    if (invoice.is_recurring) {
+      notes = processVariables(notes);
+      productKey = processVariables(productKey);
+    }
+    
     var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
     if (tax) {
       lineTotal += lineTotal * tax / 100;