From c9b7f79d7cecc26ad371c60c2b7bd04c4cee6acb Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 26 May 2014 12:43:46 +0300
Subject: [PATCH] Bug fixes

---
 app/commands/SendRecurringInvoices.php | 3 ++-
 app/views/list.blade.php               | 2 +-
 app/views/public/splash.blade.php      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/commands/SendRecurringInvoices.php b/app/commands/SendRecurringInvoices.php
index a3d450f9a253..503560eff7f2 100755
--- a/app/commands/SendRecurringInvoices.php
+++ b/app/commands/SendRecurringInvoices.php
@@ -24,7 +24,8 @@ class SendRecurringInvoices extends Command {
 
 		$today = new DateTime();
 			
-		$invoices = Invoice::with('account.timezone', 'invoice_items')->whereRaw('is_recurring is true AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', array($today, $today))->get();
+		$invoices = Invoice::with('account.timezone', 'invoice_items')
+			->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND is_recurring IS TRUE AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', array($today, $today))->get();
 		$this->info(count($invoices) . ' recurring invoice(s) found');
 
 		foreach ($invoices as $recurInvoice)
diff --git a/app/views/list.blade.php b/app/views/list.blade.php
index 56d8f0296b5c..9ef342e790d8 100755
--- a/app/views/list.blade.php
+++ b/app/views/list.blade.php
@@ -48,7 +48,7 @@
 
 	function submitForm(action) {
 		if (action == 'delete') {
-			if (!confirm('Are you sure')) {
+			if (!confirm('Are you sure?')) {
 				return;
 			}
 		}		
diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php
index 791a4a7c7674..81910716d262 100755
--- a/app/views/public/splash.blade.php
+++ b/app/views/public/splash.blade.php
@@ -67,7 +67,7 @@
                 <div class="icon pdf"><span class="img-wrap"><img src="{{ asset('images/icon-pdf.png') }}"></span></div>
                 <h2>Live .PDF View</h2>
                 <!--<p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>-->
-                <p>See how your edited invoice will look as a print-friendly pdf while you make the changes. Our pdf generator works in real time while you do, on the same screen. You can even preview four beautiful preset designs. Just create, save, send, and you’re done!</p>
+                <p>See how your edited invoice will look as a print-friendly pdf while you make the changes. Our pdf generator works in real time as you make your changes. You can even preview four beautiful preset designs. Just create, save, send, and you’re done!</p>
               </div>
             </div>